Browse Source

ui: drop spice-protocol < 0.14.3 support

According to repology, all our supported distributions have 0.14.3.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Link: https://lore.kernel.org/r/20260211-cleanups-v1-7-e63c96572389@redhat.com
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
master
Marc-André Lureau 2 months ago
committed by Paolo Bonzini
parent
commit
1df5a9be65
  1. 2
      meson.build
  2. 18
      ui/vdagent.c

2
meson.build

@ -1325,7 +1325,7 @@ endif
spice_protocol = not_found
if not get_option('spice_protocol').auto() or have_system
spice_protocol = dependency('spice-protocol', version: '>=0.14.0',
spice_protocol = dependency('spice-protocol', version: '>=0.14.3',
required: get_option('spice_protocol'),
method: 'pkg-config')
endif

18
ui/vdagent.c

@ -17,14 +17,6 @@
#include "spice/vd_agent.h"
#define CHECK_SPICE_PROTOCOL_VERSION(major, minor, micro) \
(CONFIG_SPICE_PROTOCOL_MAJOR > (major) || \
(CONFIG_SPICE_PROTOCOL_MAJOR == (major) && \
CONFIG_SPICE_PROTOCOL_MINOR > (minor)) || \
(CONFIG_SPICE_PROTOCOL_MAJOR == (major) && \
CONFIG_SPICE_PROTOCOL_MINOR == (minor) && \
CONFIG_SPICE_PROTOCOL_MICRO >= (micro)))
#define VDAGENT_BUFFER_LIMIT (1 * MiB)
#define VDAGENT_MOUSE_DEFAULT true
#define VDAGENT_CLIPBOARD_DEFAULT false
@ -87,10 +79,8 @@ static const char *cap_name[] = {
[VD_AGENT_CAP_FILE_XFER_DISABLED] = "file-xfer-disabled",
[VD_AGENT_CAP_FILE_XFER_DETAILED_ERRORS] = "file-xfer-detailed-errors",
[VD_AGENT_CAP_GRAPHICS_DEVICE_INFO] = "graphics-device-info",
#if CHECK_SPICE_PROTOCOL_VERSION(0, 14, 1)
[VD_AGENT_CAP_CLIPBOARD_NO_RELEASE_ON_REGRAB] = "clipboard-no-release-on-regrab",
[VD_AGENT_CAP_CLIPBOARD_GRAB_SERIAL] = "clipboard-grab-serial",
#endif
};
static const char *msg_name[] = {
@ -125,9 +115,7 @@ static const char *type_name[] = {
[VD_AGENT_CLIPBOARD_IMAGE_BMP] = "bmp",
[VD_AGENT_CLIPBOARD_IMAGE_TIFF] = "tiff",
[VD_AGENT_CLIPBOARD_IMAGE_JPG] = "jpg",
#if CHECK_SPICE_PROTOCOL_VERSION(0, 14, 3)
[VD_AGENT_CLIPBOARD_FILE_LIST] = "files",
#endif
};
#define GET_NAME(_m, _v) \
@ -197,9 +185,7 @@ static void vdagent_send_caps(VDAgentChardev *vd, bool request)
if (vd->clipboard) {
caps->caps[0] |= (1 << VD_AGENT_CAP_CLIPBOARD_BY_DEMAND);
caps->caps[0] |= (1 << VD_AGENT_CAP_CLIPBOARD_SELECTION);
#if CHECK_SPICE_PROTOCOL_VERSION(0, 14, 1)
caps->caps[0] |= (1 << VD_AGENT_CAP_CLIPBOARD_GRAB_SERIAL);
#endif
}
caps->request = request;
@ -318,11 +304,7 @@ static bool have_selection(VDAgentChardev *vd)
static bool have_clipboard_serial(VDAgentChardev *vd)
{
#if CHECK_SPICE_PROTOCOL_VERSION(0, 14, 1)
return vd->caps & (1 << VD_AGENT_CAP_CLIPBOARD_GRAB_SERIAL);
#else
return false;
#endif
}
static uint32_t type_qemu_to_vdagent(enum QemuClipboardType type)

Loading…
Cancel
Save