Re: [Qemu-devel] [PATCH 2/2] spice: Bump required spice-server version to 0.12.6

[Gerd Hoffmann]

On Wed, Nov 28, 2018 at 08:22:43AM +, Frediano Ziglio wrote:
> Version 0.12.6 was released on 12th June 2015.

That patch should be first, can you reorder them please?

thanks,
  Gerd

PS: Tried to just reverse ordering when queuing up, but #2 doesn't apply
to master, seems there is some dependency ...

[Qemu-devel] [PATCH 2/2] spice: Bump required spice-server version to 0.12.6

[Frediano Ziglio]

Version 0.12.6 was released on 12th June 2015.

Signed-off-by: Frediano Ziglio 
---
 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(>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 && \
  compile_prog "$spice_cflags" "$spice_libs" ; then
 spice="yes"
 libs_softmmu="$libs_softmmu $spice_libs"
diff --git a/hw/display/qxl.c b/hw/display/qxl.c
index 9087db5dee..9387061ecb 100644
--- a/hw/display/qxl.c
+++ b/hw/display/qxl.c
@@ -276,11 +276,9 @@ static void qxl_spice_monitors_config_async(PCIQXLDevice 
*qxl, int replay)
 QXL_COOKIE_TYPE_POST_LOAD_MONITORS_CONFIG,
 0));
 } else {
-#if SPICE_SERVER_VERSION >= 0x000c06 /* release 0.12.6 */
 if (qxl->max_outputs) {
 spice_qxl_set_max_monitors(>ssd.qxl, qxl->max_outputs);
 }
-#endif
 qxl->guest_monitors_config = qxl->ram->monitors_config;
 spice_qxl_monitors_config_async(>ssd.qxl,
 qxl->ram->monitors_config,
@@ -544,22 +542,6 @@ static void interface_set_compression_level(QXLInstance 
*sin, int level)
 qxl_rom_set_dirty(qxl);
 }
 
-#if SPICE_NEEDS_SET_MM_TIME
-static void interface_set_mm_time(QXLInstance *sin, uint32_t mm_time)
-{
-PCIQXLDevice *qxl = container_of(sin, PCIQXLDevice, ssd.qxl);
-
-if (!qemu_spice_display_is_running(>ssd)) {
-return;
-}
-
-trace_qxl_interface_set_mm_time(qxl->id, mm_time);
-qxl->shadow_rom.mm_clock = cpu_to_le32(mm_time);
-qxl->rom->mm_clock = cpu_to_le32(mm_time);
-qxl_rom_set_dirty(qxl);
-}
-#endif
-
 static void interface_get_init_info(QXLInstance *sin, QXLDevInitInfo *info)
 {
 PCIQXLDevice *qxl = container_of(sin, PCIQXLDevice, ssd.qxl);
@@ -1106,12 +1088,10 @@ static int interface_client_monitors_config(QXLInstance 
*sin,