mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-08-28 03:21:19 +00:00
qemu: Convert from shorthand to longer throttling names
We're about to add 6 new options and it appears (from testing) one cannot utilize both the shorthand (alias) and (much) longer names for the arguments. So modify the command builder to use the longer name and of course alter the test output .args to have the similarly innocuous long name. Also utilize a macro to build that name makes it so much more visually appealing and saves a few characters or potential cut-n-paste issues. Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
parent
c3584265ba
commit
a1417d5305
@ -1766,70 +1766,29 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk,
|
|||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (disk->blkdeviotune.total_bytes_sec) {
|
#define IOTUNE_ADD(_field, _label) \
|
||||||
virBufferAsprintf(&opt, ",bps=%llu",
|
if (disk->blkdeviotune._field) { \
|
||||||
disk->blkdeviotune.total_bytes_sec);
|
virBufferAsprintf(&opt, ",throttling." _label "=%llu", \
|
||||||
|
disk->blkdeviotune._field); \
|
||||||
}
|
}
|
||||||
|
|
||||||
if (disk->blkdeviotune.read_bytes_sec) {
|
IOTUNE_ADD(total_bytes_sec, "bps-total");
|
||||||
virBufferAsprintf(&opt, ",bps_rd=%llu",
|
IOTUNE_ADD(read_bytes_sec, "bps-read");
|
||||||
disk->blkdeviotune.read_bytes_sec);
|
IOTUNE_ADD(write_bytes_sec, "bps-write");
|
||||||
}
|
IOTUNE_ADD(total_iops_sec, "iops-total");
|
||||||
|
IOTUNE_ADD(read_iops_sec, "iops-read");
|
||||||
|
IOTUNE_ADD(write_iops_sec, "iops-write");
|
||||||
|
|
||||||
if (disk->blkdeviotune.write_bytes_sec) {
|
IOTUNE_ADD(total_bytes_sec_max, "bps-total-max");
|
||||||
virBufferAsprintf(&opt, ",bps_wr=%llu",
|
IOTUNE_ADD(read_bytes_sec_max, "bps-read-max");
|
||||||
disk->blkdeviotune.write_bytes_sec);
|
IOTUNE_ADD(write_bytes_sec_max, "bps-write-max");
|
||||||
}
|
IOTUNE_ADD(total_iops_sec_max, "iops-total-max");
|
||||||
|
IOTUNE_ADD(read_iops_sec_max, "iops-read-max");
|
||||||
|
IOTUNE_ADD(write_iops_sec_max, "iops-write-max");
|
||||||
|
|
||||||
if (disk->blkdeviotune.total_iops_sec) {
|
IOTUNE_ADD(size_iops_sec, "iops-size");
|
||||||
virBufferAsprintf(&opt, ",iops=%llu",
|
|
||||||
disk->blkdeviotune.total_iops_sec);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (disk->blkdeviotune.read_iops_sec) {
|
#undef IOTUNE_ADD
|
||||||
virBufferAsprintf(&opt, ",iops_rd=%llu",
|
|
||||||
disk->blkdeviotune.read_iops_sec);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (disk->blkdeviotune.write_iops_sec) {
|
|
||||||
virBufferAsprintf(&opt, ",iops_wr=%llu",
|
|
||||||
disk->blkdeviotune.write_iops_sec);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (disk->blkdeviotune.total_bytes_sec_max) {
|
|
||||||
virBufferAsprintf(&opt, ",bps_max=%llu",
|
|
||||||
disk->blkdeviotune.total_bytes_sec_max);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (disk->blkdeviotune.read_bytes_sec_max) {
|
|
||||||
virBufferAsprintf(&opt, ",bps_rd_max=%llu",
|
|
||||||
disk->blkdeviotune.read_bytes_sec_max);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (disk->blkdeviotune.write_bytes_sec_max) {
|
|
||||||
virBufferAsprintf(&opt, ",bps_wr_max=%llu",
|
|
||||||
disk->blkdeviotune.write_bytes_sec_max);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (disk->blkdeviotune.total_iops_sec_max) {
|
|
||||||
virBufferAsprintf(&opt, ",iops_max=%llu",
|
|
||||||
disk->blkdeviotune.total_iops_sec_max);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (disk->blkdeviotune.read_iops_sec_max) {
|
|
||||||
virBufferAsprintf(&opt, ",iops_rd_max=%llu",
|
|
||||||
disk->blkdeviotune.read_iops_sec_max);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (disk->blkdeviotune.write_iops_sec_max) {
|
|
||||||
virBufferAsprintf(&opt, ",iops_wr_max=%llu",
|
|
||||||
disk->blkdeviotune.write_iops_sec_max);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (disk->blkdeviotune.size_iops_sec) {
|
|
||||||
virBufferAsprintf(&opt, ",iops_size=%llu",
|
|
||||||
disk->blkdeviotune.size_iops_sec);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (virBufferCheckError(&opt) < 0)
|
if (virBufferCheckError(&opt) < 0)
|
||||||
goto error;
|
goto error;
|
||||||
|
@ -18,10 +18,14 @@ QEMU_AUDIO_DRV=none \
|
|||||||
-boot c \
|
-boot c \
|
||||||
-usb \
|
-usb \
|
||||||
-drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,\
|
-drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,\
|
||||||
cache=none,bps=5000,iops=6000,bps_max=10000,iops_max=11000 \
|
cache=none,throttling.bps-total=5000,throttling.iops-total=6000,\
|
||||||
|
throttling.bps-total-max=10000,throttling.iops-total-max=11000 \
|
||||||
-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
|
-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
|
||||||
-drive file=/dev/HostVG/QEMUGuest2,format=qcow2,if=none,id=drive-ide0-0-1,\
|
-drive file=/dev/HostVG/QEMUGuest2,format=qcow2,if=none,id=drive-ide0-0-1,\
|
||||||
cache=none,bps_rd=5000,bps_wr=5500,iops_rd=3500,iops_wr=4000,bps_rd_max=6000,\
|
cache=none,throttling.bps-read=5000,throttling.bps-write=5500,\
|
||||||
bps_wr_max=6500,iops_rd_max=7000,iops_wr_max=7500,iops_size=2000 \
|
throttling.iops-read=3500,throttling.iops-write=4000,\
|
||||||
|
throttling.bps-read-max=6000,throttling.bps-write-max=6500,\
|
||||||
|
throttling.iops-read-max=7000,throttling.iops-write-max=7500,\
|
||||||
|
throttling.iops-size=2000 \
|
||||||
-device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
|
-device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
|
||||||
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
|
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
|
||||||
|
@ -18,9 +18,10 @@ QEMU_AUDIO_DRV=none \
|
|||||||
-boot c \
|
-boot c \
|
||||||
-usb \
|
-usb \
|
||||||
-drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,\
|
-drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,\
|
||||||
cache=none,bps=5000,iops=6000 \
|
cache=none,throttling.bps-total=5000,throttling.iops-total=6000 \
|
||||||
-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
|
-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
|
||||||
-drive file=/dev/HostVG/QEMUGuest2,format=qcow2,if=none,id=drive-ide0-0-1,\
|
-drive file=/dev/HostVG/QEMUGuest2,format=qcow2,if=none,id=drive-ide0-0-1,\
|
||||||
cache=none,bps_rd=5000,bps_wr=5000,iops=7000 \
|
cache=none,throttling.bps-read=5000,throttling.bps-write=5000,\
|
||||||
|
throttling.iops-total=7000 \
|
||||||
-device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
|
-device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
|
||||||
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
|
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
|
||||||
|
Loading…
Reference in New Issue
Block a user