From 1a663b53c0efd2b8b424354d9bfd6853cfab910f Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Wed, 19 Jul 2023 13:26:31 +0200 Subject: [PATCH] qemu: Always assume QEMU_CAPS_USB_STORAGE_REMOVABLE Introduced in QEMU commit of v0.14.0-rc0~83^2~1 and not being able to compile the .removable attribute of the "usb-storage" object out, renders our corresponding capability QEMU_CAPS_USB_STORAGE_REMOVABLE always set. Stop using it in command generation / domain validation. Signed-off-by: Michal Privoznik --- src/qemu/qemu_command.c | 10 ++++------ src/qemu/qemu_validate.c | 8 -------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ad224571f3..9f04bfc57d 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1842,12 +1842,10 @@ qemuBuildDiskDeviceProps(const virDomainDef *def, case VIR_DOMAIN_DISK_BUS_USB: driver = "usb-storage"; - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_USB_STORAGE_REMOVABLE)) { - if (disk->removable == VIR_TRISTATE_SWITCH_ABSENT) - removable = VIR_TRISTATE_SWITCH_OFF; - else - removable = disk->removable; - } + if (disk->removable == VIR_TRISTATE_SWITCH_ABSENT) + removable = VIR_TRISTATE_SWITCH_OFF; + else + removable = disk->removable; break; diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 7e09e2c52f..477ae997fe 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -3006,14 +3006,6 @@ qemuValidateDomainDeviceDefDiskFrontend(const virDomainDiskDef *disk, return -1; } - if (disk->removable != VIR_TRISTATE_SWITCH_ABSENT && - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_USB_STORAGE_REMOVABLE)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("This QEMU doesn't support setting the " - "removable flag of USB storage devices")); - return -1; - } - break; case VIR_DOMAIN_DISK_BUS_XEN: