diff options
| author | Markus Armbruster <armbru@redhat.com> | 2023-01-09 20:03:09 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2023-01-19 13:30:01 +0100 |
| commit | 34d55725e664445ccd5621165b1ef805197a530e (patch) | |
| tree | 8bdb6f647565bd398574d7aa0c167e52930b0fed /include | |
| parent | f4c1bcb8c447cde358c9560672d13b90018074e8 (diff) | |
| download | qemu-34d55725e664445ccd5621165b1ef805197a530e.zip qemu-34d55725e664445ccd5621165b1ef805197a530e.tar.gz qemu-34d55725e664445ccd5621165b1ef805197a530e.tar.bz2 | |
ui/spice: Require spice-server >= 0.14.0
Version 0.14.0 is now old enough to have made it into the major
distributions:
Debian 11: 0.14.3
RHEL-8: 0.14.3
FreeBSD (ports): 0.15.0
Fedora 35: 0.15.0
Ubuntu 20.04: 0.14.2
OpenSUSE Leap 15.3: 0.14.3
Requiring it lets us drop a number of version checks. The next commit
will clean up some more.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20230109190321.1056914-6-armbru@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/ui/qemu-spice.h | 6 | ||||
| -rw-r--r-- | include/ui/spice-display.h | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/include/ui/qemu-spice.h b/include/ui/qemu-spice.h index 21fe195..a7a1890 100644 --- a/include/ui/qemu-spice.h +++ b/include/ui/qemu-spice.h @@ -34,13 +34,9 @@ int qemu_spice_add_display_interface(QXLInstance *qxlin, QemuConsole *con); int qemu_spice_migrate_info(const char *hostname, int port, int tls_port, const char *subject); -#if !defined(SPICE_SERVER_VERSION) || (SPICE_SERVER_VERSION < 0xc06) -#define SPICE_NEEDS_SET_MM_TIME 1 -#else #define SPICE_NEEDS_SET_MM_TIME 0 -#endif -#if defined(SPICE_SERVER_VERSION) && (SPICE_SERVER_VERSION >= 0x000f00) +#if SPICE_SERVER_VERSION >= 0x000f00 /* release 0.15.0 */ #define SPICE_HAS_ATTACHED_WORKER 1 #else #define SPICE_HAS_ATTACHED_WORKER 0 diff --git a/include/ui/spice-display.h b/include/ui/spice-display.h index e271e01..5aa1366 100644 --- a/include/ui/spice-display.h +++ b/include/ui/spice-display.h @@ -28,11 +28,9 @@ #include "ui/console.h" #if defined(CONFIG_OPENGL) && defined(CONFIG_GBM) -# if SPICE_SERVER_VERSION >= 0x000d01 /* release 0.13.1 */ # define HAVE_SPICE_GL 1 # include "ui/egl-helpers.h" # include "ui/egl-context.h" -# endif #endif #define NUM_MEMSLOTS 8 |