j3d1/webvirtcloud
1
0
Fork 0
mirror of https://github.com/retspen/webvirtcloud synced 2026-11-11 04:36:48 +00:00
Code Issues Projects Releases Wiki Activity

feat(instances): a CD-ROM is added on the bus chosen, with its ISO

Browse source 
A running VM got its new CD-ROM on SCSI, the one bus the panel could plug
in then, and Windows does not see a virtio-scsi drive before the driver
on that ISO is installed. Add CD-ROM is now a dialog that chooses the bus
and the ISO: a running VM takes USB, first, which every guest sees and
which hot-plugs, or SCSI; a shut-off one SATA (IDE on pc), SCSI or USB.
libvirt has no empty USB drive, so a USB CD-ROM takes its ISO when it is
added and is detached instead of ejected, also while the VM runs.

A USB CD-ROM is a CD drive on QEMU's usb-bot only. Where QEMU has none
(RHEL 9), libvirt took usb-storage, which shows the guest a hard disk
that Windows does not read; the drive now asks for usb-bot, and such a
host refuses it with libvirt's message.
This commit is contained in:
catborise 2026-11-01 15:06:54 +03:00
parent 0cd687e035
commit 2a05576e18
9 changed files with 313 additions and 165 deletions
Download patch file Download diff file Expand all files Collapse all files

13
vrtManager/instance.py
View file

@ -1141,7 +1141,8 @@ class wvmInstance(wvmConnect):
raise util.OperationError(f"Media of {dev} changed in the running VM only: {err}") from err
raise
def mount_iso(self, dev, image):
def get_iso_path(self, image):
"""The path of the ISO image of that name, in one of the active pools."""
paths = []
for storage in self.get_storages(only_actives=True):
stg = self.get_storage(storage)
@ -1151,7 +1152,10 @@ class wvmInstance(wvmConnect):
raise util.OperationError(f"ISO image {image} was not found")
if len(paths) > 1:
raise util.OperationError(f"ISO image {image} is in more than one storage pool")
self._set_cdrom_media(dev, paths[0])
return paths[0]
def mount_iso(self, dev, image):
self._set_cdrom_media(dev, self.get_iso_path(image))
def umount_iso(self, dev, image=None):
self._set_cdrom_media(dev, None)
@ -1199,7 +1203,10 @@ class wvmInstance(wvmConnect):
if detect_zeroes_mode is not None and detect_zeroes_mode != "default":
additionals += f"detect_zeroes='{detect_zeroes_mode}' "
xml_disk = f"<disk type='{disk_type}' device='{disk_device}'>"
# a USB CD-ROM is a CD drive on usb-bot only: usb-storage, which libvirt
# takes where QEMU has no usb-bot (RHEL 9), shows the guest a hard disk
usb_cd = " model='usb-bot'" if disk_device == "cdrom" and target_bus == "usb" else ""
xml_disk = f"<disk type='{disk_type}' device='{disk_device}'{usb_cd}>"
if disk_device == "cdrom":
xml_disk += f"<driver name='{driver_name}' type='{format_type}'/>"
elif disk_device == "disk":

10
vrtManager/tests/test_device_edits.py
View file

@ -91,6 +91,16 @@ class DeviceEditsTestCase(unittest.TestCase):
xml, _ = p.instance.attachDeviceFlags.call_args.args
self.assertEqual(etree.fromstring(xml).find("source").attrib, {"dev": "/dev/vg/c"})
def test_a_usb_cdrom_is_a_cd_drive_on_usb_bot(self):
# usb-storage, libvirt's choice where QEMU has no usb-bot, shows a hard disk
for bus, model in (("usb", "usb-bot"), ("sata", None)):
with self.subTest(bus=bus):
p = proxy(active=False)
p._definitions = lambda: [(PERSISTENT_XML, VIR_DOMAIN_AFFECT_CONFIG)]
p.attach_disk("sdb", "/iso/virtio-win.iso", disk_device="cdrom", target_bus=bus, readonly=True)
xml, _ = p.instance.attachDeviceFlags.call_args.args
self.assertEqual(etree.fromstring(xml).get("model"), model)
def test_a_bridge_nic_can_be_a_boot_device(self):
p = proxy()
p.set_bootorder({0: {"type": "network", "dev": "52:54:10:00:00:02"}, 1: {"type": "disk", "dev": "vdb"}})