From nobody Sun Dec 14 06:21:55 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1750709364; cv=none; d=zohomail.com; s=zohoarc; b=WVuZ8hefKYDT24LjQEmZgSSZlaQAPLqQ/YVYrqkFk0tTTGNNnsrPExZdF0cCZPUeachIpVyKgb0GI0I6mrB4cizktJaAI/D/erhIO+xbfXlF6/CGf8O0gmB9u8f7gNkcOAxMNheyFF9sM7HPYJkeVpqcfbpiK5+LNM57bZptH4E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750709364; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=GB9jEcMfceDpKEQqMpgO30mC46gCIZHDU+tQTAaJYDo=; b=h4qCaD/6IJcYt7RiTcAdD+6K7hj1tB6fF+mm0+5nUbqQVj2ew5bVxWYWaW8tMs1Z6wGTk5vp5yLru8jtcodcSPqAQ8UZkv7DUaMxsduog2diYiVNhGUoJD6+/Ca/C1J+9i6p9Cw8oT4E5+zn0oROeJBkzzqeiOezPT0ihEnC0t8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1750709364432467.0646129886053; Mon, 23 Jun 2025 13:09:24 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 630FC97D; Mon, 23 Jun 2025 16:09:23 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id E345812BC; Mon, 23 Jun 2025 16:00:18 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id C512C1262; Mon, 23 Jun 2025 16:00:10 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id B89E1E3A for ; Mon, 23 Jun 2025 15:59:41 -0400 (EDT) Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-693-o2Q0tscYO5et-V4aBQm9-g-1; Mon, 23 Jun 2025 15:59:38 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D6680195608B for ; Mon, 23 Jun 2025 19:59:37 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.5]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1C8CA19560A3 for ; Mon, 23 Jun 2025 19:59:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1750708781; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vFqTJ4bQLbqoEL+/6UURYSJuZd0j5aSc4DjvfT4Ovwk=; b=i76fRManMQz1GWUxCcNXHe3D80rN9msMC7jnNXNWvaZ/6HEEi1KqpwNYfh8MdK/vBNhe9m rR6NSWBdhX/1r/QWZPLeKuwcMxEGM4n0D0PXhxkD9RaN0QjSIIw6ys1Lrt3eex/ISGpDnE rxu6yVVx30p4zTNAITls/85g2yPtYqw= X-MC-Unique: o2Q0tscYO5et-V4aBQm9-g-1 X-Mimecast-MFC-AGG-ID: o2Q0tscYO5et-V4aBQm9-g_1750708777 To: devel@lists.libvirt.org Subject: [PATCH v2 13/13] qemu: Replace usb-storage with usb-bot Date: Mon, 23 Jun 2025 21:59:18 +0200 Message-ID: <3ff4b9fad0eab397866824d204d05371c16cdbc0.1750705681.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: tA0NmiMlvGUXrsKHg1n4a70gYn_1EkJhU12j8gGjAI4_1750708777 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: LZNPB3MUKCCKL3EFON3GZFUTSKWMPU3B X-Message-ID-Hash: LZNPB3MUKCCKL3EFON3GZFUTSKWMPU3B X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1750709365947116600 Content-Type: text/plain; charset="utf-8" From: Akihiko Odaki usb-storage is a compound device that automatically creates a USB mass storage device and a SCSI device as its backend. Unfortunately it lacks some configuration options that are usually present with a SCSI device, and cannot represent CD-ROM in particular. Replace usb-storage with usb-bot, which can be combined with a manually created SCSI device. libvirt will configure the SCSI device in a way identical with how QEMU does for usb-storage except that now it respects a configuration option to represent CD-ROM. Resolves: https://gitlab.com/libvirt/libvirt/-/issues/368 Signed-off-by: Akihiko Odaki Signed-off-by: Peter Krempa Reviewed-by: Jiri Denemark --- src/qemu/qemu_alias.c | 20 ++++- src/qemu/qemu_capabilities.c | 3 +- src/qemu/qemu_command.c | 86 ++++++++++++++++--- src/qemu/qemu_command.h | 5 ++ src/qemu/qemu_hotplug.c | 18 ++++ src/qemu/qemu_validate.c | 38 ++++++-- tests/qemuhotplugtest.c | 4 +- ...om-usb-empty.x86_64-latest.abi-update.args | 3 +- .../disk-usb-device-model.x86_64-latest.args | 6 +- ...k-usb-device.x86_64-latest.abi-update.args | 12 ++- 10 files changed, 167 insertions(+), 28 deletions(-) diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c index 9d39ebd63d..67cbddd470 100644 --- a/src/qemu/qemu_alias.c +++ b/src/qemu/qemu_alias.c @@ -268,8 +268,24 @@ qemuAssignDeviceDiskAlias(virDomainDef *def, break; case VIR_DOMAIN_DISK_BUS_USB: - diskPriv->qomName =3D g_strdup_printf("/machine/peripheral/%s/= %s.0/legacy[0]", - disk->info.alias, disk->in= fo.alias); + switch (disk->model) { + case VIR_DOMAIN_DISK_MODEL_USB_STORAGE: + diskPriv->qomName =3D g_strdup_printf("/machine/peripheral= /%s/%s.0/legacy[0]", + disk->info.alias, disk= ->info.alias); + break; + + case VIR_DOMAIN_DISK_MODEL_USB_BOT: + diskPriv->qomName =3D g_strdup_printf("/machine/peripheral= /%s-disk", + disk->info.alias); + break; + + case VIR_DOMAIN_DISK_MODEL_DEFAULT: + case VIR_DOMAIN_DISK_MODEL_VIRTIO: + case VIR_DOMAIN_DISK_MODEL_VIRTIO_TRANSITIONAL: + case VIR_DOMAIN_DISK_MODEL_VIRTIO_NON_TRANSITIONAL: + case VIR_DOMAIN_DISK_MODEL_LAST: + break; + } break; case VIR_DOMAIN_DISK_BUS_XEN: diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index f480060e50..ef6ec661ff 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -6472,7 +6472,8 @@ virQEMUCapsFillDomainDeviceDiskCaps(virQEMUCaps *qemu= Caps, VIR_DOMAIN_DISK_BUS_VIRTIO, /* VIR_DOMAIN_DISK_BUS_SD */); - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_USB_STORAGE)) + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_USB_STORAGE) || + virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_USB_BOT)) VIR_DOMAIN_CAPS_ENUM_SET(disk->bus, VIR_DOMAIN_DISK_BUS_USB); if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_ICH9_AHCI)) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 910242a389..98fd6fee85 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1626,6 +1626,33 @@ qemuBuildIothreadMappingProps(GSList *iothreads) return g_steal_pointer(&ret); } +int +qemuBuildDiskBusProps(const virDomainDef *def, + const virDomainDiskDef *disk, + virJSONValue **propsRet) +{ + g_autoptr(virJSONValue) props =3D NULL; + + *propsRet =3D NULL; + + if (disk->bus !=3D VIR_DOMAIN_DISK_BUS_USB || + disk->model !=3D VIR_DOMAIN_DISK_MODEL_USB_BOT) + return 0; + + if (virJSONValueObjectAdd(&props, + "s:driver", "usb-bot", + "s:id", disk->info.alias, + "S:serial", disk->serial, + NULL) < 0) + return -1; + + if (qemuBuildDeviceAddressProps(props, def, &disk->info) < 0) + return -1; + + *propsRet =3D g_steal_pointer(&props); + + return 0; +} virJSONValue * qemuBuildDiskDeviceProps(const virDomainDef *def, @@ -1652,6 +1679,18 @@ qemuBuildDiskDeviceProps(const virDomainDef *def, const char *rpolicy =3D NULL; const char *model =3D NULL; const char *product =3D NULL; + const char *alias =3D disk->info.alias; + g_autofree char *usbdiskalias =3D NULL; + const virDomainDeviceInfo *deviceinfo =3D &disk->info; + virDomainDeviceInfo usbSCSIinfo =3D { + .type =3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE, + .addr.drive =3D { .diskbus =3D VIR_DOMAIN_DISK_BUS_USB }, + .effectiveBootIndex =3D deviceinfo->effectiveBootIndex, + .alias =3D deviceinfo->alias, + }; + + if (disk->info.type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE) + disk->info.addr.drive.diskbus =3D disk->bus; switch (disk->bus) { case VIR_DOMAIN_DISK_BUS_IDE: @@ -1735,13 +1774,35 @@ qemuBuildDiskDeviceProps(const virDomainDef *def, break; case VIR_DOMAIN_DISK_BUS_USB: - driver =3D "usb-storage"; + switch (disk->model) { + case VIR_DOMAIN_DISK_MODEL_USB_STORAGE: + driver =3D "usb-storage"; - if (disk->removable =3D=3D VIR_TRISTATE_SWITCH_ABSENT) - removable =3D VIR_TRISTATE_SWITCH_OFF; - else - removable =3D disk->removable; + if (disk->removable =3D=3D VIR_TRISTATE_SWITCH_ABSENT) + removable =3D VIR_TRISTATE_SWITCH_OFF; + else + removable =3D disk->removable; + break; + + case VIR_DOMAIN_DISK_MODEL_USB_BOT: + if (disk->device =3D=3D VIR_DOMAIN_DISK_DEVICE_CDROM) { + driver =3D "scsi-cd"; + } else { + driver =3D "scsi-hd"; + removable =3D disk->removable; + } + deviceinfo =3D &usbSCSIinfo; + alias =3D usbdiskalias =3D g_strdup_printf("%s-device", disk->= info.alias); + break; + + case VIR_DOMAIN_DISK_MODEL_DEFAULT: + case VIR_DOMAIN_DISK_MODEL_VIRTIO: + case VIR_DOMAIN_DISK_MODEL_VIRTIO_TRANSITIONAL: + case VIR_DOMAIN_DISK_MODEL_VIRTIO_NON_TRANSITIONAL: + case VIR_DOMAIN_DISK_MODEL_LAST: + break; + } break; case VIR_DOMAIN_DISK_BUS_FDC: @@ -1771,10 +1832,7 @@ qemuBuildDiskDeviceProps(const virDomainDef *def, return NULL; } - if (disk->info.type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE) - disk->info.addr.drive.diskbus =3D disk->bus; - - if (qemuBuildDeviceAddressProps(props, def, &disk->info) < 0) + if (qemuBuildDeviceAddressProps(props, def, deviceinfo) < 0) return NULL; if (disk->src->shared) @@ -1836,7 +1894,7 @@ qemuBuildDiskDeviceProps(const virDomainDef *def, "T:share-rw", shareRW, "S:drive", drive, "S:chardev", chardev, - "s:id", disk->info.alias, + "s:id", alias, "p:bootindex", bootindex, "S:loadparm", bootLoadparm, "p:logical_block_size", logical_block_size, @@ -2201,6 +2259,7 @@ qemuBuildDiskCommandLine(virCommand *cmd, virQEMUCaps *qemuCaps) { g_autoptr(virJSONValue) devprops =3D NULL; + g_autoptr(virJSONValue) busprops =3D NULL; if (qemuBuildDiskSourceCommandLine(cmd, disk, qemuCaps) < 0) return -1; @@ -2216,6 +2275,13 @@ qemuBuildDiskCommandLine(virCommand *cmd, if (qemuCommandAddExtDevice(cmd, &disk->info, def, qemuCaps) < 0) return -1; + if (qemuBuildDiskBusProps(def, disk, &busprops) < 0) + return -1; + + if (busprops && + qemuBuildDeviceCommandlineFromJSON(cmd, busprops, def, qemuCaps) <= 0) + return -1; + if (!(devprops =3D qemuBuildDiskDeviceProps(def, disk, qemuCaps))) return -1; diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 2d43cf5506..574dffdc96 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -129,6 +129,11 @@ qemuBuildThrottleFiltersAttachPrepareBlockdev(virDomai= nDiskDef *disk); qemuBlockThrottleFiltersData * qemuBuildThrottleFiltersDetachPrepareBlockdev(virDomainDiskDef *disk); +int +qemuBuildDiskBusProps(const virDomainDef *def, + const virDomainDiskDef *disk, + virJSONValue **propsRet); + virJSONValue * qemuBuildDiskDeviceProps(const virDomainDef *def, virDomainDiskDef *disk, diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index e1ed8181e3..4f6a3d3414 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -703,8 +703,10 @@ qemuDomainAttachDiskGeneric(virDomainObj *vm, g_autoptr(qemuBlockStorageSourceChainData) data =3D NULL; g_autoptr(qemuBlockThrottleFiltersData) filterData =3D NULL; qemuDomainObjPrivate *priv =3D vm->privateData; + g_autoptr(virJSONValue) busprops =3D NULL; g_autoptr(virJSONValue) devprops =3D NULL; bool extensionDeviceAttached =3D false; + bool busAdded =3D false; int rc; g_autoptr(qemuSnapshotDiskContext) transientDiskSnapshotCtxt =3D NULL; bool origReadonly =3D disk->src->readonly; @@ -774,6 +776,9 @@ qemuDomainAttachDiskGeneric(virDomainObj *vm, } } + if (qemuBuildDiskBusProps(vm->def, disk, &busprops) < 0) + goto rollback; + if (!(devprops =3D qemuBuildDiskDeviceProps(vm->def, disk, priv->qemuC= aps))) goto rollback; @@ -783,6 +788,10 @@ qemuDomainAttachDiskGeneric(virDomainObj *vm, if ((rc =3D qemuDomainAttachExtensionDevice(priv->mon, &disk->info)) = =3D=3D 0) extensionDeviceAttached =3D true; + if (rc =3D=3D 0 && busprops && + (rc =3D qemuMonitorAddDeviceProps(priv->mon, &busprops)) =3D=3D 0) + busAdded =3D true; + if (rc =3D=3D 0) rc =3D qemuMonitorAddDeviceProps(priv->mon, &devprops); @@ -811,6 +820,12 @@ qemuDomainAttachDiskGeneric(virDomainObj *vm, } } + if (rc =3D=3D 0) { + if (disk->bus =3D=3D VIR_DOMAIN_DISK_BUS_USB && + disk->model =3D=3D VIR_DOMAIN_DISK_MODEL_USB_BOT) + rc =3D qemuMonitorSetUSBDiskAttached(priv->mon, disk->info.ali= as); + } + qemuDomainObjExitMonitor(vm); if (rc < 0) @@ -822,6 +837,9 @@ qemuDomainAttachDiskGeneric(virDomainObj *vm, if (qemuDomainObjEnterMonitorAsync(vm, asyncJob) < 0) return -1; + if (busAdded) + ignore_value(qemuMonitorDelDevice(priv->mon, disk->info.alias)); + if (extensionDeviceAttached) ignore_value(qemuDomainDetachExtensionDevice(priv->mon, &disk->inf= o)); diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 7e0e4db516..4b8d4fc692 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -3183,16 +3183,40 @@ qemuValidateDomainDeviceDefDiskFrontend(const virDo= mainDiskDef *disk, break; case VIR_DOMAIN_DISK_BUS_USB: - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_USB_STORAGE)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("This QEMU doesn't support '-device usb-stora= ge'")); + switch (disk->model) { + case VIR_DOMAIN_DISK_MODEL_DEFAULT: + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("USB disk model was not selected by selection= code")); return -1; - } - if (disk->model =3D=3D VIR_DOMAIN_DISK_MODEL_USB_STORAGE && - virStorageSourceIsEmpty(disk->src)) { + case VIR_DOMAIN_DISK_MODEL_USB_STORAGE: + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_USB_STORAGE)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("This QEMU doesn't support '-device usb-s= torage'")); + return -1; + } + + if (virStorageSourceIsEmpty(disk->src)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("'usb' disk must not be empty")); + return -1; + } + break; + + case VIR_DOMAIN_DISK_MODEL_USB_BOT: + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_USB_BOT)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("This QEMU doesn't support '-device usb-b= ot'")); + return -1; + } + break; + + case VIR_DOMAIN_DISK_MODEL_VIRTIO_TRANSITIONAL: + case VIR_DOMAIN_DISK_MODEL_VIRTIO: + case VIR_DOMAIN_DISK_MODEL_VIRTIO_NON_TRANSITIONAL: + case VIR_DOMAIN_DISK_MODEL_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("'usb' disk must not be empty")); + _("USB disk supports only models: 'usb-storage'= , 'usb-bot''")); return -1; } diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index fdb5093549..7881ccf327 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -746,7 +746,9 @@ mymain(void) DO_TEST_ATTACH("x86_64", "base-live", "cdrom-usb", false, true, "blockdev-add", QMP_OK, "device_add", QMP_OK, - "query-block", QMP_EMPTY_ARRAY); + "device_add", QMP_OK, + "query-block", QMP_EMPTY_ARRAY, + "qom-set", QMP_OK); DO_TEST_DETACH("x86_64", "base-live", "cdrom-usb", true, true, "device_del", QMP_OK); DO_TEST_DETACH("x86_64", "base-live", "cdrom-usb", false, false, diff --git a/tests/qemuxmlconfdata/disk-cdrom-usb-empty.x86_64-latest.abi-u= pdate.args b/tests/qemuxmlconfdata/disk-cdrom-usb-empty.x86_64-latest.abi-u= pdate.args index cebc6e66e8..44bf27e9a4 100644 --- a/tests/qemuxmlconfdata/disk-cdrom-usb-empty.x86_64-latest.abi-update.a= rgs +++ b/tests/qemuxmlconfdata/disk-cdrom-usb-empty.x86_64-latest.abi-update.a= rgs @@ -27,7 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --device '{"driver":"usb-storage","bus":"usb.0","port":"1","id":"usb-disk1"= ,"removable":false}' \ +-device '{"driver":"usb-bot","id":"usb-disk1","bus":"usb.0","port":"1"}' \ +-device '{"driver":"scsi-cd","bus":"usb-disk1.0","scsi-id":0,"lun":0,"id":= "usb-disk1-device"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/disk-usb-device-model.x86_64-latest.args= b/tests/qemuxmlconfdata/disk-usb-device-model.x86_64-latest.args index 6d31319a49..f50b0d5849 100644 --- a/tests/qemuxmlconfdata/disk-usb-device-model.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-usb-device-model.x86_64-latest.args @@ -33,9 +33,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -blockdev '{"driver":"file","filename":"/tmp/img2","node-name":"libvirt-5-= storage","read-only":true}' \ -device '{"driver":"usb-storage","bus":"usb.0","port":"1.1","drive":"libvi= rt-5-storage","id":"usb-disk1","removable":false}' \ -blockdev '{"driver":"file","filename":"/tmp/img3","node-name":"libvirt-4-= storage","read-only":false}' \ --device '{"driver":"usb-storage","bus":"usb.0","port":"1.2","drive":"libvi= rt-4-storage","id":"usb-disk2","removable":false}' \ +-device '{"driver":"usb-bot","id":"usb-disk2","bus":"usb.0","port":"1.2"}'= \ +-device '{"driver":"scsi-hd","bus":"usb-disk2.0","scsi-id":0,"lun":0,"driv= e":"libvirt-4-storage","id":"usb-disk2-device"}' \ -blockdev '{"driver":"file","filename":"/tmp/img4","node-name":"libvirt-3-= storage","read-only":true}' \ --device '{"driver":"usb-storage","bus":"usb.0","port":"1.3","drive":"libvi= rt-3-storage","id":"usb-disk3","removable":false}' \ +-device '{"driver":"usb-bot","id":"usb-disk3","bus":"usb.0","port":"1.3"}'= \ +-device '{"driver":"scsi-cd","bus":"usb-disk3.0","scsi-id":0,"lun":0,"driv= e":"libvirt-3-storage","id":"usb-disk3-device"}' \ -blockdev '{"driver":"file","filename":"/tmp/img5","node-name":"libvirt-2-= storage","read-only":false}' \ -device '{"driver":"usb-storage","bus":"usb.0","port":"1.4","drive":"libvi= rt-2-storage","id":"usb-disk4","removable":false}' \ -blockdev '{"driver":"file","filename":"/tmp/img6","node-name":"libvirt-1-= storage","read-only":true}' \ diff --git a/tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.abi-update= .args b/tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.abi-update.args index 079dfe5d99..d8208d29b6 100644 --- a/tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.abi-update.args +++ b/tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.abi-update.args @@ -32,19 +32,23 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -blockdev '{"driver":"file","filename":"/tmp/img1","node-name":"libvirt-12= -storage","read-only":false}' \ -device '{"driver":"usb-storage","bus":"usb.0","port":"1.1","drive":"libvi= rt-12-storage","id":"usb-disk0","bootindex":1,"removable":false}' \ -blockdev '{"driver":"file","filename":"/tmp/img2","node-name":"libvirt-11= -storage","read-only":true}' \ --device '{"driver":"usb-storage","bus":"usb.0","port":"1.2","drive":"libvi= rt-11-storage","id":"usb-disk1","removable":false}' \ +-device '{"driver":"usb-bot","id":"usb-disk1","bus":"usb.0","port":"1.2"}'= \ +-device '{"driver":"scsi-cd","bus":"usb-disk1.0","scsi-id":0,"lun":0,"driv= e":"libvirt-11-storage","id":"usb-disk1-device"}' \ -blockdev '{"driver":"file","filename":"/tmp/img3","node-name":"libvirt-10= -storage","read-only":false}' \ -device '{"driver":"usb-storage","bus":"usb.0","port":"1.3","drive":"libvi= rt-10-storage","id":"usb-disk2","removable":false,"serial":"testserial1"}' \ -blockdev '{"driver":"file","filename":"/tmp/img4","node-name":"libvirt-9-= storage","read-only":true}' \ --device '{"driver":"usb-storage","bus":"usb.0","port":"1.4","drive":"libvi= rt-9-storage","id":"usb-disk3","removable":false,"serial":"testserial2"}' \ +-device '{"driver":"usb-bot","id":"usb-disk3","serial":"testserial2","bus"= :"usb.0","port":"1.4"}' \ +-device '{"driver":"scsi-cd","bus":"usb-disk3.0","scsi-id":0,"lun":0,"driv= e":"libvirt-9-storage","id":"usb-disk3-device","serial":"testserial2"}' \ -blockdev '{"driver":"file","filename":"/tmp/img5","node-name":"libvirt-8-= storage","read-only":false}' \ -device '{"driver":"usb-storage","bus":"usb.0","port":"1.5","drive":"libvi= rt-8-storage","id":"ua-test1","removable":false}' \ -blockdev '{"driver":"file","filename":"/tmp/img6","node-name":"libvirt-7-= storage","read-only":true}' \ --device '{"driver":"usb-storage","bus":"usb.0","port":"1.6","drive":"libvi= rt-7-storage","id":"ua-test2","removable":false}' \ +-device '{"driver":"usb-bot","id":"ua-test2","bus":"usb.0","port":"1.6"}' \ +-device '{"driver":"scsi-cd","bus":"ua-test2.0","scsi-id":0,"lun":0,"drive= ":"libvirt-7-storage","id":"ua-test2-device"}' \ -blockdev '{"driver":"file","filename":"/tmp/img7","node-name":"libvirt-6-= storage","read-only":false}' \ -device '{"driver":"usb-storage","bus":"usb.0","port":"1.7","drive":"libvi= rt-6-storage","id":"ua-test3","removable":false,"serial":"testserial3"}' \ -blockdev '{"driver":"file","filename":"/tmp/img8","node-name":"libvirt-5-= storage","read-only":true}' \ --device '{"driver":"usb-storage","bus":"usb.0","port":"1.8","drive":"libvi= rt-5-storage","id":"ua-test4","removable":false,"serial":"testserial4"}' \ +-device '{"driver":"usb-bot","id":"ua-test4","serial":"testserial4","bus":= "usb.0","port":"1.8"}' \ +-device '{"driver":"scsi-cd","bus":"ua-test4.0","scsi-id":0,"lun":0,"drive= ":"libvirt-5-storage","id":"ua-test4-device","serial":"testserial4"}' \ -blockdev '{"driver":"file","filename":"/tmp/img9","node-name":"libvirt-4-= storage","read-only":false}' \ -device '{"driver":"usb-storage","bus":"usb.0","port":"2.1","drive":"libvi= rt-4-storage","id":"usb-disk8","removable":true}' \ -blockdev '{"driver":"file","filename":"/tmp/imga","node-name":"libvirt-3-= storage","read-only":false}' \ --=20 2.49.0