From 7ee9dbacbe08dd3dea496f1f44d240f6b87bff47 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Tue, 7 Oct 2025 17:43:41 +0200 Subject: [PATCH] qemu: Add support for enabling timed block device statistics collection Add validation that qemu supports the collection of statistics and enable it on the block device commandline. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- src/qemu/qemu_command.c | 15 +++++ src/qemu/qemu_validate.c | 29 ++++++++++ ...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 + 6 files changed, 185 insertions(+) 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 diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c538a9fb2f..c56c321a6e 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1690,6 +1690,7 @@ qemuBuildDiskDeviceProps(const virDomainDef *def, const char *alias = disk->info.alias; g_autofree char *usbdiskalias = NULL; const virDomainDeviceInfo *deviceinfo = &disk->info; + g_autoptr(virJSONValue) statistics = NULL; virDomainDeviceInfo usbSCSIinfo = { .type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE, .addr.drive = { .diskbus = VIR_DOMAIN_DISK_BUS_USB }, @@ -1897,6 +1898,19 @@ qemuBuildDiskDeviceProps(const virDomainDef *def, qemuBuildDiskGetErrorPolicy(disk, &wpolicy, &rpolicy); + if (disk->statistics) { + size_t i; + + statistics = virJSONValueNewArray(); + + for (i = 0; disk->statistics[i] > 0; i++) { + g_autoptr(virJSONValue) num = virJSONValueNewNumberUint(disk->statistics[i]); + + if (virJSONValueArrayAppend(statistics, &num) < 0) + return NULL; + } + } + if (virJSONValueObjectAdd(&props, "S:device_id", scsiVPDDeviceId, "T:share-rw", shareRW, @@ -1921,6 +1935,7 @@ qemuBuildDiskDeviceProps(const virDomainDef *def, "S:serial", serial, "S:werror", wpolicy, "S:rerror", rpolicy, + "A:stats-intervals", &statistics, NULL) < 0) return NULL; diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 3b0f2b50a5..747e54bf44 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -3414,6 +3414,35 @@ qemuValidateDomainDeviceDefDiskFrontend(const virDomainDiskDef *disk, if (qemuValidateDomainDeviceDefDiskIOThreads(def, disk, qemuCaps) < 0) return -1; + if (disk->statistics) { + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DISK_TIMED_STATS)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("statistics collection is not supported by this QEMU binary")); + return -1; + } + + switch (disk->bus) { + case VIR_DOMAIN_DISK_BUS_SCSI: + case VIR_DOMAIN_DISK_BUS_IDE: + case VIR_DOMAIN_DISK_BUS_SATA: + case VIR_DOMAIN_DISK_BUS_VIRTIO: + case VIR_DOMAIN_DISK_BUS_USB: + break; + + case VIR_DOMAIN_DISK_BUS_FDC: + case VIR_DOMAIN_DISK_BUS_NVME: + case VIR_DOMAIN_DISK_BUS_XEN: + case VIR_DOMAIN_DISK_BUS_SD: + case VIR_DOMAIN_DISK_BUS_NONE: + case VIR_DOMAIN_DISK_BUS_UML: + case VIR_DOMAIN_DISK_BUS_LAST: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("statistics collection is not supported by disks on bus '%1$s'"), + NULLSTR(virDomainDiskBusTypeToString(disk->bus))); + return -1; + } + } + return 0; } diff --git a/tests/qemuxmlconfdata/disk-statistics-intervals.x86_64-latest.args b/tests/qemuxmlconfdata/disk-statistics-intervals.x86_64-latest.args new file mode 100644 index 0000000000..3dd3dee99d --- /dev/null +++ b/tests/qemuxmlconfdata/disk-statistics-intervals.x86_64-latest.args @@ -0,0 +1,37 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ +-accel tcg \ +-cpu qemu64 \ +-m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ +-overcommit mem-lock=off \ +-smp 2,sockets=2,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-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 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.0","addr":"0x2"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/iothrtest1.img","node-name":"libvirt-2-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"libvirt-2-storage","id":"virtio-disk0","bootindex":1,"stats-intervals":[3,10]}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/iothrtest2.img","node-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"scsi-hd","bus":"scsi0.0","channel":0,"scsi-id":0,"lun":3,"device_id":"drive-scsi0-0-0-3","drive":"libvirt-1-storage","id":"scsi0-0-0-3","stats-intervals":[5,15]}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxmlconfdata/disk-statistics-intervals.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-statistics-intervals.x86_64-latest.xml new file mode 100644 index 0000000000..4c55c50ef5 --- /dev/null +++ b/tests/qemuxmlconfdata/disk-statistics-intervals.x86_64-latest.xml @@ -0,0 +1,57 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219136 + 219136 + 2 + + hvm + + + + qemu64 + + + destroy + restart + destroy + + /usr/bin/qemu-system-x86_64 + + + + + + + + + +
+ + + + + + + + + + +
+ + +
+ + +
+ + + +
+ + + +