From b17f07395cbaacbfb53ee0f14933738d8dee60f1 Mon Sep 17 00:00:00 2001 From: Julio Montes Date: Tue, 14 Dec 2021 11:55:19 -0600 Subject: [PATCH] qemu: update readonly flag for block devices since qemu 6.0, readonly flag for block devices must be enable or disable with `on` or `off` respectively. Signed-off-by: Julio Montes --- qemu/qemu.go | 2 +- qemu/qemu_arch_base_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qemu/qemu.go b/qemu/qemu.go index 831998c4b6..f6db8481d3 100644 --- a/qemu/qemu.go +++ b/qemu/qemu.go @@ -1219,7 +1219,7 @@ func (blkdev BlockDevice) QemuParams(config *Config) []string { blkParams = append(blkParams, fmt.Sprintf("if=%s", blkdev.Interface)) if blkdev.ReadOnly { - blkParams = append(blkParams, "readonly") + blkParams = append(blkParams, "readonly=on") } qemuParams = append(qemuParams, "-device") diff --git a/qemu/qemu_arch_base_test.go b/qemu/qemu_arch_base_test.go index 27219f4989..6676097071 100644 --- a/qemu/qemu_arch_base_test.go +++ b/qemu/qemu_arch_base_test.go @@ -37,7 +37,7 @@ var ( deviceSCSIControllerBusAddrStr = "-device virtio-scsi-pci,id=foo,bus=pci.0,addr=00:04.0,disable-modern=true,iothread=iothread1,romfile=efi-virtio.rom" deviceVhostUserSCSIString = "-chardev socket,id=char1,path=/tmp/nonexistentsocket.socket -device vhost-user-scsi-pci,id=scsi1,chardev=char1,romfile=efi-virtio.rom" deviceVhostUserBlkString = "-chardev socket,id=char2,path=/tmp/nonexistentsocket.socket -device vhost-user-blk-pci,logical_block_size=4096,size=512M,chardev=char2,romfile=efi-virtio.rom" - deviceBlockString = "-device virtio-blk-pci,disable-modern=true,drive=hd0,scsi=off,config-wce=off,romfile=efi-virtio.rom,share-rw=on,serial=hd0 -drive id=hd0,file=/var/lib/vm.img,aio=threads,format=qcow2,if=none,readonly" + deviceBlockString = "-device virtio-blk-pci,disable-modern=true,drive=hd0,scsi=off,config-wce=off,romfile=efi-virtio.rom,share-rw=on,serial=hd0 -drive id=hd0,file=/var/lib/vm.img,aio=threads,format=qcow2,if=none,readonly=on" devicePCIBridgeString = "-device pci-bridge,bus=/pci-bus/pcie.0,id=mybridge,chassis_nr=5,shpc=on,addr=ff,romfile=efi-virtio.rom" devicePCIBridgeStringReserved = "-device pci-bridge,bus=/pci-bus/pcie.0,id=mybridge,chassis_nr=5,shpc=off,addr=ff,romfile=efi-virtio.rom,io-reserve=4k,mem-reserve=1m,pref64-reserve=1m" devicePCIEBridgeString = "-device pcie-pci-bridge,bus=/pci-bus/pcie.0,id=mybridge,addr=ff,romfile=efi-virtio.rom"