- Devel - libvirt List Archives

[PATCH v2] virnodedeviceobj: Don't unlock virNodeDeviceObj in virNodeDeviceObjListRemove()
by Michal Privoznik 02 Feb '22

02 Feb '22

When virNodeDeviceObjListRemove() is called, the passed virNodeDeviceObj is removed from internal list of node devices and then unrefed and unlocked. While the former is warranted (the object was refed at the beginning of the function) the unlock is not. In fact, it's wrong from conceptual POV. We still want threads working on the object tu mutually exclude each other. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- v2 of: https://listman.redhat.com/archives/libvir-list/2022-February/msg00036.html diff to v1: - Fixed test driver which worked around broken logic Note, there is similar problem with virNodeDeviceObjListForEachRemove() which removes objects from the list, even without lock, but that happens only with mdevs and I have none to test with. src/conf/virnodedeviceobj.c | 2 +- src/test/test_driver.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c index 2e4ef2df3c..7a560349d4 100644 --- a/src/conf/virnodedeviceobj.c +++ b/src/conf/virnodedeviceobj.c @@ -524,7 +524,7 @@ virNodeDeviceObjListRemove(virNodeDeviceObjList *devs, virObjectRWLockWrite(devs); virObjectLock(obj); virNodeDeviceObjListRemoveLocked(devs, obj); - virNodeDeviceObjEndAPI(&obj); + virObjectUnref(obj); virObjectRWUnlock(devs); } diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 9e1fc65972..f900123941 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -6810,7 +6810,7 @@ testDestroyVport(testDriver *privconn, 0); virNodeDeviceObjListRemove(privconn->devs, obj); - virObjectUnref(obj); + virNodeDeviceObjEndAPI(&obj); virObjectEventStateQueue(privconn->eventState, event); return 0; @@ -7797,8 +7797,6 @@ testNodeDeviceDestroy(virNodeDevicePtr dev) virObjectLock(obj); virNodeDeviceObjListRemove(driver->devs, obj); - virObjectUnref(obj); - obj = NULL; cleanup: virNodeDeviceObjEndAPI(&obj); -- 2.34.1

2 1

[libvirt PATCH 0/2] ch: fix some issues pointed out by Coverity
by Ján Tomko 02 Feb '22

02 Feb '22

Ján Tomko (2): ch: virCHMonitorGetIOThreads: fix g_steal_pointer usage ch: virCHProcessSetupIOThreads: use correct type for return value src/ch/ch_monitor.c | 2 +- src/ch/ch_process.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) -- 2.34.1

2 3

[libvirt PATCH] tests: Cover virtio-mem being plugged into a bridge
by Andrea Bolognani 02 Feb '22

02 Feb '22

This is a perfectly valid configuration that we need to keep working, so add test coverage for it. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- .../memory-hotplug-virtio-mem.x86_64-latest.args | 3 ++- tests/qemuxml2argvdata/memory-hotplug-virtio-mem.xml | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args index dba2452ccf..5aa8110aeb 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args @@ -28,11 +28,12 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=on \ +-device '{"driver":"pci-bridge","chassis_nr":1,"id":"pci.1","bus":"pci.0","addr":"0x3"}' \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -object '{"qom-type":"memory-backend-ram","id":"memvirtiomem0","reserve":false,"size":1073741824}' \ -device '{"driver":"virtio-mem-pci","node":0,"block-size":2097152,"requested-size":536870912,"memdev":"memvirtiomem0","id":"virtiomem0","bus":"pci.0","addr":"0x2"}' \ -object '{"qom-type":"memory-backend-file","id":"memvirtiomem1","mem-path":"/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1","reserve":false,"size":2147483648,"host-nodes":[1,2,3],"policy":"bind"}' \ --device '{"driver":"virtio-mem-pci","node":0,"block-size":2097152,"requested-size":1073741824,"memdev":"memvirtiomem1","prealloc":true,"id":"virtiomem1","bus":"pci.0","addr":"0x3"}' \ +-device '{"driver":"virtio-mem-pci","node":0,"block-size":2097152,"requested-size":1073741824,"memdev":"memvirtiomem1","prealloc":true,"id":"virtiomem1","bus":"pci.1","addr":"0x1"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.xml b/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.xml index ea9f5e8765..73036d8602 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.xml +++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.xml @@ -35,6 +35,11 @@ <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> <controller type='pci' index='0' model='pci-root'/> + <controller type='pci' index='1' model='pci-bridge'> + <model name='pci-bridge'/> + <target chassisNr='1'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </controller> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <audio id='1' type='none'/> @@ -61,7 +66,7 @@ <block unit='KiB'>2048</block> <requested unit='KiB'>1048576</requested> </target> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + <address type='pci' domain='0x0000' bus='0x01' slot='0x01' function='0x0'/> </memory> </devices> </domain> -- 2.34.1

2 1

[PATCH] qemu_command: Generate memory only after controllers
by Michal Privoznik 02 Feb '22

02 Feb '22

Currently, memory device (def->mems) part of cmd line is generated before any controller. In majority of cases it doesn't matter because neither of memory devices live on a bus that's created by an exposed controller (e.g. there's no DIMM controller, at least not exposed). Except for virtio-mem and virtio-pmem, which do have a PCI address. And if it so happens that the device goes onto non-default bus (pci.0) starting such guest fails, because the controller that creates the desired bus wasn't processed yet. QEMU processes arguments in order. For instance, if virtio-mem has address with bus='0x01' QEMU refuses to start with the following message: Bus 'pci.1' not found Similarly for virtio-pmem. I've successfully tested migration and changing the order does not affect migration stream. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2047271 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_command.c | 6 +++--- tests/qemuxml2argvdata/hugepages-memaccess.args | 4 ++-- tests/qemuxml2argvdata/hugepages-memaccess2.args | 4 ++-- tests/qemuxml2argvdata/hugepages-numa-default-dimm.args | 4 ++-- .../qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args | 4 ++-- .../qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args | 4 ++-- tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args | 8 ++++---- tests/qemuxml2argvdata/memory-hotplug-dimm.args | 8 ++++---- .../memory-hotplug-nvdimm-access.x86_64-latest.args | 4 ++-- .../memory-hotplug-nvdimm-align.x86_64-5.2.0.args | 4 ++-- .../memory-hotplug-nvdimm-align.x86_64-latest.args | 4 ++-- .../memory-hotplug-nvdimm-label.x86_64-5.2.0.args | 4 ++-- .../memory-hotplug-nvdimm-label.x86_64-latest.args | 4 ++-- .../memory-hotplug-nvdimm-pmem.x86_64-5.2.0.args | 4 ++-- .../memory-hotplug-nvdimm-pmem.x86_64-latest.args | 4 ++-- .../memory-hotplug-nvdimm-ppc64-abi-update.args | 4 ++-- tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args | 4 ++-- .../memory-hotplug-nvdimm-readonly.x86_64-5.2.0.args | 4 ++-- .../memory-hotplug-nvdimm-readonly.x86_64-latest.args | 4 ++-- .../memory-hotplug-nvdimm.x86_64-latest.args | 4 ++-- .../memory-hotplug-ppc64-nonuma-abi-update.args | 8 ++++---- tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args | 8 ++++---- .../memory-hotplug-virtio-mem.x86_64-latest.args | 8 ++++---- .../memory-hotplug-virtio-pmem.x86_64-5.2.0.args | 4 ++-- .../memory-hotplug-virtio-pmem.x86_64-latest.args | 4 ++-- tests/qemuxml2argvdata/pages-dimm-discard.args | 8 ++++---- 26 files changed, 65 insertions(+), 65 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index fc778901d1..e12512a78c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -10579,9 +10579,6 @@ qemuBuildCommandLine(virQEMUDriver *driver, qemuBuildNumaCommandLine(cfg, def, cmd, priv) < 0) return NULL; - if (qemuBuildMemoryDeviceCommandLine(cmd, cfg, def, priv) < 0) - return NULL; - virUUIDFormat(def->uuid, uuid); virCommandAddArgList(cmd, "-uuid", uuid, NULL); @@ -10631,6 +10628,9 @@ qemuBuildCommandLine(virQEMUDriver *driver, if (qemuBuildControllersCommandLine(cmd, def, qemuCaps) < 0) return NULL; + if (qemuBuildMemoryDeviceCommandLine(cmd, cfg, def, priv) < 0) + return NULL; + if (qemuBuildHubCommandLine(cmd, def, qemuCaps) < 0) return NULL; diff --git a/tests/qemuxml2argvdata/hugepages-memaccess.args b/tests/qemuxml2argvdata/hugepages-memaccess.args index b89f791697..a369c7f6da 100644 --- a/tests/qemuxml2argvdata/hugepages-memaccess.args +++ b/tests/qemuxml2argvdata/hugepages-memaccess.args @@ -24,8 +24,6 @@ QEMU_AUDIO_DRV=none \ -numa node,nodeid=2,cpus=2,memdev=ram-node2 \ -object memory-backend-file,id=ram-node3,mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,share=off,prealloc=on,size=1073741824,host-nodes=3,policy=bind \ -numa node,nodeid=3,cpus=3,memdev=ram-node3 \ --object memory-backend-file,id=memdimm0,mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=on,prealloc=on,size=536870912,host-nodes=0-3,policy=bind \ --device pc-dimm,node=1,memdev=memdimm0,id=dimm0,slot=0,addr=4294967296 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -37,6 +35,8 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot strict=on \ -usb \ +-object memory-backend-file,id=memdimm0,mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=on,prealloc=on,size=536870912,host-nodes=0-3,policy=bind \ +-device pc-dimm,node=1,memdev=memdimm0,id=dimm0,slot=0,addr=4294967296 \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ diff --git a/tests/qemuxml2argvdata/hugepages-memaccess2.args b/tests/qemuxml2argvdata/hugepages-memaccess2.args index 0c296797e9..434ebdaa62 100644 --- a/tests/qemuxml2argvdata/hugepages-memaccess2.args +++ b/tests/qemuxml2argvdata/hugepages-memaccess2.args @@ -24,8 +24,6 @@ QEMU_AUDIO_DRV=none \ -numa node,nodeid=2,cpus=2,memdev=ram-node2 \ -object memory-backend-file,id=ram-node3,mem-path=/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node3,share=off,size=1073741824,host-nodes=3,policy=bind \ -numa node,nodeid=3,cpus=3,memdev=ram-node3 \ --object memory-backend-file,id=memdimm0,mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=on,prealloc=on,size=536870912,host-nodes=0-3,policy=bind \ --device pc-dimm,node=1,memdev=memdimm0,id=dimm0,slot=0,addr=4294967296 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -37,6 +35,8 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot strict=on \ -usb \ +-object memory-backend-file,id=memdimm0,mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=on,prealloc=on,size=536870912,host-nodes=0-3,policy=bind \ +-device pc-dimm,node=1,memdev=memdimm0,id=dimm0,slot=0,addr=4294967296 \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ diff --git a/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args b/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args index f560cabf8e..57bb70346d 100644 --- a/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args +++ b/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args @@ -19,8 +19,6 @@ QEMU_AUDIO_DRV=none \ -mem-prealloc \ -mem-path /dev/hugepages2M/libvirt/qemu/-1-fedora \ -numa node,nodeid=0,cpus=0-1,mem=1024 \ --object memory-backend-file,id=memdimm0,mem-path=/dev/hugepages1G/libvirt/qemu/-1-fedora,size=1073741824,host-nodes=1-3,policy=bind \ --device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0 \ -uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ -display none \ -no-user-config \ @@ -32,4 +30,6 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot strict=on \ -usb \ +-object memory-backend-file,id=memdimm0,mem-path=/dev/hugepages1G/libvirt/qemu/-1-fedora,size=1073741824,host-nodes=1-3,policy=bind \ +-device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0 \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args b/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args index 72eae74869..ac719b8c9c 100644 --- a/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args @@ -18,8 +18,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -smp 2,sockets=2,dies=1,cores=1,threads=1 \ -object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1","share":true,"prealloc":true,"size":1073741824}' \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ --object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/tmp/nvdimm","share":true,"prealloc":true,"size":536870912}' \ --device '{"driver":"nvdimm","node":0,"memdev":"memnvdimm0","id":"nvdimm0","slot":0}' \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -31,6 +29,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=on \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/tmp/nvdimm","share":true,"prealloc":true,"size":536870912}' \ +-device '{"driver":"nvdimm","node":0,"memdev":"memnvdimm0","id":"nvdimm0","slot":0}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args b/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args index 9d1f9831d9..6f5a983d3a 100644 --- a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args @@ -18,8 +18,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-instance-00000092/.config \ -smp 8,sockets=1,dies=1,cores=8,threads=1 \ -object '{"qom-type":"memory-backend-memfd","id":"ram-node0","hugetlb":true,"hugetlbsize":2097152,"share":true,"prealloc":true,"size":15032385536,"host-nodes":[3],"policy":"preferred"}' \ -numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \ --object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/tmp/nvdimm","share":true,"prealloc":true,"size":536870912,"host-nodes":[3],"policy":"preferred"}' \ --device '{"driver":"nvdimm","node":0,"memdev":"memnvdimm0","id":"nvdimm0","slot":0}' \ -uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \ -display none \ -no-user-config \ @@ -31,6 +29,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-instance-00000092/.config \ -no-acpi \ -boot strict=on \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/tmp/nvdimm","share":true,"prealloc":true,"size":536870912,"host-nodes":[3],"policy":"preferred"}' \ +-device '{"driver":"nvdimm","node":0,"memdev":"memnvdimm0","id":"nvdimm0","slot":0}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args index 907072d55d..b36117f1e8 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args +++ b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args @@ -17,10 +17,6 @@ QEMU_AUDIO_DRV=none \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ -numa node,nodeid=0,cpus=0-1,mem=214 \ --object memory-backend-file,id=memdimm0,mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,prealloc=on,size=536870912,host-nodes=1-3,policy=bind \ --device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0,addr=4294967296 \ --object memory-backend-ram,id=memdimm2,size=536870912 \ --device pc-dimm,node=0,memdev=memdimm2,id=dimm2,slot=2 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -32,6 +28,10 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot strict=on \ -usb \ +-object memory-backend-file,id=memdimm0,mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,prealloc=on,size=536870912,host-nodes=1-3,policy=bind \ +-device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0,addr=4294967296 \ +-object memory-backend-ram,id=memdimm2,size=536870912 \ +-device pc-dimm,node=0,memdev=memdimm2,id=dimm2,slot=2 \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm.args b/tests/qemuxml2argvdata/memory-hotplug-dimm.args index 5d87f4a3ef..72c2803c5e 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-dimm.args +++ b/tests/qemuxml2argvdata/memory-hotplug-dimm.args @@ -17,10 +17,6 @@ QEMU_AUDIO_DRV=none \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ -numa node,nodeid=0,cpus=0-1,mem=214 \ --object memory-backend-ram,id=memdimm0,size=536870912 \ --device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0 \ --object memory-backend-file,id=memdimm1,mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,prealloc=on,size=536870912,host-nodes=1-3,policy=bind \ --device pc-dimm,node=0,memdev=memdimm1,id=dimm1,slot=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -32,6 +28,10 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot strict=on \ -usb \ +-object memory-backend-ram,id=memdimm0,size=536870912 \ +-device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0 \ +-object memory-backend-file,id=memdimm1,mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,prealloc=on,size=536870912,host-nodes=1-3,policy=bind \ +-device pc-dimm,node=0,memdev=memdimm1,id=dimm1,slot=1 \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args index 1d4fee4b6e..5967b3566e 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args @@ -18,8 +18,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -smp 2,sockets=2,dies=1,cores=1,threads=1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":224395264}' \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ --object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/tmp/nvdimm","share":false,"prealloc":true,"size":536870912}' \ --device '{"driver":"nvdimm","node":0,"memdev":"memnvdimm0","id":"nvdimm0","slot":0}' \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -31,6 +29,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=on \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/tmp/nvdimm","share":false,"prealloc":true,"size":536870912}' \ +-device '{"driver":"nvdimm","node":0,"memdev":"memnvdimm0","id":"nvdimm0","slot":0}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-5.2.0.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-5.2.0.args index 6c28c86004..0b29a6fded 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-5.2.0.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-5.2.0.args @@ -18,8 +18,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -smp 2,sockets=2,dies=1,cores=1,threads=1 \ -object memory-backend-ram,id=ram-node0,size=224395264 \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ --object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,share=off,prealloc=on,size=536870912,align=2097152 \ --device nvdimm,node=0,memdev=memnvdimm0,id=nvdimm0,slot=0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -31,6 +29,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=on \ -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,share=off,prealloc=on,size=536870912,align=2097152 \ +-device nvdimm,node=0,memdev=memnvdimm0,id=nvdimm0,slot=0 \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args index 711864037b..dd6884ca14 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args @@ -18,8 +18,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -smp 2,sockets=2,dies=1,cores=1,threads=1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":224395264}' \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ --object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/tmp/nvdimm","share":false,"prealloc":true,"size":536870912,"align":2097152}' \ --device '{"driver":"nvdimm","node":0,"memdev":"memnvdimm0","id":"nvdimm0","slot":0}' \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -31,6 +29,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=on \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/tmp/nvdimm","share":false,"prealloc":true,"size":536870912,"align":2097152}' \ +-device '{"driver":"nvdimm","node":0,"memdev":"memnvdimm0","id":"nvdimm0","slot":0}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-5.2.0.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-5.2.0.args index c45b401af5..7c67161b78 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-5.2.0.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-5.2.0.args @@ -18,8 +18,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -smp 2,sockets=2,dies=1,cores=1,threads=1 \ -object memory-backend-ram,id=ram-node0,size=224395264 \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ --object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,share=off,prealloc=on,size=536870912 \ --device nvdimm,node=0,label-size=131072,memdev=memnvdimm0,id=nvdimm0,slot=0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -31,6 +29,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=on \ -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,share=off,prealloc=on,size=536870912 \ +-device nvdimm,node=0,label-size=131072,memdev=memnvdimm0,id=nvdimm0,slot=0 \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args index ca4bd6c406..2a1ae03004 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args @@ -18,8 +18,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -smp 2,sockets=2,dies=1,cores=1,threads=1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":224395264}' \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ --object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/tmp/nvdimm","share":false,"prealloc":true,"size":536870912}' \ --device '{"driver":"nvdimm","node":0,"label-size":131072,"memdev":"memnvdimm0","id":"nvdimm0","slot":0}' \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -31,6 +29,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=on \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/tmp/nvdimm","share":false,"prealloc":true,"size":536870912}' \ +-device '{"driver":"nvdimm","node":0,"label-size":131072,"memdev":"memnvdimm0","id":"nvdimm0","slot":0}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-5.2.0.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-5.2.0.args index 3f35d4dca2..c4dae0cfd1 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-5.2.0.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-5.2.0.args @@ -18,8 +18,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -smp 2,sockets=2,dies=1,cores=1,threads=1 \ -object memory-backend-ram,id=ram-node0,size=224395264 \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ --object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,share=off,size=536870912,pmem=on \ --device nvdimm,node=0,memdev=memnvdimm0,id=nvdimm0,slot=0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -31,6 +29,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=on \ -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,share=off,size=536870912,pmem=on \ +-device nvdimm,node=0,memdev=memnvdimm0,id=nvdimm0,slot=0 \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args index 68174e96b5..a0d30a15e9 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args @@ -18,8 +18,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -smp 2,sockets=2,dies=1,cores=1,threads=1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":224395264}' \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ --object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/tmp/nvdimm","share":false,"size":536870912,"pmem":true}' \ --device '{"driver":"nvdimm","node":0,"memdev":"memnvdimm0","id":"nvdimm0","slot":0}' \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -31,6 +29,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=on \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/tmp/nvdimm","share":false,"size":536870912,"pmem":true}' \ +-device '{"driver":"nvdimm","node":0,"memdev":"memnvdimm0","id":"nvdimm0","slot":0}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.args index ebdb0429d0..55b16c9dc2 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.args @@ -17,8 +17,6 @@ QEMU_AUDIO_DRV=none \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ -numa node,nodeid=0,cpus=0-1,mem=1024 \ --object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,prealloc=on,size=537001984 \ --device nvdimm,node=0,label-size=131072,uuid=49545eb3-75e1-2d0a-acdd-f0294406c99e,memdev=memnvdimm0,id=nvdimm0,slot=0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -28,4 +26,6 @@ QEMU_AUDIO_DRV=none \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ +-object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,prealloc=on,size=537001984 \ +-device nvdimm,node=0,label-size=131072,uuid=49545eb3-75e1-2d0a-acdd-f0294406c99e,memdev=memnvdimm0,id=nvdimm0,slot=0 \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args index ebdb0429d0..55b16c9dc2 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args @@ -17,8 +17,6 @@ QEMU_AUDIO_DRV=none \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ -numa node,nodeid=0,cpus=0-1,mem=1024 \ --object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,prealloc=on,size=537001984 \ --device nvdimm,node=0,label-size=131072,uuid=49545eb3-75e1-2d0a-acdd-f0294406c99e,memdev=memnvdimm0,id=nvdimm0,slot=0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -28,4 +26,6 @@ QEMU_AUDIO_DRV=none \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ +-object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,prealloc=on,size=537001984 \ +-device nvdimm,node=0,label-size=131072,uuid=49545eb3-75e1-2d0a-acdd-f0294406c99e,memdev=memnvdimm0,id=nvdimm0,slot=0 \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-5.2.0.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-5.2.0.args index bca2f286ba..b1873c100f 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-5.2.0.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-5.2.0.args @@ -18,8 +18,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -smp 2,sockets=2,dies=1,cores=1,threads=1 \ -object memory-backend-ram,id=ram-node0,size=224395264 \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ --object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,share=off,prealloc=on,size=536870912 \ --device nvdimm,node=0,unarmed=on,memdev=memnvdimm0,id=nvdimm0,slot=0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -31,6 +29,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=on \ -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,share=off,prealloc=on,size=536870912 \ +-device nvdimm,node=0,unarmed=on,memdev=memnvdimm0,id=nvdimm0,slot=0 \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args index a1709c918c..9ad3f239da 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args @@ -18,8 +18,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -smp 2,sockets=2,dies=1,cores=1,threads=1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":224395264}' \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ --object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/tmp/nvdimm","share":false,"prealloc":true,"size":536870912}' \ --device '{"driver":"nvdimm","node":0,"unarmed":true,"memdev":"memnvdimm0","id":"nvdimm0","slot":0}' \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -31,6 +29,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=on \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/tmp/nvdimm","share":false,"prealloc":true,"size":536870912}' \ +-device '{"driver":"nvdimm","node":0,"unarmed":true,"memdev":"memnvdimm0","id":"nvdimm0","slot":0}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args index 1dd3f9f1a4..4e8eea2bcf 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args @@ -18,8 +18,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -smp 2,sockets=2,dies=1,cores=1,threads=1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":1073741824}' \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ --object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/tmp/nvdimm","prealloc":true,"size":536870912}' \ --device '{"driver":"nvdimm","node":0,"memdev":"memnvdimm0","id":"nvdimm0","slot":0}' \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -31,6 +29,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=on \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/tmp/nvdimm","prealloc":true,"size":536870912}' \ +-device '{"driver":"nvdimm","node":0,"memdev":"memnvdimm0","id":"nvdimm0","slot":0}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.args b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.args index 5380c9e805..e8a6451841 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.args +++ b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.args @@ -16,10 +16,6 @@ QEMU_AUDIO_DRV=none \ -m size=1048576k,slots=16,maxmem=4194304k \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ --object memory-backend-ram,id=memdimm0,size=536870912 \ --device pc-dimm,memdev=memdimm0,id=dimm0,slot=0 \ --object memory-backend-ram,id=memdimm1,size=536870912 \ --device pc-dimm,memdev=memdimm1,id=dimm1,slot=1 \ -uuid 49545eb3-75e1-2d0a-acdd-f0294406c99e \ -display none \ -no-user-config \ @@ -29,4 +25,8 @@ QEMU_AUDIO_DRV=none \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ +-object memory-backend-ram,id=memdimm0,size=536870912 \ +-device pc-dimm,memdev=memdimm0,id=dimm0,slot=0 \ +-object memory-backend-ram,id=memdimm1,size=536870912 \ +-device pc-dimm,memdev=memdimm1,id=dimm1,slot=1 \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args index acff36eb78..181409cde0 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args +++ b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args @@ -16,10 +16,6 @@ QEMU_AUDIO_DRV=none \ -m size=1310720k,slots=16,maxmem=4194304k \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ --object memory-backend-ram,id=memdimm0,size=536870912 \ --device pc-dimm,memdev=memdimm0,id=dimm0,slot=0 \ --object memory-backend-ram,id=memdimm1,size=536870912 \ --device pc-dimm,memdev=memdimm1,id=dimm1,slot=1 \ -uuid 49545eb3-75e1-2d0a-acdd-f0294406c99e \ -display none \ -no-user-config \ @@ -29,4 +25,8 @@ QEMU_AUDIO_DRV=none \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ +-object memory-backend-ram,id=memdimm0,size=536870912 \ +-device pc-dimm,memdev=memdimm0,id=dimm0,slot=0 \ +-object memory-backend-ram,id=memdimm1,size=536870912 \ +-device pc-dimm,memdev=memdimm1,id=dimm1,slot=1 \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args index 77dbc0c89c..dba2452ccf 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args @@ -18,10 +18,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -smp 2,sockets=2,dies=1,cores=1,threads=1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":2145386496}' \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ --object '{"qom-type":"memory-backend-ram","id":"memvirtiomem0","reserve":false,"size":1073741824}' \ --device '{"driver":"virtio-mem-pci","node":0,"block-size":2097152,"requested-size":536870912,"memdev":"memvirtiomem0","id":"virtiomem0","bus":"pci.0","addr":"0x2"}' \ --object '{"qom-type":"memory-backend-file","id":"memvirtiomem1","mem-path":"/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1","reserve":false,"size":2147483648,"host-nodes":[1,2,3],"policy":"bind"}' \ --device '{"driver":"virtio-mem-pci","node":0,"block-size":2097152,"requested-size":1073741824,"memdev":"memvirtiomem1","prealloc":true,"id":"virtiomem1","bus":"pci.0","addr":"0x3"}' \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -33,6 +29,10 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=on \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-object '{"qom-type":"memory-backend-ram","id":"memvirtiomem0","reserve":false,"size":1073741824}' \ +-device '{"driver":"virtio-mem-pci","node":0,"block-size":2097152,"requested-size":536870912,"memdev":"memvirtiomem0","id":"virtiomem0","bus":"pci.0","addr":"0x2"}' \ +-object '{"qom-type":"memory-backend-file","id":"memvirtiomem1","mem-path":"/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1","reserve":false,"size":2147483648,"host-nodes":[1,2,3],"policy":"bind"}' \ +-device '{"driver":"virtio-mem-pci","node":0,"block-size":2097152,"requested-size":1073741824,"memdev":"memvirtiomem1","prealloc":true,"id":"virtiomem1","bus":"pci.0","addr":"0x3"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-5.2.0.args b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-5.2.0.args index 17fd98fb88..8fa678c209 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-5.2.0.args +++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-5.2.0.args @@ -18,8 +18,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -smp 2,sockets=2,dies=1,cores=1,threads=1 \ -object memory-backend-ram,id=ram-node0,size=2145386496 \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ --object memory-backend-file,id=memvirtiopmem0,mem-path=/tmp/virtio_pmem,share=on,size=536870912 \ --device virtio-pmem-pci,memdev=memvirtiopmem0,id=virtiopmem0,bus=pci.0,addr=0x5 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -31,6 +29,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=on \ -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-object memory-backend-file,id=memvirtiopmem0,mem-path=/tmp/virtio_pmem,share=on,size=536870912 \ +-device virtio-pmem-pci,memdev=memvirtiopmem0,id=virtiopmem0,bus=pci.0,addr=0x5 \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args index fdbdfa00c3..25b521978f 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args @@ -18,8 +18,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -smp 2,sockets=2,dies=1,cores=1,threads=1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":2145386496}' \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ --object '{"qom-type":"memory-backend-file","id":"memvirtiopmem0","mem-path":"/tmp/virtio_pmem","share":true,"size":536870912}' \ --device '{"driver":"virtio-pmem-pci","memdev":"memvirtiopmem0","id":"virtiopmem0","bus":"pci.0","addr":"0x5"}' \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -31,6 +29,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=on \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-object '{"qom-type":"memory-backend-file","id":"memvirtiopmem0","mem-path":"/tmp/virtio_pmem","share":true,"size":536870912}' \ +-device '{"driver":"virtio-pmem-pci","memdev":"memvirtiopmem0","id":"virtiopmem0","bus":"pci.0","addr":"0x5"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/pages-dimm-discard.args b/tests/qemuxml2argvdata/pages-dimm-discard.args index 2ebe9c1350..e63c908549 100644 --- a/tests/qemuxml2argvdata/pages-dimm-discard.args +++ b/tests/qemuxml2argvdata/pages-dimm-discard.args @@ -17,10 +17,6 @@ QEMU_AUDIO_DRV=none \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ -numa node,nodeid=0,cpus=0-1,mem=1024 \ --object memory-backend-file,id=memdimm0,mem-path=/dev/hugepages1G/libvirt/qemu/-1-fedora,prealloc=on,size=1073741824,host-nodes=1-3,policy=bind \ --device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0 \ --object memory-backend-file,id=memdimm1,mem-path=/var/lib/libvirt/qemu/ram/-1-fedora/dimm1,discard-data=on,share=off,size=536870912 \ --device pc-dimm,node=0,memdev=memdimm1,id=dimm1,slot=1 \ -uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ -display none \ -no-user-config \ @@ -32,4 +28,8 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot strict=on \ -usb \ +-object memory-backend-file,id=memdimm0,mem-path=/dev/hugepages1G/libvirt/qemu/-1-fedora,prealloc=on,size=1073741824,host-nodes=1-3,policy=bind \ +-device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0 \ +-object memory-backend-file,id=memdimm1,mem-path=/var/lib/libvirt/qemu/ram/-1-fedora/dimm1,discard-data=on,share=off,size=536870912 \ +-device pc-dimm,node=0,memdev=memdimm1,id=dimm1,slot=1 \ -msg timestamp=on -- 2.34.1

3 6

[libvirt PATCH 0/3] meson: Fix RPM builds
by Andrea Bolognani 02 Feb '22

02 Feb '22

Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/461702102 The Ubuntu failures are due to connection issues and should be transient; all RPM builds passed. Andrea Bolognani (3): rpm: List one more directory meson: Sort virt_install_dirs meson: Add missing virt_install_dirs libvirt.spec.in | 1 + src/ch/meson.build | 1 + src/interface/meson.build | 4 ++++ src/libxl/meson.build | 8 +++++++- src/lxc/meson.build | 4 +++- src/meson.build | 2 +- src/network/meson.build | 2 ++ src/node_device/meson.build | 4 ++++ src/nwfilter/meson.build | 6 ++++++ src/qemu/meson.build | 20 ++++++++++++++++---- src/remote/meson.build | 2 ++ src/secret/meson.build | 5 +++++ src/storage/meson.build | 6 ++++++ 13 files changed, 58 insertions(+), 7 deletions(-) -- 2.34.1

2 4

[PATCH v2 0/4] qemu_tpm: Get swtpm pid without binary validation
by Vasiliy Ulyanov 02 Feb '22

02 Feb '22

v2 of https://listman.redhat.com/archives/libvir-list/2022-January/msg00008.html The v2 series introduces the new approach following the previous review comments. It adds a function for pidfile lock validation (i.e. if its locked by the expected process) and adds the new check to virPidFileReadPathIfAlive. The daemonization and pidfile handling for swtpm command are now handled by libvirt. The fix to qemu_vhost_user_gpu is currently done by visual code checking. Not really sure how to test e2e as I dont have a quick reproducer atm :( Note: I wasn't sure about the refactoring of virPidFileReadPathIfAlive (i.e. whether to remove the binary path from there). For now decided to introduce the new lock check only if the path is not provided. But I am open for suggestions on how to better fit the new check. Vasiliy Ulyanov (4): virfile: Add virFileGetLockOwner function virpidfile: Refactor virPidFileReadPathIfAlive qemu_tpm: Get swtpm pid without binary validation qemu: gpu: Get pid without binary validation src/libvirt_private.syms | 1 + src/qemu/qemu_tpm.c | 26 +++++++++----------- src/qemu/qemu_vhost_user_gpu.c | 9 +++---- src/util/virfile.c | 45 ++++++++++++++++++++++++++++++++++ src/util/virfile.h | 2 ++ src/util/virpidfile.c | 20 +++++++++++++++ 6 files changed, 82 insertions(+), 21 deletions(-) -- 2.34.1

3 9

[libvirt PATCH 0/3] rpm: Fix and improve handling of directories
by Andrea Bolognani 02 Feb '22

02 Feb '22

With respect to the permissions topic mentioned in patch 3/3, I'm currently working on some patches that aim to improve that situation as well. Andrea Bolognani (3): rpm: Move /etc/libvirt from -daemon to -libs rpm: Move /var/lib/libvirt from -libs to -daemon rpm: List more directories libvirt.spec.in | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) -- 2.34.1

2 6

[libvirt PATCH 0/2] qemu: QEMU_AUDIO_DRV fixes and cleanups
by Andrea Bolognani 02 Feb '22

02 Feb '22

Andrea Bolognani (2): qemu: Correctly translate QEMU_AUDIO_DRV=wav qemu: Drop qemuAudioDriver enumeration src/qemu/qemu_command.c | 46 +++++++++++++++++++++++++++++------------ src/qemu/qemu_command.h | 3 +++ src/qemu/qemu_domain.c | 16 ++++---------- 3 files changed, 40 insertions(+), 25 deletions(-) -- 2.34.1

2 4

[libvirt PATCH 0/4] move virParseVersionString to virstring.c
by Ján Tomko 02 Feb '22

02 Feb '22

And clean up some includes while doing it. Ján Tomko (4): maint: add required includes util: virParseVersionString: move to virstring.c virParseVersionString: rename to virStringParseVersion maint: remove unnecessary virutil.h includes src/bhyve/bhyve_driver.c | 2 +- src/ch/ch_conf.c | 2 +- src/esx/esx_vi.c | 9 ++--- src/libvirt_private.syms | 2 +- src/lxc/lxc_driver.c | 2 +- src/nwfilter/nwfilter_ebiptables_driver.c | 6 +-- src/openvz/openvz_conf.c | 3 +- src/util/virdnsmasq.c | 3 +- src/util/virfirewalld.c | 4 +- src/util/virstring.c | 48 +++++++++++++++++++++++ src/util/virstring.h | 4 ++ src/util/virutil.c | 46 ---------------------- src/util/virutil.h | 3 -- src/vbox/vbox_common.c | 2 +- src/vmware/vmware_conf.c | 3 +- src/vz/vz_utils.c | 2 +- tests/testutilsqemu.c | 3 +- tests/utiltest.c | 2 +- tools/virt-host-validate-common.c | 2 +- 19 files changed, 73 insertions(+), 75 deletions(-) -- 2.34.1

3 6

[libvirt PATCH] qemu: virtiofs: check whether the supplied binary exists
by Ján Tomko 02 Feb '22

02 Feb '22

Report an error upfront if the binary does not exist or is not executable. https://bugzilla.redhat.com/show_bug.cgi?id=1999372 Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/qemu/qemu_virtiofs.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/qemu/qemu_virtiofs.c b/src/qemu/qemu_virtiofs.c index 1b853a5a59..7e3324b017 100644 --- a/src/qemu/qemu_virtiofs.c +++ b/src/qemu/qemu_virtiofs.c @@ -184,6 +184,13 @@ qemuVirtioFSStart(virQEMUDriver *driver, VIR_AUTOCLOSE logfd = -1; int rc; + if (!virFileIsExecutable(fs->binary)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("virtiofsd binary '%s' is not executable"), + fs->binary); + return -1; + } + if (!virFileExists(fs->src->path)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("the virtiofs export directory '%s' does not exist"), -- 2.31.1

2 1

[PATCH] virnodedeviceobj: Don't unlock virNodeDeviceObj in virNodeDeviceObjListRemove()
by Michal Privoznik 02 Feb '22

02 Feb '22

When virNodeDeviceObjListRemove() is called, the passed virNodeDeviceObj is removed from internal list of node devices and then unrefed and unlocked. While the former is warranted (the object was refed at the beginning of the function) the unlock is not. In fact, it's wrong from conceptual POV. We still want threads working on the object tu mutually exclude each other. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/virnodedeviceobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c index 2e4ef2df3c..7a560349d4 100644 --- a/src/conf/virnodedeviceobj.c +++ b/src/conf/virnodedeviceobj.c @@ -524,7 +524,7 @@ virNodeDeviceObjListRemove(virNodeDeviceObjList *devs, virObjectRWLockWrite(devs); virObjectLock(obj); virNodeDeviceObjListRemoveLocked(devs, obj); - virNodeDeviceObjEndAPI(&obj); + virObjectUnref(obj); virObjectRWUnlock(devs); } -- 2.34.1

2 1

[libvirt PATCH v5 0/7] cgroup and thread management in ch driver
by Praveen K Paladugu 01 Feb '22

01 Feb '22

This patchset adds support for cgroup management of ch threads. This version correctly manages cgroups for vcpu and emulator threads created by ch. cgroup management for iothreads is not yet supported. Along with cgroup management, this patchset also enables support for pinning vcpu and emulator threads to selected host cpus. v5: * bumped the verion of callbacks in ch driver to 8.1.0 v4: * addressed all open comments in v3 * dropped all the merged commits v3: * addrressed all the formatting comments in v2 patch set * dropped indentation patches are they do not adhere to libvirt coding style * fixed build issue in qemu driver that was introduced in v2 Praveen K Paladugu (3): qemu,hypervisor: refactor some cgroup mgmt methods ch_process: Setup emulator and iothread settings ch_driver: emulator threadinfo & pinning callbacks Vineeth Pillai (4): ch: methods for cgroup mgmt in ch driver ch_driver,ch_domain: vcpupin callback in ch driver ch_driver: enable typed param string for numatune ch_driver: add numatune callbacks for CH driver src/ch/ch_conf.c | 2 + src/ch/ch_conf.h | 4 +- src/ch/ch_domain.c | 64 ++++ src/ch/ch_domain.h | 18 +- src/ch/ch_driver.c | 590 +++++++++++++++++++++++++++++++++ src/ch/ch_monitor.c | 156 +++++++++ src/ch/ch_monitor.h | 56 +++- src/ch/ch_process.c | 385 ++++++++++++++++++++- src/ch/ch_process.h | 3 + src/hypervisor/domain_cgroup.c | 457 ++++++++++++++++++++++++- src/hypervisor/domain_cgroup.h | 72 ++++ src/libvirt_private.syms | 14 +- src/qemu/qemu_cgroup.c | 413 +---------------------- src/qemu/qemu_cgroup.h | 11 - src/qemu/qemu_driver.c | 14 +- src/qemu/qemu_hotplug.c | 7 +- src/qemu/qemu_process.c | 24 +- 17 files changed, 1835 insertions(+), 455 deletions(-) -- 2.27.0

2 17

[PATCH 0/4] Couple of misc cleanups
by Michal Privoznik 01 Feb '22

01 Feb '22

*** BLURB HERE *** Michal Prívozník (4): test_driver: Don't leak @group_name lib: Don't set variable to NULL after VIR_FREE() virpcivpdtest: Fix potential double-free() src: Use g_steal_pointer() more src/conf/domain_conf.c | 1 - src/conf/nwfilter_conf.c | 1 - src/esx/esx_vi.c | 6 ++---- src/hyperv/hyperv_driver.c | 8 +++----- src/hyperv/hyperv_wmi.c | 3 +-- src/hypervisor/virhostdev.c | 3 +-- src/libxl/xen_common.c | 12 ++++-------- src/qemu/qemu_hotplug.c | 6 ++---- src/qemu/qemu_migration.c | 9 +++------ src/storage/storage_backend_gluster.c | 9 +++------ src/storage/storage_util.c | 6 ++---- src/test/test_driver.c | 1 - src/util/virfile.c | 3 +-- src/util/virlease.c | 3 +-- src/util/virnuma.c | 9 +++------ tests/virpcivpdtest.c | 4 +++- tests/virtypedparamtest.c | 1 - 17 files changed, 29 insertions(+), 56 deletions(-) -- 2.34.1

3 11

[PATCH v2] docs: expand firmware descriptor to allow flash without NVRAM
by Daniel P. Berrangé 01 Feb '22

01 Feb '22

The current firmware descriptor schema for flash requires that both the executable to NVRAM template paths be provided. This is fine for the most common usage of EDK2 builds in virtualization where the separate _CODE and _VARS files are provided. With confidential computing technology like AMD SEV, persistent storage of variables may be completely disabled because the firmware requires a known clean state on every cold boot. There is no way to express this in the firmware descriptor today. Even with regular EDK2 builds it is possible to create a firmware that has both executable code and variable persistence in a single file. This hasn't been commonly used, since it would mean every guest bootup would need to clone the full firmware file, leading to redundant duplicate storage of the code portion. In some scenarios this may not matter and might even be beneficial. For example if a public cloud allows users to bring their own firmware, such that the user can pre-enroll their own secure boot keys, you're going to have this copied on disk for each tenant already. At this point the it can be simpler to just deal with a single file rather than split builds. The firmware descriptor ought to be able to express this combined firmware model too. This all points towards expanding the schema for flash with a 'mode' concept: - "split" - the current implicit behaviour with separate files for code and variables. - "combined" - the alternate behaviour where a single file contains both code and variables. - "stateless" - the confidential computing use case where storage of variables is completely disable, leaving only the code. Reviewed-by: Philippe Mathieu-Daudé <f4bug(a)amsat.org> Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- docs/interop/firmware.json | 54 ++++++++++++++++++++++++++++++++------ 1 file changed, 46 insertions(+), 8 deletions(-) In v2: - Mark 'mode' as optional field - Misc typos in docs diff --git a/docs/interop/firmware.json b/docs/interop/firmware.json index 8d8b0be030..f5d1d0b6e7 100644 --- a/docs/interop/firmware.json +++ b/docs/interop/firmware.json @@ -210,24 +210,61 @@ 'data' : { 'filename' : 'str', 'format' : 'BlockdevDriver' } } + +## +# @FirmwareFlashType: +# +# Describes how the firmware build handles code versus variable +# persistence. +# +# @split: the executable file contains code while the NVRAM +# template provides variable storage. The executable +# must be configured read-only and can be shared between +# multiple guests. The NVRAM template must be cloned +# for each new guest and configured read-write. +# +# @combined: the executable file contains both code and +# variable storage. The executable must be cloned +# for each new guest and configured read-write. +# No NVRAM template will be specified. +# +# @stateless: the executable file contains code and variable +# storage is not persisted. The executed must +# be configured read-only and can be shared +# between multiple guests. No NVRAM template +# will be specified. +# +# Since: 7.0.0 +## +{ 'enum': 'FirmwareFlashMode', + 'data': [ 'split', 'combined', 'stateless' ] } + ## # @FirmwareMappingFlash: # # Describes loading and mapping properties for the firmware executable # and its accompanying NVRAM file, when @FirmwareDevice is @flash. # -# @executable: Identifies the firmware executable. The firmware -# executable may be shared by multiple virtual machine -# definitions. The preferred corresponding QEMU command -# line options are +# @mode: describes how the firmware build handles code versus variable +# storage. If not present, it must be treated as if it was +# configured with value ``split``. Since: 7.0.0 +# +# @executable: Identifies the firmware executable. The @mode +# indicates whether there will be an associated +# NVRAM template present. The preferred +# corresponding QEMU command line options are # -drive if=none,id=pflash0,readonly=on,file=@executable.@filename,format=@executable.@format # -machine pflash0=pflash0 -# or equivalent -blockdev instead of -drive. +# or equivalent -blockdev instead of -drive. When +# @mode is ``combined`` the executable must be +# cloned before use and configured with readonly=off. # With QEMU versions older than 4.0, you have to use # -drive if=pflash,unit=0,readonly=on,file=@executable.@filename,format=@executable.@format # # @nvram-template: Identifies the NVRAM template compatible with -# @executable. Management software instantiates an +# @executable, when @mode is set to ``split``, +# otherwise it should not be present. +# Management software instantiates an # individual copy -- a specific NVRAM file -- from # @nvram-template.@filename for each new virtual # machine definition created. @nvram-template.@filename @@ -246,8 +283,9 @@ # Since: 3.0 ## { 'struct' : 'FirmwareMappingFlash', - 'data' : { 'executable' : 'FirmwareFlashFile', - 'nvram-template' : 'FirmwareFlashFile' } } + 'data' : { '*mode': 'FirmwareFlashMode', + 'executable' : 'FirmwareFlashFile', + '*nvram-template' : 'FirmwareFlashFile' } } ## # @FirmwareMappingKernel: -- 2.34.1

3 6

[PATCH] virnwfilterobj: Unlock virNWFilterObj before triggering rebuild
by Michal Privoznik 01 Feb '22

01 Feb '22

When updating am NWFilter, rebuilding of all NWFilters is triggered. This happens in virNWFilterObjListAssignDef() by calling virNWFilterTriggerRebuild(). Now consider another thread, that's currently executing virNWFilterBindingCreateXML() over the same NWFilter. What happens is that this second thread gets all the way into virNWFilterInstantiateFilterInternal(), acquires @updateMutex and transitively calls virNWFilterObjListFindByName() which iterates over list of NWFilters, locking one by one, comparing names trying to find the desired one. Sooner or later it will try to lock the object that the other, original thread is redefining and which it holds locked. Now that thread can't continue either because it's waiting for the @updateMutex lock. So we end up in a typical deadlock situation, one thread holding lock A trying to acquire lock B, the other thread holding B and trying to acquire A. The solution is to unlock the virNWFilterObj in the first thread, just before triggering rebuild. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2044379 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- I'm not sure this is 100% correct, but hey - it make that particular bug go away. src/conf/virnwfilterobj.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/conf/virnwfilterobj.c b/src/conf/virnwfilterobj.c index 6bbdf6e6fa..d6c2e59ce8 100644 --- a/src/conf/virnwfilterobj.c +++ b/src/conf/virnwfilterobj.c @@ -352,12 +352,17 @@ virNWFilterObjListAssignDef(virNWFilterObjList *nwfilters, } obj->newDef = def; - /* trigger the update on VMs referencing the filter */ + + /* Trigger the update on VMs referencing the filter, but + * unlock the filter because rebuild will lock it again. */ + virNWFilterObjUnlock(obj); if (virNWFilterTriggerRebuild() < 0) { + virNWFilterObjLock(obj); obj->newDef = NULL; virNWFilterObjUnlock(obj); return NULL; } + virNWFilterObjLock(obj); virNWFilterDefFree(objdef); obj->def = def; -- 2.34.1

2 1

[PATCH] systemd: Use correct man page name in modular daemon service files
by Peter Krempa 01 Feb '22

01 Feb '22

The service files were copied out of the service file for libvirtd and the name of the corresponding manpage was not fixed. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2045959 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/ch/virtchd.service.in | 2 +- src/interface/virtinterfaced.service.in | 2 +- src/libxl/virtxend.service.in | 2 +- src/lxc/virtlxcd.service.in | 2 +- src/network/virtnetworkd.service.in | 2 +- src/node_device/virtnodedevd.service.in | 2 +- src/nwfilter/virtnwfilterd.service.in | 2 +- src/qemu/virtqemud.service.in | 2 +- src/remote/virtproxyd.service.in | 2 +- src/secret/virtsecretd.service.in | 2 +- src/storage/virtstoraged.service.in | 2 +- src/vbox/virtvboxd.service.in | 2 +- src/vz/virtvzd.service.in | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/ch/virtchd.service.in b/src/ch/virtchd.service.in index f08339f211..f53a12ea05 100644 --- a/src/ch/virtchd.service.in +++ b/src/ch/virtchd.service.in @@ -13,7 +13,7 @@ After=local-fs.target After=remote-fs.target After=systemd-logind.service After=systemd-machined.service -Documentation=man:libvirtd(8) +Documentation=man:virtchd(8) Documentation=https://libvirt.org [Service] diff --git a/src/interface/virtinterfaced.service.in b/src/interface/virtinterfaced.service.in index 3d944e17a9..cb860ff1c4 100644 --- a/src/interface/virtinterfaced.service.in +++ b/src/interface/virtinterfaced.service.in @@ -8,7 +8,7 @@ After=network.target After=dbus.service After=apparmor.service After=local-fs.target -Documentation=man:libvirtd(8) +Documentation=man:virtinterfaced(8) Documentation=https://libvirt.org [Service] diff --git a/src/libxl/virtxend.service.in b/src/libxl/virtxend.service.in index 2b5163e179..6b083c414f 100644 --- a/src/libxl/virtxend.service.in +++ b/src/libxl/virtxend.service.in @@ -12,7 +12,7 @@ After=local-fs.target After=remote-fs.target After=xencommons.service Conflicts=xendomains.service -Documentation=man:libvirtd(8) +Documentation=man:virtxend(8) Documentation=https://libvirt.org ConditionPathExists=/proc/xen/capabilities diff --git a/src/lxc/virtlxcd.service.in b/src/lxc/virtlxcd.service.in index d58bde9f5d..334c34db44 100644 --- a/src/lxc/virtlxcd.service.in +++ b/src/lxc/virtlxcd.service.in @@ -13,7 +13,7 @@ After=local-fs.target After=remote-fs.target After=systemd-logind.service After=systemd-machined.service -Documentation=man:libvirtd(8) +Documentation=man:virtlxcd(8) Documentation=https://libvirt.org [Service] diff --git a/src/network/virtnetworkd.service.in b/src/network/virtnetworkd.service.in index 3decfbbf1d..05ce672b73 100644 --- a/src/network/virtnetworkd.service.in +++ b/src/network/virtnetworkd.service.in @@ -11,7 +11,7 @@ After=ip6tables.service After=dbus.service After=apparmor.service After=local-fs.target -Documentation=man:libvirtd(8) +Documentation=man:virtnetworkd(8) Documentation=https://libvirt.org [Service] diff --git a/src/node_device/virtnodedevd.service.in b/src/node_device/virtnodedevd.service.in index 688cf89822..cd9de362fd 100644 --- a/src/node_device/virtnodedevd.service.in +++ b/src/node_device/virtnodedevd.service.in @@ -8,7 +8,7 @@ After=network.target After=dbus.service After=apparmor.service After=local-fs.target -Documentation=man:libvirtd(8) +Documentation=man:virtnodedevd(8) Documentation=https://libvirt.org [Service] diff --git a/src/nwfilter/virtnwfilterd.service.in b/src/nwfilter/virtnwfilterd.service.in index 36d00b58f0..ab65419e0c 100644 --- a/src/nwfilter/virtnwfilterd.service.in +++ b/src/nwfilter/virtnwfilterd.service.in @@ -8,7 +8,7 @@ After=network.target After=dbus.service After=apparmor.service After=local-fs.target -Documentation=man:libvirtd(8) +Documentation=man:virtnwfilterd(8) Documentation=https://libvirt.org [Service] diff --git a/src/qemu/virtqemud.service.in b/src/qemu/virtqemud.service.in index 551eb4d405..5ad968ace9 100644 --- a/src/qemu/virtqemud.service.in +++ b/src/qemu/virtqemud.service.in @@ -15,7 +15,7 @@ After=local-fs.target After=remote-fs.target After=systemd-logind.service After=systemd-machined.service -Documentation=man:libvirtd(8) +Documentation=man:virtqemud(8) Documentation=https://libvirt.org [Service] diff --git a/src/remote/virtproxyd.service.in b/src/remote/virtproxyd.service.in index 10e8cf7263..f9bb6b84a9 100644 --- a/src/remote/virtproxyd.service.in +++ b/src/remote/virtproxyd.service.in @@ -8,7 +8,7 @@ After=network.target After=dbus.service After=apparmor.service After=local-fs.target -Documentation=man:libvirtd(8) +Documentation=man:virtproxyd(8) Documentation=https://libvirt.org [Service] diff --git a/src/secret/virtsecretd.service.in b/src/secret/virtsecretd.service.in index cbd63fe0b2..6d298c5334 100644 --- a/src/secret/virtsecretd.service.in +++ b/src/secret/virtsecretd.service.in @@ -8,7 +8,7 @@ After=network.target After=dbus.service After=apparmor.service After=local-fs.target -Documentation=man:libvirtd(8) +Documentation=man:virtsecretd(8) Documentation=https://libvirt.org [Service] diff --git a/src/storage/virtstoraged.service.in b/src/storage/virtstoraged.service.in index f72f8426fd..eda4d86d37 100644 --- a/src/storage/virtstoraged.service.in +++ b/src/storage/virtstoraged.service.in @@ -10,7 +10,7 @@ After=iscsid.service After=apparmor.service After=local-fs.target After=remote-fs.target -Documentation=man:libvirtd(8) +Documentation=man:virtstoraged(8) Documentation=https://libvirt.org [Service] diff --git a/src/vbox/virtvboxd.service.in b/src/vbox/virtvboxd.service.in index cfdafc39d2..6f447276e9 100644 --- a/src/vbox/virtvboxd.service.in +++ b/src/vbox/virtvboxd.service.in @@ -9,7 +9,7 @@ After=dbus.service After=apparmor.service After=local-fs.target After=remote-fs.target -Documentation=man:libvirtd(8) +Documentation=man:virtvboxd(8) Documentation=https://libvirt.org [Service] diff --git a/src/vz/virtvzd.service.in b/src/vz/virtvzd.service.in index 7636bf2b9e..2b1165c92b 100644 --- a/src/vz/virtvzd.service.in +++ b/src/vz/virtvzd.service.in @@ -9,7 +9,7 @@ After=dbus.service After=apparmor.service After=local-fs.target After=remote-fs.target -Documentation=man:libvirtd(8) +Documentation=man:virtvzd(8) Documentation=https://libvirt.org [Service] -- 2.34.1

2 1

[PATCH] virnwfilterbindingobj: Fix virNWFilterBindingObjNew()
by Michal Privoznik 01 Feb '22

01 Feb '22

The idea behind virNWFilterBindingObjNew() is to create and return an object of virNWFilterBindingObjClass class. The class is virObjectLockable (and the corresponding _virNWFilterBindingObj structure has virObjectLockable parent). But for some reason plain virObjectNew() is called. This is wrong because the mutex in the parent is left uninitialized. Next, the returned object is not locked. This is wrong because in some cases the returned object is added onto a list of bindings and then passed to virNWFilterBindingObjEndAPI() which unlocks it right away. This is potentially dangerous because we might just have unlocked the object for another thread. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/virnwfilterbindingobj.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/conf/virnwfilterbindingobj.c b/src/conf/virnwfilterbindingobj.c index acea240b5d..d387af68c0 100644 --- a/src/conf/virnwfilterbindingobj.c +++ b/src/conf/virnwfilterbindingobj.c @@ -57,10 +57,15 @@ VIR_ONCE_GLOBAL_INIT(virNWFilterBindingObj); virNWFilterBindingObj * virNWFilterBindingObjNew(void) { + virNWFilterBindingObj *ret; if (virNWFilterBindingObjInitialize() < 0) return NULL; - return virObjectNew(virNWFilterBindingObjClass); + if (!(ret = virObjectLockableNew(virNWFilterBindingObjClass))) + return NULL; + + virObjectLock(ret); + return ret; } -- 2.34.1

2 1

Re: [PATCH v3 1/2] hw/i386: Attach CPUs to machine
by Daniel P. Berrangé 01 Feb '22

01 Feb '22

Cc libvir-list since this will (intentionally) break compatibility with current libvirt code that looks for "/machine/unattached/device[0]" in the assumption it is the first CPU. On Tue, Feb 01, 2022 at 12:35:06AM +0100, Philippe Mathieu-Daudé wrote: > Previously CPUs were exposed in the QOM tree at a path > > /machine/unattached/device[nn] > > where the 'nn' of the first CPU is usually zero, but can > vary depending on what devices were already created. > > With this change the CPUs are now at > > /machine/cpu[nn] > > where the 'nn' of the first CPU is always zero. > > Suggested-by: Daniel P. Berrangé <berrange(a)redhat.com> > Signed-off-by: Philippe Mathieu-Daudé <f4bug(a)amsat.org> > --- > hw/i386/x86.c | 1 + > 1 file changed, 1 insertion(+) Reviewed-by: Daniel P. Berrangé <berrange(a)redhat.com> > > diff --git a/hw/i386/x86.c b/hw/i386/x86.c > index b84840a1bb9..50bf249c700 100644 > --- a/hw/i386/x86.c > +++ b/hw/i386/x86.c > @@ -108,6 +108,7 @@ void x86_cpu_new(X86MachineState *x86ms, int64_t apic_id, Error **errp) > { > Object *cpu = object_new(MACHINE(x86ms)->cpu_type); > > + object_property_add_child(OBJECT(x86ms), "cpu[*]", OBJECT(cpu)); > if (!object_property_set_uint(cpu, "apic-id", apic_id, errp)) { > goto out; > } > -- > 2.34.1 > Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|

1 0

[libvirt PATCH] tests: refactor testSELinuxLoadDef
by Ján Tomko 31 Jan '22

31 Jan '22

Since its introduction in commit 907a39e735d256b8428ed4c77009d1f713aea19b Add a test suite for validating SELinux labelling this function did not return NULL on OOM. Since we abort on OOM now, switch testSELinuxMungePath to void, return NULL explicitly on XML parsing failure and remove the (now pointless) cleanup label. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- tests/securityselinuxlabeltest.c | 35 +++++++++++--------------------- 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/tests/securityselinuxlabeltest.c b/tests/securityselinuxlabeltest.c index 09902e1c54..b62162fe9f 100644 --- a/tests/securityselinuxlabeltest.c +++ b/tests/securityselinuxlabeltest.c @@ -82,16 +82,12 @@ testUserXattrEnabled(void) return ret; } -static int +static void testSELinuxMungePath(char **path) { - char *tmp; - - tmp = g_strdup_printf("%s/securityselinuxlabeldata%s", abs_builddir, *path); - - VIR_FREE(*path); + char *tmp = g_strdup_printf("%s/securityselinuxlabeldata%s", abs_builddir, *path); + g_free(*path); *path = tmp; - return 0; } static int @@ -154,7 +150,7 @@ testSELinuxLoadFileList(const char *testname, static virDomainDef * testSELinuxLoadDef(const char *testname) { - char *xmlfile = NULL; + g_autofree char *xmlfile = NULL; virDomainDef *def = NULL; size_t i; @@ -163,15 +159,14 @@ testSELinuxLoadDef(const char *testname) if (!(def = virDomainDefParseFile(xmlfile, driver.xmlopt, NULL, 0))) - goto cleanup; + return NULL; for (i = 0; i < def->ndisks; i++) { if (def->disks[i]->src->type != VIR_STORAGE_TYPE_FILE && def->disks[i]->src->type != VIR_STORAGE_TYPE_BLOCK) continue; - if (testSELinuxMungePath(&def->disks[i]->src->path) < 0) - goto cleanup; + testSELinuxMungePath(&def->disks[i]->src->path); } for (i = 0; i < def->nserials; i++) { @@ -182,23 +177,17 @@ testSELinuxLoadDef(const char *testname) continue; if (def->serials[i]->source->type == VIR_DOMAIN_CHR_TYPE_UNIX) { - if (testSELinuxMungePath(&def->serials[i]->source->data.nix.path) < 0) - goto cleanup; + testSELinuxMungePath(&def->serials[i]->source->data.nix.path); } else { - if (testSELinuxMungePath(&def->serials[i]->source->data.file.path) < 0) - goto cleanup; + testSELinuxMungePath(&def->serials[i]->source->data.file.path); } } - if (def->os.kernel && - testSELinuxMungePath(&def->os.kernel) < 0) - goto cleanup; - if (def->os.initrd && - testSELinuxMungePath(&def->os.initrd) < 0) - goto cleanup; + if (def->os.kernel) + testSELinuxMungePath(&def->os.kernel); + if (def->os.initrd) + testSELinuxMungePath(&def->os.initrd); - cleanup: - VIR_FREE(xmlfile); return def; } -- 2.34.1

2 1

[libvirt PATCH 0/4] libxl: clean up more LIBXL_HAVE constants
by Ján Tomko 31 Jan '22

31 Jan '22

We still were checking for some that were introduced before Xen 4.9 Ján Tomko (4): libxl: assume LIBXL_HAVE_DEVICE_BACKEND_DOMNAME libxl: remove LIBXL_ATTR_UNUSED libxl: assume LIBXL_HAVE_SRM_V2 libxl: assume LIBXL_HAVE_PVUSB src/libxl/libxl_conf.c | 20 ++------------------ src/libxl/libxl_conf.h | 13 +------------ 2 files changed, 3 insertions(+), 30 deletions(-) -- 2.34.1

2 5

[libvirt PATCH] syntax-check: https: list the HTTP-only sites
by Ján Tomko 31 Jan '22

31 Jan '22

Instead of listing the sites that surely support HTTPS, list the ones that don't. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- build-aux/syntax-check.mk | 66 ++++++++++++++++++++++++++++++++------- 1 file changed, 54 insertions(+), 12 deletions(-) diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index 4d396699c9..d5cdb3c70e 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -874,20 +874,62 @@ sc_prohibit_obj_free_apis_in_virsh: halt='avoid using public virXXXFree in virsh, use virsh-prefixed wrappers instead' \ $(_sc_search_regexp) -https_sites = www.libvirt.org -https_sites += libvirt.org -https_sites += security.libvirt.org -https_sites += qemu.org -https_sites += www.qemu.org -https_sites += wiki.qemu.org -https_sites += linux-kvm.org -https_sites += www.linux-kvm.org - -https_re= ($(subst $(space),|,$(https_sites))) +# Links in various schemas +http_sites = libvirt.org.*\/schemas\/ +http_sites += \.dtd +http_sites += libosinfo +http_sites += localhost +http_sites += rdf:resource +http_sites += schemas.dmtf.org +http_sites += schemas.microsoft.com +http_sites += schemas.xmlsoap.org +http_sites += www.inkscape.org +http_sites += www.innotek.de +http_sites += www.w3.org +http_sites += xmlns + +# Links in licenses +http_sites += scripts.sil.org +http_sites += www.gnu.org\/licenses\/ +http_sites += www.sun.com + +# Example links +http_sites += example.com +http_sites += example.org +http_sites += herp.derp + +# HTTP-only sites +http_sites += 0pointer.de +http_sites += mah.everybody.org +http_sites += mingw.org +http_sites += munin.projects.linpro.no +http_sites += netcat.sourceforge.net +http_sites += snooze.inria.fr +http_sites += www.nimbusproject.org +http_sites += www.odin.com +http_sites += www.sflow.net +http_sites += xmlsoft.org +http_sites += etallen.com + +# dead sites +http_sites += blog.lystor.org.ua +http_sites += blog.mes-stats.fr +http_sites += cc1.ifj.edu.pl +http_sites += www.javvin.com + +# 404 links +http_sites += publib.boulder.ibm.com +http_sites += kerneltrap.org +http_sites += valloric.github.io +http_sites += www.microsoft.com +http_sites += xenbits.xen.org +http_sites += lovezutto.googlepages.com + +http_re= ($(subst $(space),|,$(http_sites))) sc_prohibit_http_urls: - @prohibit='http://$(https_re)' \ - exclude="/schemas/" \ + @prohibit='http://\w' \ + exclude="$(http_re)" \ halt='Links must use https:// protocol' \ $(_sc_search_regexp) -- 2.34.1

2 1

[libvirt PATCH] qemu_firmware: don't error out for unknown firmware features
by Pavel Hrdina 31 Jan '22

31 Jan '22

When QEMU introduces new firmware features libvirt will fail until we list that feature in our code as well which doesn't sound right. We should simply ignore the new feature until we add a proper support for it. Reported-by: Laszlo Ersek <lersek(a)redhat.com> Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/qemu/qemu_firmware.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index 94e88ebe4b..e37a7edefa 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -567,6 +567,7 @@ qemuFirmwareFeatureParse(const char *path, virJSONValue *featuresJSON; g_autoptr(qemuFirmwareFeature) features = NULL; size_t nfeatures; + size_t nparsed = 0; size_t i; if (!(featuresJSON = virJSONValueObjectGetArray(doc, "features"))) { @@ -586,17 +587,16 @@ qemuFirmwareFeatureParse(const char *path, int tmp; if ((tmp = qemuFirmwareFeatureTypeFromString(tmpStr)) <= 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("unknown feature %s"), - tmpStr); - return -1; + VIR_DEBUG("unknown feature %s", tmpStr); + continue; } - features[i] = tmp; + features[nparsed] = tmp; + nparsed++; } fw->features = g_steal_pointer(&features); - fw->nfeatures = nfeatures; + fw->nfeatures = nparsed; return 0; } -- 2.30.2

4 10

[libvirt PATCH] qemu: qemuDomainSetLaunchSecurityState: do not lookup qemuCaps in cache
by Ján Tomko 31 Jan '22

31 Jan '22

Any active domain has a copy in the privateData, filled in qemuProcessInit. Move the qemu capability check below the activeness check and remove the extra lookup. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/qemu/qemu_driver.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index cbd17c10ae..acaa6f7629 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -19975,12 +19975,12 @@ qemuDomainSetLaunchSecurityState(virDomainPtr domain, virDomainObj *vm; int ret = -1; int rc; - g_autoptr(virQEMUCaps) qemucaps = NULL; const char *secrethdr = NULL; const char *secret = NULL; unsigned long long setaddr = 0; bool hasSetaddr = false; int state; + qemuDomainObjPrivate *priv; virCheckFlags(0, -1); if (virTypedParamsValidate(params, nparams, @@ -19996,6 +19996,8 @@ qemuDomainSetLaunchSecurityState(virDomainPtr domain, if (!(vm = qemuDomainObjFromDomain(domain))) goto cleanup; + priv = vm->privateData; + if (virDomainSetLaunchSecurityStateEnsureACL(domain->conn, vm->def) < 0) goto cleanup; @@ -20007,17 +20009,6 @@ qemuDomainSetLaunchSecurityState(virDomainPtr domain, goto cleanup; } - if (!(qemucaps = virQEMUCapsCacheLookupDefault(driver->qemuCapsCache, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL))) - goto cleanup; - - if (!virQEMUCapsGet(qemucaps, QEMU_CAPS_SEV_INJECT_LAUNCH_SECRET)) { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", - _("QEMU does not support setting a launch secret")); - goto cleanup; - } - if (virTypedParamsGetString(params, nparams, VIR_DOMAIN_LAUNCH_SECURITY_SEV_SECRET_HEADER, &secrethdr) < 0 || @@ -20050,6 +20041,12 @@ qemuDomainSetLaunchSecurityState(virDomainPtr domain, goto endjob; } + if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_SEV_INJECT_LAUNCH_SECRET)) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("QEMU does not support setting a launch secret")); + goto cleanup; + } + qemuDomainObjEnterMonitor(driver, vm); rc = qemuMonitorSetLaunchSecurityState(QEMU_DOMAIN_PRIVATE(vm)->mon, secrethdr, secret, setaddr, hasSetaddr); -- 2.34.1

2 2

[PATCH] kbase: debuglogs: Add note about sensitive information in the logs
by Peter Krempa 31 Jan '22

31 Jan '22

Outline information commonly logged which users could consider sensitive. Add a note that VNC/SPICE passwords are logged in plaintext. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- docs/kbase/debuglogs.rst | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/docs/kbase/debuglogs.rst b/docs/kbase/debuglogs.rst index c361c698c5..00dbc9bbf7 100644 --- a/docs/kbase/debuglogs.rst +++ b/docs/kbase/debuglogs.rst @@ -300,6 +300,8 @@ Now you should go and reproduce the bug. Once you're finished, attach: - If you are asked for client logs, ``/tmp/libvirt_client.log``. - Ideally don't tear down the environment in case additional information is required. +- Consider whether you consider any of the information in the debug logs + sensitive: `Sensitive information in debug logs`_. Example filter settings ======================= @@ -339,3 +341,25 @@ This filter logs only QMP traffic and skips most of libvirt's messages. :: 2:qemu.qemu_monitor 3:* + +Sensitive information in debug logs +=================================== + +Debug logs may contain information that certain users may consider sensitive +although generally it's okay to share debuglogs publicly. + +Information which could be deemed sensitive: + + - hostname of the host + - names of VMs and other objects + - paths to disk images + - IP addresses of guests and the host + - hostnames/IP addresses of disks accessed via network + + +Libvirt's debug logs only ever have passwords and disk encryption secrets in +encrypted form without the key being part of the log. There's one notable +exception, that ``VNC/SPICE`` passwords can be found in the logs. + +In case you decide to mask information you consider sensitive from the posted +debug logs, make sure that the masking doesn't introduce ambiguity. -- 2.34.1

2 2

[libvirt PATCH] conf: network: remove hostname validation
by Ján Tomko 31 Jan '22

31 Jan '22

We used to validate that the first character of the hostname is a letter. Later, RFC1123 relaxed the requirements to allow a number as well. Drop the validation completely, since we do not care about the following characters, and neither does dnsmasq (even if it's a comma, which is a delimiter in the hosts file). Reverts: 673b74be5fda928da5e9f3c2cfbf6c1cb1eda0c6 Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/conf/network_conf.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index c769bbaeb5..8f50e22be5 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -548,12 +548,6 @@ virNetworkDHCPHostDefParseXML(const char *networkName, } name = virXMLPropString(node, "name"); - if (name && !(g_ascii_isalpha(name[0]) || g_ascii_isdigit(name[0]))) { - virReportError(VIR_ERR_XML_ERROR, - _("Cannot use host name '%s' in network '%s'"), - name, networkName); - return -1; - } ip = virXMLPropString(node, "ip"); if (ip && (virSocketAddrParse(&inaddr, ip, AF_UNSPEC) < 0)) { -- 2.31.1

2 2