> > On Wed, Nov 28, 2018 at 12:23 PM Frediano Ziglio <fziglio@xxxxxxxxxx> wrote: > > > > Version 0.12.6 was released on 12th June 2015. > > > > Signed-off-by: Frediano Ziglio <fziglio@xxxxxxxxxx> > > --- > > chardev/spice.c | 12 ------------ > > configure | 4 ++-- > > hw/display/qxl.c | 27 --------------------------- > > hw/display/qxl.h | 2 -- > > include/ui/qemu-spice.h | 12 ------------ > > ui/spice-core.c | 8 -------- > > ui/spice-display.c | 10 ---------- > > 7 files changed, 2 insertions(+), 73 deletions(-) > > > > diff --git a/chardev/spice.c b/chardev/spice.c > > index e66e3ad568..e0b44474f5 100644 > > --- a/chardev/spice.c > > +++ b/chardev/spice.c > > @@ -77,7 +77,6 @@ static int vmc_read(SpiceCharDeviceInstance *sin, uint8_t > > *buf, int len) > > return bytes; > > } > > > > -#if SPICE_SERVER_VERSION >= 0x000c02 > > static void vmc_event(SpiceCharDeviceInstance *sin, uint8_t event) > > { > > SpiceChardev *scd = container_of(sin, SpiceChardev, sin); > > @@ -95,7 +94,6 @@ static void vmc_event(SpiceCharDeviceInstance *sin, > > uint8_t event) > > trace_spice_vmc_event(chr_event); > > qemu_chr_be_event(chr, chr_event); > > } > > -#endif > > > > static void vmc_state(SpiceCharDeviceInstance *sin, int connected) > > { > > @@ -119,12 +117,8 @@ static SpiceCharDeviceInterface vmc_interface = { > > .state = vmc_state, > > .write = vmc_write, > > .read = vmc_read, > > -#if SPICE_SERVER_VERSION >= 0x000c02 > > .event = vmc_event, > > -#endif > > -#if SPICE_SERVER_VERSION >= 0x000c06 > > .flags = SPICE_CHAR_DEVICE_NOTIFY_WRITABLE, > > -#endif > > }; > > > > > > @@ -223,9 +217,7 @@ static void char_spice_finalize(Object *obj) > > } > > > > g_free((char *)s->sin.subtype); > > -#if SPICE_SERVER_VERSION >= 0x000c02 > > g_free((char *)s->sin.portname); > > -#endif > > } > > > > static void spice_vmc_set_fe_open(struct Chardev *chr, int fe_open) > > @@ -240,7 +232,6 @@ static void spice_vmc_set_fe_open(struct Chardev *chr, > > int fe_open) > > > > static void spice_port_set_fe_open(struct Chardev *chr, int fe_open) > > { > > -#if SPICE_SERVER_VERSION >= 0x000c02 > > SpiceChardev *s = SPICE_CHARDEV(chr); > > > > if (fe_open) { > > @@ -248,7 +239,6 @@ static void spice_port_set_fe_open(struct Chardev *chr, > > int fe_open) > > } else { > > spice_server_port_event(&s->sin, SPICE_PORT_EVENT_CLOSED); > > } > > -#endif > > } > > > > static void spice_chr_accept_input(struct Chardev *chr) > > @@ -298,7 +288,6 @@ static void qemu_chr_open_spice_vmc(Chardev *chr, > > chr_open(chr, type); > > } > > > > -#if SPICE_SERVER_VERSION >= 0x000c02 > > static void qemu_chr_open_spice_port(Chardev *chr, > > ChardevBackend *backend, > > bool *be_opened, > > @@ -331,7 +320,6 @@ void qemu_spice_register_ports(void) > > vmc_register_interface(s); > > } > > } > > -#endif > > > > static void qemu_chr_parse_spice_vmc(QemuOpts *opts, ChardevBackend > > *backend, > > Error **errp) > > diff --git a/configure b/configure > > index 0a3c6a72c3..b8f1fd053d 100755 > > --- a/configure > > +++ b/configure > > @@ -4563,8 +4563,8 @@ int main(void) { spice_server_new(); return 0; } > > EOF > > spice_cflags=$($pkg_config --cflags spice-protocol spice-server > > 2>/dev/null) > > spice_libs=$($pkg_config --libs spice-protocol spice-server 2>/dev/null) > > - if $pkg_config --atleast-version=0.12.0 spice-server && \ > > - $pkg_config --atleast-version=0.12.3 spice-protocol && \ > > + if $pkg_config --atleast-version=0.12.6 spice-server && \ > > + $pkg_config --atleast-version=0.12.10 spice-protocol && \ > > Why do you bump spice-protocol? > Why not? spice-server 0.12.6 requires spice-protocol 0.12.10. Frediano _______________________________________________ Spice-devel mailing list Spice-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/spice-devel