From ba2b2ad1bb9c87acb7eeea303c0087ac1cc9d652 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Wed, 16 Aug 2023 13:49:24 +0200 Subject: [PATCH] qemu: capabilities: Retire unused QEMU_CAPS_DEVICE_IVSHMEM MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit qemu removed the support for the old 'ivshmem' device in 4.0 release. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- src/qemu/qemu_capabilities.c | 3 +-- src/qemu/qemu_capabilities.h | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index f80bdb579d..40eacf0f4d 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -312,7 +312,7 @@ VIR_ENUM_IMPL(virQEMUCaps, /* 175 */ "migrate-rdma", /* QEMU_CAPS_MIGRATE_RDMA */ - "ivshmem", /* QEMU_CAPS_DEVICE_IVSHMEM */ + "ivshmem", /* X_QEMU_CAPS_DEVICE_IVSHMEM */ "drive-iotune-max", /* X_QEMU_CAPS_DRIVE_IOTUNE_MAX */ "VGA.vgamem_mb", /* QEMU_CAPS_VGA_VGAMEM */ "vmware-svga.vgamem_mb", /* QEMU_CAPS_VMWARE_SVGA_VGAMEM */ @@ -1270,7 +1270,6 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { { "pvpanic", QEMU_CAPS_DEVICE_PANIC }, { "usb-kbd", QEMU_CAPS_DEVICE_USB_KBD }, { "usb-audio", QEMU_CAPS_OBJECT_USB_AUDIO }, - { "ivshmem", QEMU_CAPS_DEVICE_IVSHMEM }, { "pc-dimm", QEMU_CAPS_DEVICE_PC_DIMM }, { "pci-serial", QEMU_CAPS_DEVICE_PCI_SERIAL }, { "gpex-pcihost", QEMU_CAPS_OBJECT_GPEX}, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index c72f73a161..2198b94cf2 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -290,7 +290,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ /* 175 */ QEMU_CAPS_MIGRATE_RDMA, /* have rdma migration */ - QEMU_CAPS_DEVICE_IVSHMEM, /* -device ivshmem */ + X_QEMU_CAPS_DEVICE_IVSHMEM, /* -device ivshmem */ X_QEMU_CAPS_DRIVE_IOTUNE_MAX, /* -drive bps_max= and friends */ QEMU_CAPS_VGA_VGAMEM, /* -device VGA.vgamem_mb */ QEMU_CAPS_VMWARE_SVGA_VGAMEM, /* -device vmware-svga.vgamem_mb */