<div dir="ltr">ping~<br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Mon, Jun 5, 2023 at 1:07 PM Han Han <<a href="mailto:hhan@redhat.com">hhan@redhat.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Allow //disk/target@removable for scsi disk devices, since QEMU has support<br>
the removable attribute for scsi-hd device from v0.14.0[1].<br>
<br>
[1]: 419e691f8e: scsi-disk: Allow overriding SCSI INQUIRY removable bit<br>
<br>
Signed-off-by: Han Han <<a href="mailto:hhan@redhat.com" target="_blank">hhan@redhat.com</a>><br>
---<br>
docs/formatdomain.rst | 2 +-<br>
src/conf/domain_validate.c | 5 +++--<br>
src/qemu/qemu_command.c | 6 ++++--<br>
...gs => disk-device-removable.x86_64-latest.args} | 14 +++++++++-----<br>
...ice-removable.xml => disk-device-removable.xml} | 5 +++++<br>
tests/qemuxml2argvtest.c | 2 +-<br>
6 files changed, 23 insertions(+), 11 deletions(-)<br>
rename tests/qemuxml2argvdata/{disk-usb-device-removable.x86_64-latest.args => disk-device-removable.x86_64-latest.args} (70%)<br>
rename tests/qemuxml2argvdata/{disk-usb-device-removable.xml => disk-device-removable.xml} (80%)<br>
<br>
diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst<br>
index c3526439bf..676e4b9fd3 100644<br>
--- a/docs/formatdomain.rst<br>
+++ b/docs/formatdomain.rst<br>
@@ -3094,7 +3094,7 @@ paravirtualized driver is specified via the ``disk`` element.<br>
CDROM or Floppy disk), the value can be either "open" or "closed", defaults<br>
to "closed". NB, the value of ``tray`` could be updated while the domain is<br>
running. The optional attribute ``removable`` sets the removable flag for USB<br>
- disks, and its value can be either "on" or "off", defaulting to "off".<br>
+ or SCSI disks, and its value can be either "on" or "off", defaulting to "off".<br>
The optional attribute ``rotation_rate`` sets the rotation rate of the<br>
storage for disks on a SCSI, IDE, or SATA bus. Values in the range 1025 to<br>
65534 are used to indicate rotational media speed in revolutions per minute.<br>
diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c<br>
index 80d6a2ffd9..e7122f6297 100644<br>
--- a/src/conf/domain_validate.c<br>
+++ b/src/conf/domain_validate.c<br>
@@ -881,9 +881,10 @@ virDomainDiskDefValidate(const virDomainDef *def,<br>
}<br>
<br>
if (disk->removable != VIR_TRISTATE_SWITCH_ABSENT &&<br>
- disk->bus != VIR_DOMAIN_DISK_BUS_USB) {<br>
+ disk->bus != VIR_DOMAIN_DISK_BUS_USB &&<br>
+ !(disk->bus == VIR_DOMAIN_DISK_BUS_SCSI && disk->device == VIR_DOMAIN_DISK_DEVICE_DISK)) {<br>
virReportError(VIR_ERR_XML_ERROR, "%s",<br>
- _("removable is only valid for usb disks"));<br>
+ _("removable is only valid for usb or scsi disks"));<br>
return -1;<br>
}<br>
<br>
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c<br>
index 72363238b8..5ec912ddee 100644<br>
--- a/src/qemu/qemu_command.c<br>
+++ b/src/qemu/qemu_command.c<br>
@@ -1781,10 +1781,12 @@ qemuBuildDiskDeviceProps(const virDomainDef *def,<br>
if (disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) {<br>
driver = "scsi-block";<br>
} else {<br>
- if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM)<br>
+ if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) {<br>
driver = "scsi-cd";<br>
- else<br>
+ } else {<br>
driver = "scsi-hd";<br>
+ removable = disk->removable;<br>
+ }<br>
<br>
/* qemu historically used the name of -drive as one of the device<br>
* ids in the Vital Product Data Device Identification page if<br>
diff --git a/tests/qemuxml2argvdata/disk-usb-device-removable.x86_64-latest.args b/tests/qemuxml2argvdata/disk-device-removable.x86_64-latest.args<br>
similarity index 70%<br>
rename from tests/qemuxml2argvdata/disk-usb-device-removable.x86_64-latest.args<br>
rename to tests/qemuxml2argvdata/disk-device-removable.x86_64-latest.args<br>
index c5bfd8e8e0..106f7b9ce2 100644<br>
--- a/tests/qemuxml2argvdata/disk-usb-device-removable.x86_64-latest.args<br>
+++ b/tests/qemuxml2argvdata/disk-device-removable.x86_64-latest.args<br>
@@ -27,13 +27,17 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \<br>
-no-shutdown \<br>
-boot strict=on \<br>
-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \<br>
--blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \<br>
+-device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.0","addr":"0x2"}' \<br>
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \<br>
+-blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw","file":"libvirt-3-storage"}' \<br>
+-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-3-format","id":"ide0-0-0","bootindex":1}' \<br>
+-blockdev '{"driver":"file","filename":"/tmp/usbdisk.img","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \<br>
-blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw","file":"libvirt-2-storage"}' \<br>
--device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-2-format","id":"ide0-0-0","bootindex":1}' \<br>
--blockdev '{"driver":"file","filename":"/tmp/usbdisk.img","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \<br>
+-device '{"driver":"usb-storage","bus":"usb.0","port":"1","drive":"libvirt-2-format","id":"usb-disk0","removable":true}' \<br>
+-blockdev '{"driver":"file","filename":"/tmp/scsidisk.img","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \<br>
-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \<br>
--device '{"driver":"usb-storage","bus":"usb.0","port":"1","drive":"libvirt-1-format","id":"usb-disk0","removable":true}' \<br>
+-device '{"driver":"scsi-hd","bus":"scsi0.0","channel":0,"scsi-id":0,"lun":1,"device_id":"drive-scsi0-0-0-1","drive":"libvirt-1-format","id":"scsi0-0-0-1","removable":true}' \<br>
-audiodev '{"id":"audio1","driver":"none"}' \<br>
--device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \<br>
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}' \<br>
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \<br>
-msg timestamp=on<br>
diff --git a/tests/qemuxml2argvdata/disk-usb-device-removable.xml b/tests/qemuxml2argvdata/disk-device-removable.xml<br>
similarity index 80%<br>
rename from tests/qemuxml2argvdata/disk-usb-device-removable.xml<br>
rename to tests/qemuxml2argvdata/disk-device-removable.xml<br>
index 927a8e8b3e..9400c84863 100644<br>
--- a/tests/qemuxml2argvdata/disk-usb-device-removable.xml<br>
+++ b/tests/qemuxml2argvdata/disk-device-removable.xml<br>
@@ -22,6 +22,11 @@<br>
<source file='/tmp/usbdisk.img'/><br>
<target dev='sda' bus='usb' removable='on'/><br>
</disk><br>
+ <disk type='file' device='disk'><br>
+ <source file='/tmp/scsidisk.img'/><br>
+ <target dev='sdb' bus='scsi' removable='on'/><br>
+ </disk><br>
+ <controller type='scsi' index='0' model='virtio-scsi'/><br>
<memballoon model='virtio'/><br>
</devices><br>
</domain><br>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c<br>
index d914d8cbea..d6a9ab865d 100644<br>
--- a/tests/qemuxml2argvtest.c<br>
+++ b/tests/qemuxml2argvtest.c<br>
@@ -1227,7 +1227,7 @@ mymain(void)<br>
DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-device-lun-type-invalid");<br>
DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-attaching-partition-nosupport");<br>
DO_TEST_CAPS_LATEST("disk-usb-device");<br>
- DO_TEST_CAPS_LATEST("disk-usb-device-removable");<br>
+ DO_TEST_CAPS_LATEST("disk-device-removable");<br>
DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-usb-pci");<br>
DO_TEST_CAPS_LATEST("disk-scsi");<br>
DO_TEST_CAPS_LATEST("disk-scsi-device-auto");<br>
-- <br>
2.40.1<br>
<br>
</blockquote></div>