NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2026-08-04 10:23:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Add support for enabling timed block device statistics collection

Browse Source 
Add validation that qemu supports the collection of statistics and
enable it on the block device commandline.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Peter Krempa
2025-11-05 14:27:57 +01:00
parent 19fc614d53
commit 7ee9dbacbe
6 changed files with 185 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/qemu/qemu_command.c
+15
View File
@@ -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;
src/qemu/qemu_validate.c
+29
View File
@@ -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;
}
tests/qemuxmlconfdata/disk-statistics-intervals.x86_64-latest.args
+37
View File
@@ -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
tests/qemuxmlconfdata/disk-statistics-intervals.x86_64-latest.xml
+57
View File
@@ -0,0 +1,57 @@
<domain type='qemu'>
<name>QEMUGuest1</name>
<uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
<memory unit='KiB'>219136</memory>
<currentMemory unit='KiB'>219136</currentMemory>
<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>
</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>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'>
<statistics>
<statistic interval='3'/>
<statistic interval='10'/>
</statistics>
</driver>
<source file='/var/lib/libvirt/images/iothrtest1.img'/>
<target dev='vda' bus='virtio'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'>
<statistics>
<statistic interval='5'/>
<statistic interval='15'/>
</statistics>
</driver>
<source file='/var/lib/libvirt/images/iothrtest2.img'/>
<target dev='sdc' bus='scsi'/>
<address type='drive' controller='0' bus='0' target='0' unit='3'/>
</disk>
<controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
<controller type='scsi' index='0' model='virtio-scsi'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
</controller>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='none'/>
</devices>
</domain>
tests/qemuxmlconfdata/disk-statistics-intervals.xml
+46
View File
@@ -0,0 +1,46 @@
<domain type='qemu'>
<name>QEMUGuest1</name>
<uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
<memory unit='KiB'>219136</memory>
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>2</vcpu>
<os>
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<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>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'>
<statistics>
<statistic interval='3'/>
<statistic interval='10'/>
</statistics>
</driver>
<source file='/var/lib/libvirt/images/iothrtest1.img'/>
<target dev='vda' bus='virtio'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'>
<statistics>
<statistic interval='5'/>
<statistic interval='15'/>
</statistics>
</driver>
<source file='/var/lib/libvirt/images/iothrtest2.img'/>
<target dev='sdc' bus='scsi'/>
<address type='drive' controller='0' bus='0' target='0' unit='3'/>
</disk>
<controller type='usb' index='0'/>
<controller type='ide' index='0'/>
<controller type='pci' index='0' model='pci-root'/>
<controller type='scsi' index='0' model='virtio-scsi'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<memballoon model='none'/>
</devices>
</domain>
tests/qemuxmlconftest.c
+1
View File
@@ -1829,6 +1829,7 @@ mymain(void)
DO_TEST_CAPS_LATEST("disk-slices");
DO_TEST_CAPS_LATEST("disk-rotation");
DO_TEST_CAPS_LATEST("disk-statistics-intervals");
DO_TEST_CAPS_ARCH_LATEST("disk-arm-virtio-sd", "aarch64");