- Devel - libvirt List Archives

[PATCH v4 2/3] qemu: Add XML tests for kvm riscv-aia feature
by BillXiang 27 Oct '25

27 Oct '25

From: xiangwencheng <xiangwencheng(a)lanxincomputing.com> Signed-off-by: BillXiang <xiangwencheng(a)lanxincomputing.com> --- .../caps_9.1.0_riscv64.replies | 4 +++ .../caps_9.1.0_riscv64.xml | 3 ++ ...atures-aia-aplic-imsic.riscv64-latest.args | 31 +++++++++++++++++++ ...eatures-aia-aplic-imsic.riscv64-latest.xml | 1 + .../riscv64-virt-features-aia-aplic-imsic.xml | 30 ++++++++++++++++++ tests/qemuxmlconftest.c | 1 + 6 files changed, 70 insertions(+) create mode 100644 tests/qemuxmlconfdata/riscv64-virt-features-aia-aplic-imsic.riscv64-latest.args create mode 120000 tests/qemuxmlconfdata/riscv64-virt-features-aia-aplic-imsic.riscv64-latest.xml create mode 100644 tests/qemuxmlconfdata/riscv64-virt-features-aia-aplic-imsic.xml diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.replies b/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.replies index 51896936cc..b394d68d00 100644 --- a/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.replies +++ b/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.replies @@ -24238,6 +24238,10 @@ "name": "tcg-accel", "parent": "accel" }, + { + "name": "kvm-accel", + "parent": "accel" + }, { "name": "ES1370", "parent": "pci-device" diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml b/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml index 9ceefed89f..6fbe05aa8d 100644 --- a/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml @@ -3,6 +3,7 @@ <qemuctime>0</qemuctime> <selfctime>0</selfctime> <selfvers>0</selfvers> + <flag name='kvm'/> <flag name='sdl'/> <flag name='spice'/> <flag name='hda-duplex'/> @@ -180,10 +181,12 @@ <cpu type='tcg' name='thead-c906' typename='thead-c906-riscv-cpu'/> <cpu type='tcg' name='sifive-u54' typename='sifive-u54-riscv-cpu'/> <cpu type='tcg' name='veyron-v1' typename='veyron-v1-riscv-cpu'/> + <cpu type='kvm' name='rv64' typename='rv64-riscv-cpu'/> <machine type='tcg' name='virt' maxCpus='512' defaultCPU='rv64-riscv-cpu' numaMemSupported='yes' defaultRAMid='riscv_virt_board.ram' acpi='yes'/> <machine type='tcg' name='spike' maxCpus='8' default='yes' defaultCPU='rv64-riscv-cpu' numaMemSupported='yes' defaultRAMid='riscv.spike.ram' acpi='no'/> <machine type='tcg' name='microchip-icicle-kit' maxCpus='5' defaultRAMid='microchip.icicle.kit.ram' acpi='no'/> <machine type='tcg' name='sifive_u' maxCpus='5' defaultCPU='sifive-u54-riscv-cpu' defaultRAMid='riscv.sifive.u.ram' acpi='no'/> <machine type='tcg' name='shakti_c' maxCpus='1' defaultCPU='shakti-c-riscv-cpu' defaultRAMid='riscv.shakti.c.ram' acpi='no'/> <machine type='tcg' name='sifive_e' maxCpus='1' defaultCPU='sifive-e51-riscv-cpu' defaultRAMid='riscv.sifive.e.ram' acpi='no'/> + <machine type='kvm' name='virt' maxCpus='512' defaultCPU='rv64-riscv-cpu' numaMemSupported='yes' defaultRAMid='riscv_virt_board.ram' acpi='yes'/> </qemuCaps> diff --git a/tests/qemuxmlconfdata/riscv64-virt-features-aia-aplic-imsic.riscv64-latest.args b/tests/qemuxmlconfdata/riscv64-virt-features-aia-aplic-imsic.riscv64-latest.args new file mode 100644 index 0000000000..3dadcdcd7c --- /dev/null +++ b/tests/qemuxmlconfdata/riscv64-virt-features-aia-aplic-imsic.riscv64-latest.args @@ -0,0 +1,31 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-guest \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-guest/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-guest/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ +/usr/bin/qemu-system-riscv64 \ +-name guest=guest,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ +-machine virt,usb=off,aia=aplic-imsic,dump-guest-core=off,memory-backend=riscv_virt_board.ram,acpi=off \ +-accel kvm,riscv-aia=auto \ +-cpu rv64 \ +-m size=4194304k \ +-object '{"qom-type":"memory-backend-ram","id":"riscv_virt_board.ram","size":4294967296}' \ +-overcommit mem-lock=off \ +-smp 4,sockets=4,cores=1,threads=1 \ +-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-boot strict=on \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxmlconfdata/riscv64-virt-features-aia-aplic-imsic.riscv64-latest.xml b/tests/qemuxmlconfdata/riscv64-virt-features-aia-aplic-imsic.riscv64-latest.xml new file mode 120000 index 0000000000..73a864a8c2 --- /dev/null +++ b/tests/qemuxmlconfdata/riscv64-virt-features-aia-aplic-imsic.riscv64-latest.xml @@ -0,0 +1 @@ +riscv64-virt-features-aia-aplic-imsic.xml \ No newline at end of file diff --git a/tests/qemuxmlconfdata/riscv64-virt-features-aia-aplic-imsic.xml b/tests/qemuxmlconfdata/riscv64-virt-features-aia-aplic-imsic.xml new file mode 100644 index 0000000000..31d4f30401 --- /dev/null +++ b/tests/qemuxmlconfdata/riscv64-virt-features-aia-aplic-imsic.xml @@ -0,0 +1,30 @@ +<domain type='kvm'> + <name>guest</name> + <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid> + <memory unit='KiB'>4194304</memory> + <currentMemory unit='KiB'>4194304</currentMemory> + <vcpu placement='static'>4</vcpu> + <os> + <type arch='riscv64' machine='virt'>hvm</type> + <boot dev='hd'/> + </os> + <features> + <kvm> + <riscv-aia state='on' mode='auto'/> + </kvm> + <aia value='aplic-imsic'/> + </features> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>rv64</model> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-riscv64</emulator> + <controller type='pci' index='0' model='pcie-root'/> + <audio id='1' type='none'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index 171a6f1c78..5a2a14f7a6 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -2999,6 +2999,7 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST("x86_64-default-cpu-tcg-features", "x86_64"); DO_TEST_CAPS_ARCH_LATEST("riscv64-virt-features-aia", "riscv64"); + DO_TEST_CAPS_ARCH_LATEST("riscv64-virt-features-aia-aplic-imsic", "riscv64"); DO_TEST_CAPS_LATEST("virtio-9p-multidevs"); DO_TEST_CAPS_LATEST("virtio-9p-createmode"); -- 2.34.1

2 1

[PATCH] qemu: Drop /dev/kvm from default device ACL
by Praveen K Paladugu 22 Oct '25

22 Oct '25

A domain that runs with TCG emulation does not need kvm device, so drop it from default device ACL. To dynamically add devices to defaultDeviceACL, make it a GSList. This variable will be initialized when qemu driver is initalized. Lastly, dynamically append /dev/kvm to default ACL only if the domain is of type VIR_DOMAIN_VIRT_KVM. Signed-off-by: Praveen K Paladugu <prapal(a)linux.microsoft.com> --- src/qemu/qemu.conf.in | 3 +- src/qemu/qemu_cgroup.c | 52 ++++++++++++++++++++++-------- src/qemu/qemu_cgroup.h | 5 ++- src/qemu/qemu_conf.c | 14 ++++++-- src/qemu/qemu_conf.h | 2 +- src/qemu/qemu_driver.c | 4 +++ src/qemu/qemu_namespace.c | 12 +++---- src/qemu/qemu_process.c | 6 ++-- src/qemu/test_libvirtd_qemu.aug.in | 3 +- 9 files changed, 71 insertions(+), 30 deletions(-) diff --git a/src/qemu/qemu.conf.in b/src/qemu/qemu.conf.in index fc91ba8f08..0a8abd9544 100644 --- a/src/qemu/qemu.conf.in +++ b/src/qemu/qemu.conf.in @@ -618,8 +618,7 @@ #cgroup_device_acl = [ # "/dev/null", "/dev/full", "/dev/zero", # "/dev/random", "/dev/urandom", -# "/dev/ptmx", "/dev/kvm", -# "/dev/userfaultfd" +# "/dev/ptmx", "/dev/userfaultfd" #] # # RDMA migration requires the following extra files to be added to the list: diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index f10976c2b0..b2dcefd81e 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -38,17 +38,38 @@ VIR_LOG_INIT("qemu.qemu_cgroup"); -const char *const defaultDeviceACL[] = { +GSList *defaultDeviceACL; + +const char *const _defaultDeviceACL[] = { "/dev/null", "/dev/full", "/dev/zero", "/dev/random", "/dev/urandom", - "/dev/ptmx", "/dev/kvm", - "/dev/userfaultfd", + "/dev/ptmx", "/dev/userfaultfd", NULL, }; #define DEVICE_PTY_MAJOR 136 #define DEVICE_SND_MAJOR 116 +void +initDefaultDeviceACL(void) +{ + size_t i; + + for (i = 0; _defaultDeviceACL[i] != NULL; i++) { + defaultDeviceACL = g_slist_append(defaultDeviceACL, + g_strdup(_defaultDeviceACL[i])); + } +} + +void +updateDefaultDeviceACL(virDomainObj *vm) +{ + if (vm->def->virtType == VIR_DOMAIN_VIRT_KVM) { + defaultDeviceACL = g_slist_append(defaultDeviceACL, + g_strdup("/dev/kvm")); + } +} + static int qemuCgroupAllowDevicePath(virDomainObj *vm, const char *path, @@ -71,19 +92,19 @@ qemuCgroupAllowDevicePath(virDomainObj *vm, static int qemuCgroupAllowDevicesPaths(virDomainObj *vm, - const char *const *deviceACL, + GSList *deviceACL, int perms, bool ignoreEacces) { - size_t i; + GSList *cur = NULL; - for (i = 0; deviceACL[i] != NULL; i++) { - if (!virFileExists(deviceACL[i])) { - VIR_DEBUG("Ignoring non-existent device %s", deviceACL[i]); + for (cur = deviceACL; cur; cur = g_slist_next(cur)) { + if (!virFileExists(cur->data)) { + VIR_DEBUG("Ignoring non-existent device %s", (char *)cur->data); continue; } - if (qemuCgroupAllowDevicePath(vm, deviceACL[i], perms, ignoreEacces) < 0) + if (qemuCgroupAllowDevicePath(vm, cur->data, perms, ignoreEacces) < 0) return -1; } @@ -99,13 +120,13 @@ qemuCgroupDenyDevicePath(virDomainObj *vm, { qemuDomainObjPrivate *priv = vm->privateData; g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(priv->driver); - const char *const *deviceACL = (const char *const *)cfg->cgroupDeviceACL; int ret; + GSList *deviceACL = cfg->cgroupDeviceACL; if (!deviceACL) deviceACL = defaultDeviceACL; - if (g_strv_contains(deviceACL, path)) { + if (g_slist_find(deviceACL, path)) { VIR_DEBUG("Skipping deny of path %s in CGroups because it's in cgroupDeviceACL", path); return 0; @@ -556,8 +577,11 @@ qemuSetupMemoryDevicesCgroup(virDomainObj *vm, virDomainMemoryDef *mem) { qemuDomainObjPrivate *priv = vm->privateData; - const char *const sgxPaths[] = { QEMU_DEV_SGX_VEPVC, - QEMU_DEV_SGX_PROVISION, NULL }; + g_autoptr(virGSListString) sgxPaths = NULL; + + sgxPaths = g_slist_append(sgxPaths, g_strdup(QEMU_DEV_SGX_VEPVC)); + sgxPaths = g_slist_append(sgxPaths, g_strdup(QEMU_DEV_SGX_PROVISION)); + sgxPaths = g_slist_append(sgxPaths, NULL); if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_DEVICES)) return 0; @@ -758,7 +782,7 @@ qemuSetupDevicesCgroup(virDomainObj *vm) { qemuDomainObjPrivate *priv = vm->privateData; g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(priv->driver); - const char *const *deviceACL = (const char *const *) cfg->cgroupDeviceACL; + GSList *deviceACL = cfg->cgroupDeviceACL; int rv = -1; size_t i; diff --git a/src/qemu/qemu_cgroup.h b/src/qemu/qemu_cgroup.h index 3668034cde..402120a8f2 100644 --- a/src/qemu/qemu_cgroup.h +++ b/src/qemu/qemu_cgroup.h @@ -66,4 +66,7 @@ struct _qemuCgroupEmulatorAllNodesData { char *emulatorMemMask; }; -extern const char *const defaultDeviceACL[]; +void updateDefaultDeviceACL(virDomainObj *vm); +void initDefaultDeviceACL(void); + +extern GSList *defaultDeviceACL; diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 242955200a..a19a86cd70 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -345,7 +345,8 @@ static void virQEMUDriverConfigDispose(void *obj) virBitmapFree(cfg->namespaces); - g_strfreev(cfg->cgroupDeviceACL); + g_slist_free(cfg->cgroupDeviceACL); + cfg->cgroupDeviceACL = NULL; g_free(cfg->uri); g_free(cfg->configBaseDir); @@ -1068,6 +1069,7 @@ virQEMUDriverConfigLoadSecurityEntry(virQEMUDriverConfig *cfg, g_auto(GStrv) namespaces = NULL; g_autofree char *user = NULL; g_autofree char *group = NULL; + char **cgroupDeviceACL = NULL; size_t i, j; if (virConfGetValueStringList(conf, "security_driver", true, &cfg->securityDriverNames) < 0) @@ -1125,9 +1127,17 @@ virQEMUDriverConfigLoadSecurityEntry(virQEMUDriverConfig *cfg, } if (virConfGetValueStringList(conf, "cgroup_device_acl", false, - &cfg->cgroupDeviceACL) < 0) + &cgroupDeviceACL) < 0) return -1; + if (cgroupDeviceACL) { + for (i = 0; cgroupDeviceACL[i] != NULL; i++) { + cfg->cgroupDeviceACL = g_slist_append(cfg->cgroupDeviceACL, + g_strdup(cgroupDeviceACL[i])); + } + g_strfreev(cgroupDeviceACL); + } + if (virConfGetValueInt(conf, "seccomp_sandbox", &cfg->seccompSandbox) < 0) return -1; diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index edb65c99f4..bef198c2c8 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -96,7 +96,7 @@ struct _virQEMUDriverConfig { bool rememberOwner; int cgroupControllers; - char **cgroupDeviceACL; + GSList *cgroupDeviceACL; /* These five directories are ones libvirtd uses (so must be root:root * to avoid security risk from QEMU processes */ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ac72ea5cb0..a5fff3dfb1 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -52,6 +52,7 @@ #include "qemu_saveimage.h" #include "qemu_snapshot.h" #include "qemu_validate.h" +#include "qemu_cgroup.h" #include "virerror.h" #include "virlog.h" @@ -910,6 +911,8 @@ qemuStateInitialize(bool privileged, }; virDomainDriverAutoStart(qemu_driver->domains, &autostartCfg); + initDefaultDeviceACL(); + return VIR_DRV_STATE_INIT_COMPLETE; error: @@ -1037,6 +1040,7 @@ qemuStateCleanup(void) if (qemu_driver->lockFD != -1) virPidFileRelease(qemu_driver->config->stateDir, "driver", qemu_driver->lockFD); + g_slist_free(defaultDeviceACL); virObjectUnref(qemu_driver->config); virMutexDestroy(&qemu_driver->lock); VIR_FREE(qemu_driver); diff --git a/src/qemu/qemu_namespace.c b/src/qemu/qemu_namespace.c index f72da83929..74e2730d2d 100644 --- a/src/qemu/qemu_namespace.c +++ b/src/qemu/qemu_namespace.c @@ -212,14 +212,14 @@ static int qemuDomainPopulateDevices(virQEMUDriverConfig *cfg, GSList **paths) { - const char *const *devices = (const char *const *) cfg->cgroupDeviceACL; - size_t i; + GSList *devices = cfg->cgroupDeviceACL; + GSList *cur = NULL; if (!devices) devices = defaultDeviceACL; - for (i = 0; devices[i]; i++) { - *paths = g_slist_prepend(*paths, g_strdup(devices[i])); + for (cur = devices; cur; cur = g_slist_next(cur)) { + *paths = g_slist_prepend(*paths, g_strdup(cur->data)); } return 0; @@ -1459,7 +1459,7 @@ qemuNamespaceUnlinkPaths(virDomainObj *vm, if (STRPREFIX(path, QEMU_DEVPREFIX)) { GStrv mount; bool inSubmount = false; - const char *const *devices = (const char *const *)cfg->cgroupDeviceACL; + GSList *devices = cfg->cgroupDeviceACL; for (mount = devMountsPath; *mount; mount++) { if (STREQ(*mount, "/dev")) @@ -1477,7 +1477,7 @@ qemuNamespaceUnlinkPaths(virDomainObj *vm, if (!devices) devices = defaultDeviceACL; - if (g_strv_contains(devices, path)) + if (g_slist_find(devices, path)) continue; unlinkPaths = g_slist_prepend(unlinkPaths, g_strdup(path)); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 9926998f85..d3a78266ef 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3038,7 +3038,7 @@ qemuProcessAllowPostCopyMigration(virDomainObj *vm) qemuDomainObjPrivate *priv = vm->privateData; virQEMUDriver *driver = priv->driver; g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); - const char *const *devices = (const char *const *) cfg->cgroupDeviceACL; + GSList *devices = cfg->cgroupDeviceACL; const char *uffd = "/dev/userfaultfd"; int rc; @@ -3050,7 +3050,7 @@ qemuProcessAllowPostCopyMigration(virDomainObj *vm) if (!devices) devices = defaultDeviceACL; - if (!g_strv_contains(devices, uffd)) { + if (!g_slist_find(devices, uffd)) { VIR_DEBUG("%s is not allowed by device ACL", uffd); return 0; } @@ -8193,6 +8193,8 @@ qemuProcessLaunch(virConnectPtr conn, goto cleanup; } + updateDefaultDeviceACL(vm); + VIR_DEBUG("Building domain mount namespace (if required)"); if (qemuDomainBuildNamespace(cfg, vm) < 0) goto cleanup; diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index 90012b3f52..82cfec3b4b 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -76,8 +76,7 @@ module Test_libvirtd_qemu = { "4" = "/dev/random" } { "5" = "/dev/urandom" } { "6" = "/dev/ptmx" } - { "7" = "/dev/kvm" } - { "8" = "/dev/userfaultfd" } + { "7" = "/dev/userfaultfd" } } { "save_image_format" = "raw" } { "dump_image_format" = "raw" } -- 2.51.0

3 6

[PATCH 0/2] qemu: hyperv spinlock retries count bugfix & improvement
by Friedrich Oslage 22 Oct '25

22 Oct '25

Greetings! I previously submitted this patch via GitLab [1] but was told to send it here instead. Well, here it is. Including tests! :-) The 1st patch contains the bugfix part: It fixes a type mismatch (int/uint) preventing us from using the special "never notify" value qemu recommends [2] for non-overcomitted VMs. The 2nd patch contains the improvement: While inspecting the bug I noticed that the default value for retries is currently 0. That doesn't really make sense as we explicitly require it to be >= 0xFFF (4095). This renders the retries attribute mandatory as opposed to the xml schema definition which already defines it as optional. This patch updates the default value to 0xFFFFFFFF (aka "never notify") and makes it truly optional. [1] https://gitlab.com/libvirt/libvirt/-/merge_requests/521 [2] https://www.qemu.org/docs/master/system/i386/hyperv.html#recommendations Friedrich Oslage (2): qemu: Fix hyperv spinlock retries count type mismatch qemu: Update hyperv spinlock retries count default src/conf/domain_conf.c | 9 +-- ...-spinlocks-never-notify.x86_64-latest.args | 32 +++++++++++ ...v-spinlocks-never-notify.x86_64-latest.xml | 56 +++++++++++++++++++ .../hyperv-spinlocks-never-notify.xml | 50 +++++++++++++++++ .../qemuxmlconfdata/hyperv.x86_64-latest.args | 2 +- .../qemuxmlconfdata/hyperv.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/hyperv.xml | 2 +- tests/qemuxmlconftest.c | 1 + 8 files changed, 147 insertions(+), 7 deletions(-) create mode 100644 tests/qemuxmlconfdata/hyperv-spinlocks-never-notify.x86_64-latest.args create mode 100644 tests/qemuxmlconfdata/hyperv-spinlocks-never-notify.x86_64-latest.xml create mode 100644 tests/qemuxmlconfdata/hyperv-spinlocks-never-notify.xml -- 2.51.0

2 6

[libvirt PATCH] qemu: forbid readonly attribute for externally launched virtiofsd
by Ján Tomko 22 Oct '25

22 Oct '25

From: Ján Tomko <jtomko(a)redhat.com> In that case, libvirtd cannot set it on the command line because virtiofsd is not launched by libvirt. https://issues.redhat.com/browse/RHEL-87522 Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/qemu/qemu_validate.c | 6 +++ ...st-user-fs-sock-readonly.x86_64-latest.err | 1 + .../vhost-user-fs-sock-readonly.xml | 41 +++++++++++++++++++ tests/qemuxmlconftest.c | 1 + 4 files changed, 49 insertions(+) create mode 100644 tests/qemuxmlconfdata/vhost-user-fs-sock-readonly.x86_64-latest.err create mode 100644 tests/qemuxmlconfdata/vhost-user-fs-sock-readonly.xml diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 3e8fdb2268..3b0f2b50a5 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -5022,6 +5022,12 @@ qemuValidateDomainDeviceDefFS(virDomainFSDef *fs, _("virtiofs does not support wrpolicy")); return -1; } + } else { + if (fs->readonly) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("readonly mode cannot be set for externally started virtiofsd")); + return -1; + } } if (fs->model != VIR_DOMAIN_FS_MODEL_DEFAULT) { diff --git a/tests/qemuxmlconfdata/vhost-user-fs-sock-readonly.x86_64-latest.err b/tests/qemuxmlconfdata/vhost-user-fs-sock-readonly.x86_64-latest.err new file mode 100644 index 0000000000..d6df9bddb8 --- /dev/null +++ b/tests/qemuxmlconfdata/vhost-user-fs-sock-readonly.x86_64-latest.err @@ -0,0 +1 @@ +unsupported configuration: readonly mode cannot be set for externally started virtiofsd diff --git a/tests/qemuxmlconfdata/vhost-user-fs-sock-readonly.xml b/tests/qemuxmlconfdata/vhost-user-fs-sock-readonly.xml new file mode 100644 index 0000000000..39e27ccfba --- /dev/null +++ b/tests/qemuxmlconfdata/vhost-user-fs-sock-readonly.xml @@ -0,0 +1,41 @@ +<domain type='kvm'> + <name>guest</name> + <uuid>126f2720-6f8e-45ab-a886-ec9277079a67</uuid> + <memory unit='KiB'>14680064</memory> + <currentMemory unit='KiB'>14680064</currentMemory> + <memoryBacking> + <source type='file'/> + <access mode='shared'/> + </memoryBacking> + <vcpu placement='static'>2</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu64</model> + <numa> + <cell id='0' cpus='0-1' memory='14680064' unit='KiB' memAccess='shared'/> + </numa> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <controller type='usb' index='0' model='none'/> + <controller type='pci' index='0' model='pci-root'/> + <filesystem type='mount'> + <driver type='virtiofs' queue='1024'/> + <source socket='/tmp/sock'/> + <target dir='tag'/> + <readonly/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </filesystem> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <audio id='1' type='none'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index e4d80faa99..1f39779d7b 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -3259,6 +3259,7 @@ mymain(void) DO_TEST_CAPS_LATEST("seclabel-dynamic-none"); DO_TEST_CAPS_LATEST("serial-target-port-auto"); DO_TEST_CAPS_LATEST("vhost-user-fs-sock"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("vhost-user-fs-sock-readonly"); DO_TEST_CAPS_ARCH_LATEST("video-virtio-gpu-ccw-auto", "s390x"); DO_TEST_CAPS_LATEST("graphics-listen-network"); -- 2.50.1

2 1

[PATCH pushed] qemumonitorjsontes: Properly free blockstats
by Peter Krempa 22 Oct '25

22 Oct '25

From: Peter Krempa <pkrempa(a)redhat.com> In the patch converting block stats to objects in 58aa005f3e9 I forgot to change the allocation of the hash table in qemumonitorjsontest which doesn't use the wrapper. This problem didn't manifest itself with newer glib versions. Use 'g_object_unref' instead of 'g_free'. Fixes: 58aa005f3e9 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- tests/qemumonitorjsontest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index a229a89860..6129dde449 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -1446,7 +1446,7 @@ testQemuMonitorJSONqemuMonitorJSONGetAllBlockStatsInfo(const void *opaque) { const testGenericData *data = opaque; virDomainXMLOption *xmlopt = data->xmlopt; - g_autoptr(GHashTable) blockstats = virHashNew(g_free); + g_autoptr(GHashTable) blockstats = virHashNew(g_object_unref); qemuBlockStats *stats; g_autoptr(qemuMonitorTest) test = NULL; -- 2.51.0

3 2

[PATCH v3 0/3] qemu: Implement support for multiple device-pluggable SMMUv3s
by Nathan Chen 22 Oct '25

22 Oct '25

Hi, This is a follow up to the second patchset [0] for supporting multiple device-pluggable vSMMU instances. This patchset implements support for specifying multiple <iommu> devices within the VM definition when smmuv3 IOMMU model is specified with a pciBus driver attribute, and is tested with Shameer's recently accepted qemu series for user-creatable vSMMU devices [1] For instance, specifying the associated emulated device in a VM definition with multiple IOMMUs, configured to be routed to pcie-expander-bus or pcie-root controllers: <devices> <controller type='pci' index='0' model='pcie-root'/> <controller type='pci' index='1' model='pcie-expander-bus'> <model name='pxb-pcie'/> <target busNr='252'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> </controller> <controller type='pci' index='2' model='pcie-root-port'> <model name='pcie-root-port'/> <target chassis='2' port='0x0'/> <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/> </controller> ... <rng model='virtio'> <backend model='random'>/dev/urandom</backend> <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/> </rng> <rng model='virtio'> <backend model='random'>/dev/urandom</backend> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </rng> <iommu model='smmuv3'> <driver pciBus='0'/> </iommu> <iommu model='smmuv3'> <driver pciBus='1'/> </iommu> </devices> This would get translated to a qemu command line with the arguments below. -device '{"driver":"pxb-pcie","bus_nr":252,"id":"pci.1","bus":"pcie.0","addr":"0x1"}' \ -device '{"driver":"pcie-root-port","port":0,"chassis":2,"id":"pci.2","bus":"pci.1","addr":"0x0"}' \ -device '{"driver":"arm-smmuv3","primary-bus":"pcie.0","id":"smmuv3.0"}' \ -device '{"driver":"arm-smmuv3","primary-bus":"pci.1","id":"smmuv3.1"}' \ ... -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"}' \ -device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci.2","addr":"0x0"}' \ -object '{"qom-type":"rng-random","id":"objrng1","filename":"/dev/urandom"}' \ -device '{"driver":"virtio-rng-pci","rng":"objrng1","id":"rng1","bus":"pcie.0","addr":"0x4"}' \ Changes from v2: - Make multi-iommu adoption the first commit - Consolidate smmuv3Dev into smmuv3 model - Change 'parentIdx' attribute name to 'pciBus' - Change naming of virDomainDef 'iommu' attribute to 'iommus' - Move multi-iommu check to validation code - Move qemu dev props function to device-pluggable smmuv3 commit - Fix conditional statements per feedback Changes from v1: - Moved parentIdx attribute under <driver> - Revised qemuxmlconfdata test cases to attach emulated devices This series is on Github: https://github.com/NathanChenNVIDIA/libvirt/tree/nestedsmmuv3-no-accel-10-2… Thanks, Nathan [0] https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/IF6O… [1] https://lore.kernel.org/qemu-devel/20250829082543.7680-1-skolothumtho@nvidi… Signed-off-by: Nathan Chen <nathanc(a)nvidia.com> Nathan Chen (3): conf: Support multiple device-pluggable smmuv3 IOMMUs qemu: Implement pluggable-device smmuv3 tests: qemuxmlconfdata: provide device-pluggable smmuv3 sample XML and CLI args docs/formatdomain.rst | 4 + src/conf/domain_conf.c | 100 +++++++-- src/conf/domain_conf.h | 10 +- src/conf/domain_validate.c | 61 ++++-- src/conf/schemas/domaincommon.rng | 9 +- src/libvirt_private.syms | 2 + src/qemu/qemu_alias.c | 15 +- src/qemu/qemu_command.c | 197 ++++++++++++------ src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_domain_address.c | 5 +- src/qemu/qemu_driver.c | 8 +- src/qemu/qemu_postparse.c | 11 +- src/qemu/qemu_validate.c | 2 +- .../iommu-smmuv3-pci-bus.aarch64-latest.args | 41 ++++ .../iommu-smmuv3-pci-bus.aarch64-latest.xml | 62 ++++++ .../qemuxmlconfdata/iommu-smmuv3-pci-bus.xml | 49 +++++ tests/qemuxmlconftest.c | 1 + 17 files changed, 455 insertions(+), 124 deletions(-) create mode 100644 tests/qemuxmlconfdata/iommu-smmuv3-pci-bus.aarch64-latest.args create mode 100644 tests/qemuxmlconfdata/iommu-smmuv3-pci-bus.aarch64-latest.xml create mode 100644 tests/qemuxmlconfdata/iommu-smmuv3-pci-bus.xml -- 2.43.0

1 3

Plans for 11.9.0 release (freeze on 2025-10-29)
by Jiri Denemark 21 Oct '25

21 Oct '25

We are getting close to 11.9.0 release of libvirt. To aim for the release on Monday 03 Nov I suggest entering the freeze on Wednesday 29 Oct and tagging RC2 on Friday 31 Oct. I hope this works for everyone. Jirka

1 0

[RFC PATCH 00/16] qemu: Expose 'limits' and 'timed_stats' block device statistics via bulk stats API
by Peter Krempa 21 Oct '25

21 Oct '25

This series is RFC as there's pending QEMU work enabling either of the groups: For the limits the following qemu patches are needed: https://lists.nongnu.org/archive/html/qemu-block/2025-09/msg00804.html For timed stats, the statistics already exist but can't be enabled without: https://lists.nongnu.org/archive/html/qemu-block/2025-10/msg00040.html Patches 1-8 are cleanups and refactors Patches 9-10 extract and expose the block backing file limits. Patches 11-12 extract and expose the timed statistics Patch 13 is qemu capabilities update with the necessary changes and is not to be merged upstream; will be replaced by a proper update. Patches 14-16 add infrastructure to enable timed stats. Peter Krempa (16): qemu: monitor: Remove qemuMonitorQueryBlockstats qemu_monitor_json.c: Use consistent function hader coding style qemu_monitor_json.h: Use consistent function hader coding style qemu: monitor: Rework qemuBlockStats into a g_object qemuMigrationCookieAddNBD: Use qemuBlockGetNamedNodeData to fetch the capacities qemuMonitorJSONBlockStatsUpdateCapacityData: Merge into caller qemuMonitorJSONGetAllBlockStatsInfo: Directly probe data from 'query-named-block-nodes' Remove qemuMonitorBlockStatsUpdateCapacityBlockdev qemu: monitor: Extract block limit values Expose qemu storage request limits via bulk stats API qemu_monitor: Extract 'timed_stats' of block devices Expose qemu timed block statistics via bulk stats API DO_NOT_MERGE: Update qemu capabilities after adding patches for block limits and timed stats qemu: capabilities: Introduce QEMU_CAPS_DISK_TIMED_STATS conf: Add configuration option for timed disk statistics collection qemu: Add support for enabling timed block device statistics collection docs/formatdomain.rst | 17 + docs/manpages/virsh.rst | 54 + include/libvirt/libvirt-domain.h | 326 ++++ src/conf/domain_conf.c | 34 + src/conf/domain_conf.h | 2 + src/conf/schemas/domaincommon.rng | 11 + src/qemu/qemu_capabilities.c | 5 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 15 + src/qemu/qemu_driver.c | 203 ++- src/qemu/qemu_migration_cookie.c | 17 +- src/qemu/qemu_monitor.c | 58 +- src/qemu/qemu_monitor.h | 1191 ++++++++------ src/qemu/qemu_monitor_json.c | 607 +++++--- src/qemu/qemu_monitor_json.h | 6 - src/qemu/qemu_validate.c | 29 + .../caps_10.2.0_x86_64.replies | 1373 +++++++++-------- .../caps_10.2.0_x86_64.xml | 3 +- tests/qemumonitorjsontest.c | 2 + ...sk-statistics-intervals.x86_64-latest.args | 37 + ...isk-statistics-intervals.x86_64-latest.xml | 57 + .../disk-statistics-intervals.xml | 46 + tests/qemuxmlconftest.c | 1 + 23 files changed, 2686 insertions(+), 1409 deletions(-) create mode 100644 tests/qemuxmlconfdata/disk-statistics-intervals.x86_64-latest.args create mode 100644 tests/qemuxmlconfdata/disk-statistics-intervals.x86_64-latest.xml create mode 100644 tests/qemuxmlconfdata/disk-statistics-intervals.xml -- 2.51.0

2 17

[PATCH v2] qemu: Drop /dev/kvm from default device ACL
by Praveen K Paladugu 20 Oct '25

20 Oct '25

From: Praveen K Paladugu <prapal(a)linux.microsoft.com> A domain that runs with TCG emulation does not need kvm device, so drop it from default device ACL. Dynamically grant access to /dev/kvm based on domain type. Signed-off-by: Praveen K Paladugu <prapal(a)linux.microsoft.com> --- src/qemu/qemu.conf.in | 3 +-- src/qemu/qemu_cgroup.c | 9 +++++++-- src/qemu/qemu_domain.h | 1 + src/qemu/qemu_namespace.c | 9 +++++++-- src/qemu/test_libvirtd_qemu.aug.in | 3 +-- 5 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu.conf.in b/src/qemu/qemu.conf.in index fc91ba8f08..0a8abd9544 100644 --- a/src/qemu/qemu.conf.in +++ b/src/qemu/qemu.conf.in @@ -618,8 +618,7 @@ #cgroup_device_acl = [ # "/dev/null", "/dev/full", "/dev/zero", # "/dev/random", "/dev/urandom", -# "/dev/ptmx", "/dev/kvm", -# "/dev/userfaultfd" +# "/dev/ptmx", "/dev/userfaultfd" #] # # RDMA migration requires the following extra files to be added to the list: diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index f10976c2b0..100604fae5 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -41,8 +41,7 @@ VIR_LOG_INIT("qemu.qemu_cgroup"); const char *const defaultDeviceACL[] = { "/dev/null", "/dev/full", "/dev/zero", "/dev/random", "/dev/urandom", - "/dev/ptmx", "/dev/kvm", - "/dev/userfaultfd", + "/dev/ptmx", "/dev/userfaultfd", NULL, }; #define DEVICE_PTY_MAJOR 136 @@ -86,6 +85,12 @@ qemuCgroupAllowDevicesPaths(virDomainObj *vm, if (qemuCgroupAllowDevicePath(vm, deviceACL[i], perms, ignoreEacces) < 0) return -1; } + if (vm->def->virtType == VIR_DOMAIN_VIRT_KVM) { + /* KVM requires access to /dev/kvm */ + if (qemuCgroupAllowDevicePath(vm, QEMU_DEV_KVM, VIR_CGROUP_DEVICE_RW, + ignoreEacces) < 0) + return -1; + } return 0; } diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index f4945f598a..fe4ba4fa15 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -89,6 +89,7 @@ struct _qemuDomainUnpluggingDevice { #define QEMU_DEV_SGX_PROVISION "/dev/sgx_provision" #define QEMU_DEVICE_MAPPER_CONTROL_PATH "/dev/mapper/control" #define QEMU_DEV_UDMABUF "/dev/udmabuf" +#define QEMU_DEV_KVM "/dev/kvm" #define QEMU_DOMAIN_AES_IV_LEN 16 /* 16 bytes for 128 bit random */ diff --git a/src/qemu/qemu_namespace.c b/src/qemu/qemu_namespace.c index f72da83929..ca12fcf587 100644 --- a/src/qemu/qemu_namespace.c +++ b/src/qemu/qemu_namespace.c @@ -210,13 +210,18 @@ qemuDomainGetPreservedMounts(virQEMUDriverConfig *cfg, static int qemuDomainPopulateDevices(virQEMUDriverConfig *cfg, + virDomainObj *vm, GSList **paths) { const char *const *devices = (const char *const *) cfg->cgroupDeviceACL; size_t i; - if (!devices) + if (!devices) { devices = defaultDeviceACL; + if (vm->def->virtType == VIR_DOMAIN_VIRT_KVM) { + *paths = g_slist_prepend(*paths, g_strdup(QEMU_DEV_KVM)); + } + } for (i = 0; devices[i]; i++) { *paths = g_slist_prepend(*paths, g_strdup(devices[i])); @@ -694,7 +699,7 @@ qemuDomainBuildNamespace(virQEMUDriverConfig *cfg, return 0; } - if (qemuDomainPopulateDevices(cfg, &paths) < 0) + if (qemuDomainPopulateDevices(cfg, vm, &paths) < 0) return -1; if (qemuDomainSetupAllDisks(vm, &paths) < 0) diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index 90012b3f52..82cfec3b4b 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -76,8 +76,7 @@ module Test_libvirtd_qemu = { "4" = "/dev/random" } { "5" = "/dev/urandom" } { "6" = "/dev/ptmx" } - { "7" = "/dev/kvm" } - { "8" = "/dev/userfaultfd" } + { "7" = "/dev/userfaultfd" } } { "save_image_format" = "raw" } { "dump_image_format" = "raw" } -- 2.51.0

1 0

[PATCH 0/3] virNetDevVlanParse: Fix memleak and refactor
by Peter Krempa 20 Oct '25

20 Oct '25

Peter Krempa (3): virNetDevVlanParse: Don't clear data on failure virNetDevVlanParse: Use g_autofree for temporary variables virNetDevVlanParse: Refactor cleanup src/conf/netdev_vlan_conf.c | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) -- 2.51.0

2 5