|
 |
9119d9 |
From 3d12791c7e8306aa0e58c34906b619856a9dd856 Mon Sep 17 00:00:00 2001
|
|
|
9119d9 |
Message-Id: <3d12791c7e8306aa0e58c34906b619856a9dd856@dist-git>
|
|
|
9119d9 |
From: "Daniel P. Berrange" <berrange@redhat.com>
|
|
|
9119d9 |
Date: Fri, 26 Sep 2014 12:44:02 +0200
|
|
|
9119d9 |
Subject: [PATCH] Rename tunable event constants
|
|
|
9119d9 |
|
|
|
9119d9 |
For the new VIR_DOMAIN_EVENT_ID_TUNABLE event we have a bunch of
|
|
|
9119d9 |
constants added
|
|
|
9119d9 |
|
|
|
9119d9 |
VIR_DOMAIN_EVENT_CPUTUNE_<blah>
|
|
|
9119d9 |
VIR_DOMAIN_EVENT_BLKDEVIOTUNE_<blah>
|
|
|
9119d9 |
|
|
|
9119d9 |
This naming convention is bad for two reasons
|
|
|
9119d9 |
|
|
|
9119d9 |
- There is no common prefix unique for the events to both
|
|
|
9119d9 |
relate them, and distinguish them from other event
|
|
|
9119d9 |
constants
|
|
|
9119d9 |
|
|
|
9119d9 |
- The values associated with the constants were chosen
|
|
|
9119d9 |
to match the names used with virConnectGetAllDomainStats
|
|
|
9119d9 |
so having EVENT in the constant name is not applicable in
|
|
|
9119d9 |
that respect
|
|
|
9119d9 |
|
|
|
9119d9 |
This patch proposes renaming the constants to
|
|
|
9119d9 |
|
|
|
9119d9 |
VIR_DOMAIN_TUNABLE_CPU_<blah>
|
|
|
9119d9 |
VIR_DOMAIN_TUNABLE_BLKDEV_<blah>
|
|
|
9119d9 |
|
|
|
9119d9 |
ie, given them a common VIR_DOMAIN_TUNABLE prefix.
|
|
|
9119d9 |
|
|
|
9119d9 |
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
|
|
|
9119d9 |
(cherry picked from commit 0778c0be8deec25c8f040d4bdeddee50cbb26234)
|
|
|
9119d9 |
|
|
|
9119d9 |
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1115898
|
|
|
9119d9 |
|
|
|
9119d9 |
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
|
|
9119d9 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
9119d9 |
---
|
|
|
9119d9 |
include/libvirt/libvirt.h.in | 56 ++++++++++++++++++++++----------------------
|
|
|
9119d9 |
src/qemu/qemu_cgroup.c | 2 +-
|
|
|
9119d9 |
src/qemu/qemu_driver.c | 28 +++++++++++-----------
|
|
|
9119d9 |
3 files changed, 43 insertions(+), 43 deletions(-)
|
|
|
9119d9 |
|
|
|
9119d9 |
diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in
|
|
|
9119d9 |
index 026df48..9dbb222 100644
|
|
|
9119d9 |
--- a/include/libvirt/libvirt.h.in
|
|
|
9119d9 |
+++ b/include/libvirt/libvirt.h.in
|
|
|
9119d9 |
@@ -5168,119 +5168,119 @@ typedef void (*virConnectDomainEventDeviceRemovedCallback)(virConnectPtr conn,
|
|
|
9119d9 |
void *opaque);
|
|
|
9119d9 |
|
|
|
9119d9 |
/**
|
|
|
9119d9 |
- * VIR_DOMAIN_EVENT_CPUTUNE_VCPUPIN:
|
|
|
9119d9 |
+ * VIR_DOMAIN_TUNABLE_CPU_VCPUPIN:
|
|
|
9119d9 |
*
|
|
|
9119d9 |
* Macro represents formatted pinning for one vcpu specified by id which is
|
|
|
9119d9 |
* appended to the parameter name, for example "cputune.vcpupin1",
|
|
|
9119d9 |
* as VIR_TYPED_PARAM_STRING.
|
|
|
9119d9 |
*/
|
|
|
9119d9 |
-#define VIR_DOMAIN_EVENT_CPUTUNE_VCPUPIN "cputune.vcpupin%u"
|
|
|
9119d9 |
+#define VIR_DOMAIN_TUNABLE_CPU_VCPUPIN "cputune.vcpupin%u"
|
|
|
9119d9 |
|
|
|
9119d9 |
/**
|
|
|
9119d9 |
- * VIR_DOMAIN_EVENT_CPUTUNE_EMULATORIN:
|
|
|
9119d9 |
+ * VIR_DOMAIN_TUNABLE_CPU_EMULATORIN:
|
|
|
9119d9 |
*
|
|
|
9119d9 |
* Macro represents formatted pinning for emulator process,
|
|
|
9119d9 |
* as VIR_TYPED_PARAM_STRING.
|
|
|
9119d9 |
*/
|
|
|
9119d9 |
-#define VIR_DOMAIN_EVENT_CPUTUNE_EMULATORIN "cputune.emulatorpin"
|
|
|
9119d9 |
+#define VIR_DOMAIN_TUNABLE_CPU_EMULATORIN "cputune.emulatorpin"
|
|
|
9119d9 |
|
|
|
9119d9 |
/**
|
|
|
9119d9 |
- * VIR_DOMAIN_EVENT_CPUTUNE_CPU_SHARES:
|
|
|
9119d9 |
+ * VIR_DOMAIN_TUNABLE_CPU_CPU_SHARES:
|
|
|
9119d9 |
*
|
|
|
9119d9 |
* Macro represents proportional weight of the scheduler used on the
|
|
|
9119d9 |
* host cpu, when using the posix scheduler, as VIR_TYPED_PARAM_ULLONG.
|
|
|
9119d9 |
*/
|
|
|
9119d9 |
-#define VIR_DOMAIN_EVENT_CPUTUNE_CPU_SHARES "cputune.cpu_shares"
|
|
|
9119d9 |
+#define VIR_DOMAIN_TUNABLE_CPU_CPU_SHARES "cputune.cpu_shares"
|
|
|
9119d9 |
|
|
|
9119d9 |
/**
|
|
|
9119d9 |
- * VIR_DOMAIN_EVENT_CPUTUNE_VCPU_PERIOD:
|
|
|
9119d9 |
+ * VIR_DOMAIN_TUNABLE_CPU_VCPU_PERIOD:
|
|
|
9119d9 |
*
|
|
|
9119d9 |
* Macro represents the enforcement period for a quota, in microseconds,
|
|
|
9119d9 |
* for vcpus only, when using the posix scheduler, as VIR_TYPED_PARAM_ULLONG.
|
|
|
9119d9 |
*/
|
|
|
9119d9 |
-#define VIR_DOMAIN_EVENT_CPUTUNE_VCPU_PERIOD "cputune.vcpu_period"
|
|
|
9119d9 |
+#define VIR_DOMAIN_TUNABLE_CPU_VCPU_PERIOD "cputune.vcpu_period"
|
|
|
9119d9 |
|
|
|
9119d9 |
/**
|
|
|
9119d9 |
- * VIR_DOMAIN_EVENT_CPUTUNE_VCPU_QUOTA:
|
|
|
9119d9 |
+ * VIR_DOMAIN_TUNABLE_CPU_VCPU_QUOTA:
|
|
|
9119d9 |
*
|
|
|
9119d9 |
* Macro represents the maximum bandwidth to be used within a period for
|
|
|
9119d9 |
* vcpus only, when using the posix scheduler, as VIR_TYPED_PARAM_LLONG.
|
|
|
9119d9 |
*/
|
|
|
9119d9 |
-#define VIR_DOMAIN_EVENT_CPUTUNE_VCPU_QUOTA "cputune.vcpu_quota"
|
|
|
9119d9 |
+#define VIR_DOMAIN_TUNABLE_CPU_VCPU_QUOTA "cputune.vcpu_quota"
|
|
|
9119d9 |
|
|
|
9119d9 |
/**
|
|
|
9119d9 |
- * VIR_DOMAIN_EVENT_CPUTUNE_EMULATOR_PERIOD:
|
|
|
9119d9 |
+ * VIR_DOMAIN_TUNABLE_CPU_EMULATOR_PERIOD:
|
|
|
9119d9 |
*
|
|
|
9119d9 |
* Macro represents the enforcement period for a quota in microseconds,
|
|
|
9119d9 |
* when using the posix scheduler, for all emulator activity not tied to
|
|
|
9119d9 |
* vcpus, as VIR_TYPED_PARAM_ULLONG.
|
|
|
9119d9 |
*/
|
|
|
9119d9 |
-#define VIR_DOMAIN_EVENT_CPUTUNE_EMULATOR_PERIOD "cputune.emulator_period"
|
|
|
9119d9 |
+#define VIR_DOMAIN_TUNABLE_CPU_EMULATOR_PERIOD "cputune.emulator_period"
|
|
|
9119d9 |
|
|
|
9119d9 |
/**
|
|
|
9119d9 |
- * VIR_DOMAIN_EVENT_CPUTUNE_EMULATOR_QUOTA:
|
|
|
9119d9 |
+ * VIR_DOMAIN_TUNABLE_CPU_EMULATOR_QUOTA:
|
|
|
9119d9 |
*
|
|
|
9119d9 |
* Macro represents the maximum bandwidth to be used within a period for
|
|
|
9119d9 |
* all emulator activity not tied to vcpus, when using the posix scheduler,
|
|
|
9119d9 |
* as an VIR_TYPED_PARAM_LLONG.
|
|
|
9119d9 |
*/
|
|
|
9119d9 |
-#define VIR_DOMAIN_EVENT_CPUTUNE_EMULATOR_QUOTA "cputune.emulator_quota"
|
|
|
9119d9 |
+#define VIR_DOMAIN_TUNABLE_CPU_EMULATOR_QUOTA "cputune.emulator_quota"
|
|
|
9119d9 |
|
|
|
9119d9 |
/**
|
|
|
9119d9 |
- * VIR_DOMAIN_EVENT_BLKDEVIOTUNE_DISK:
|
|
|
9119d9 |
+ * VIR_DOMAIN_TUNABLE_BLKDEV_DISK:
|
|
|
9119d9 |
*
|
|
|
9119d9 |
* Macro represents the name of guest disk for which the values are updated,
|
|
|
9119d9 |
* as VIR_TYPED_PARAM_STRING.
|
|
|
9119d9 |
*/
|
|
|
9119d9 |
-#define VIR_DOMAIN_EVENT_BLKDEVIOTUNE_DISK "blkdeviotune.disk"
|
|
|
9119d9 |
+#define VIR_DOMAIN_TUNABLE_BLKDEV_DISK "blkdeviotune.disk"
|
|
|
9119d9 |
|
|
|
9119d9 |
/**
|
|
|
9119d9 |
- * VIR_DOMAIN_EVENT_BLKDEVIOTUNE_TOTAL_BYTES_SEC:
|
|
|
9119d9 |
+ * VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_BYTES_SEC:
|
|
|
9119d9 |
*
|
|
|
9119d9 |
* Marco represents the total throughput limit in bytes per second,
|
|
|
9119d9 |
* as VIR_TYPED_PARAM_ULLONG.
|
|
|
9119d9 |
*/
|
|
|
9119d9 |
-#define VIR_DOMAIN_EVENT_BLKDEVIOTUNE_TOTAL_BYTES_SEC "blkdeviotune.total_bytes_sec"
|
|
|
9119d9 |
+#define VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_BYTES_SEC "blkdeviotune.total_bytes_sec"
|
|
|
9119d9 |
|
|
|
9119d9 |
/**
|
|
|
9119d9 |
- * VIR_DOMAIN_EVENT_BLKDEVIOTUNE_READ_BYTES_SEC:
|
|
|
9119d9 |
+ * VIR_DOMAIN_TUNABLE_BLKDEV_READ_BYTES_SEC:
|
|
|
9119d9 |
*
|
|
|
9119d9 |
* Marco represents the read throughput limit in bytes per second,
|
|
|
9119d9 |
* as VIR_TYPED_PARAM_ULLONG.
|
|
|
9119d9 |
*/
|
|
|
9119d9 |
-#define VIR_DOMAIN_EVENT_BLKDEVIOTUNE_READ_BYTES_SEC "blkdeviotune.read_bytes_sec"
|
|
|
9119d9 |
+#define VIR_DOMAIN_TUNABLE_BLKDEV_READ_BYTES_SEC "blkdeviotune.read_bytes_sec"
|
|
|
9119d9 |
|
|
|
9119d9 |
/**
|
|
|
9119d9 |
- * VIR_DOMAIN_EVENT_BLKDEVIOTUNE_WRITE_BYTES_SEC:
|
|
|
9119d9 |
+ * VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_BYTES_SEC:
|
|
|
9119d9 |
*
|
|
|
9119d9 |
* Macro represents the write throughput limit in bytes per second,
|
|
|
9119d9 |
* as VIR_TYPED_PARAM_ULLONG.
|
|
|
9119d9 |
*/
|
|
|
9119d9 |
-#define VIR_DOMAIN_EVENT_BLKDEVIOTUNE_WRITE_BYTES_SEC "blkdeviotune.write_bytes_sec"
|
|
|
9119d9 |
+#define VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_BYTES_SEC "blkdeviotune.write_bytes_sec"
|
|
|
9119d9 |
|
|
|
9119d9 |
/**
|
|
|
9119d9 |
- * VIR_DOMAIN_EVENT_BLKDEVIOTUNE_TOTAL_IOPS_SEC:
|
|
|
9119d9 |
+ * VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_IOPS_SEC:
|
|
|
9119d9 |
*
|
|
|
9119d9 |
* Macro represents the total I/O operations per second,
|
|
|
9119d9 |
* as VIR_TYPED_PARAM_ULLONG.
|
|
|
9119d9 |
*/
|
|
|
9119d9 |
-#define VIR_DOMAIN_EVENT_BLKDEVIOTUNE_TOTAL_IOPS_SEC "blkdeviotune.total_iops_sec"
|
|
|
9119d9 |
+#define VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_IOPS_SEC "blkdeviotune.total_iops_sec"
|
|
|
9119d9 |
|
|
|
9119d9 |
/**
|
|
|
9119d9 |
- * VIR_DOMAIN_EVENT_BLKDEVIOTUNE_READ_IOPS_SEC:
|
|
|
9119d9 |
+ * VIR_DOMAIN_TUNABLE_BLKDEV_READ_IOPS_SEC:
|
|
|
9119d9 |
*
|
|
|
9119d9 |
* Macro represents the read I/O operations per second,
|
|
|
9119d9 |
* as VIR_TYPED_PARAM_ULLONG.
|
|
|
9119d9 |
*/
|
|
|
9119d9 |
-#define VIR_DOMAIN_EVENT_BLKDEVIOTUNE_READ_IOPS_SEC "blkdeviotune.read_iops_sec"
|
|
|
9119d9 |
+#define VIR_DOMAIN_TUNABLE_BLKDEV_READ_IOPS_SEC "blkdeviotune.read_iops_sec"
|
|
|
9119d9 |
|
|
|
9119d9 |
/**
|
|
|
9119d9 |
- * VIR_DOMAIN_EVENT_BLKDEVIOTUNE_WRITE_IOPS_SEC:
|
|
|
9119d9 |
+ * VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_IOPS_SEC:
|
|
|
9119d9 |
*
|
|
|
9119d9 |
* Macro represents the write I/O operations per second,
|
|
|
9119d9 |
* as VIR_TYPED_PARAM_ULLONG.
|
|
|
9119d9 |
*/
|
|
|
9119d9 |
-#define VIR_DOMAIN_EVENT_BLKDEVIOTUNE_WRITE_IOPS_SEC "blkdeviotune.write_iops_sec"
|
|
|
9119d9 |
+#define VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_IOPS_SEC "blkdeviotune.write_iops_sec"
|
|
|
9119d9 |
|
|
|
9119d9 |
/**
|
|
|
9119d9 |
* virConnectDomainEventTunableCallback:
|
|
|
9119d9 |
diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
|
|
|
9119d9 |
index 300946a..8819943 100644
|
|
|
9119d9 |
--- a/src/qemu/qemu_cgroup.c
|
|
|
9119d9 |
+++ b/src/qemu/qemu_cgroup.c
|
|
|
9119d9 |
@@ -703,7 +703,7 @@ qemuSetupCpuCgroup(virDomainObjPtr vm)
|
|
|
9119d9 |
vm->def->cputune.shares = val;
|
|
|
9119d9 |
if (virTypedParamsAddULLong(&eventParams, &eventNparams,
|
|
|
9119d9 |
&eventMaxparams,
|
|
|
9119d9 |
- VIR_DOMAIN_EVENT_CPUTUNE_CPU_SHARES,
|
|
|
9119d9 |
+ VIR_DOMAIN_TUNABLE_CPU_CPU_SHARES,
|
|
|
9119d9 |
val) < 0)
|
|
|
9119d9 |
return -1;
|
|
|
9119d9 |
|
|
|
9119d9 |
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
|
|
|
9119d9 |
index 843101c..1b14a12 100644
|
|
|
9119d9 |
--- a/src/qemu/qemu_driver.c
|
|
|
9119d9 |
+++ b/src/qemu/qemu_driver.c
|
|
|
9119d9 |
@@ -4589,7 +4589,7 @@ qemuDomainPinVcpuFlags(virDomainPtr dom,
|
|
|
9119d9 |
goto cleanup;
|
|
|
9119d9 |
|
|
|
9119d9 |
if (snprintf(paramField, VIR_TYPED_PARAM_FIELD_LENGTH,
|
|
|
9119d9 |
- VIR_DOMAIN_EVENT_CPUTUNE_VCPUPIN, vcpu) < 0) {
|
|
|
9119d9 |
+ VIR_DOMAIN_TUNABLE_CPU_VCPUPIN, vcpu) < 0) {
|
|
|
9119d9 |
goto cleanup;
|
|
|
9119d9 |
}
|
|
|
9119d9 |
|
|
|
9119d9 |
@@ -4876,7 +4876,7 @@ qemuDomainPinEmulator(virDomainPtr dom,
|
|
|
9119d9 |
str = virBitmapFormat(pcpumap);
|
|
|
9119d9 |
if (virTypedParamsAddString(&eventParams, &eventNparams,
|
|
|
9119d9 |
&eventMaxparams,
|
|
|
9119d9 |
- VIR_DOMAIN_EVENT_CPUTUNE_EMULATORIN,
|
|
|
9119d9 |
+ VIR_DOMAIN_TUNABLE_CPU_EMULATORIN,
|
|
|
9119d9 |
str) < 0)
|
|
|
9119d9 |
goto cleanup;
|
|
|
9119d9 |
|
|
|
9119d9 |
@@ -9317,7 +9317,7 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr dom,
|
|
|
9119d9 |
|
|
|
9119d9 |
if (virTypedParamsAddULLong(&eventParams, &eventNparams,
|
|
|
9119d9 |
&eventMaxNparams,
|
|
|
9119d9 |
- VIR_DOMAIN_EVENT_CPUTUNE_CPU_SHARES,
|
|
|
9119d9 |
+ VIR_DOMAIN_TUNABLE_CPU_CPU_SHARES,
|
|
|
9119d9 |
val) < 0)
|
|
|
9119d9 |
goto cleanup;
|
|
|
9119d9 |
}
|
|
|
9119d9 |
@@ -9340,7 +9340,7 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr dom,
|
|
|
9119d9 |
|
|
|
9119d9 |
if (virTypedParamsAddULLong(&eventParams, &eventNparams,
|
|
|
9119d9 |
&eventMaxNparams,
|
|
|
9119d9 |
- VIR_DOMAIN_EVENT_CPUTUNE_VCPU_PERIOD,
|
|
|
9119d9 |
+ VIR_DOMAIN_TUNABLE_CPU_VCPU_PERIOD,
|
|
|
9119d9 |
value_ul) < 0)
|
|
|
9119d9 |
goto cleanup;
|
|
|
9119d9 |
}
|
|
|
9119d9 |
@@ -9360,7 +9360,7 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr dom,
|
|
|
9119d9 |
|
|
|
9119d9 |
if (virTypedParamsAddLLong(&eventParams, &eventNparams,
|
|
|
9119d9 |
&eventMaxNparams,
|
|
|
9119d9 |
- VIR_DOMAIN_EVENT_CPUTUNE_VCPU_QUOTA,
|
|
|
9119d9 |
+ VIR_DOMAIN_TUNABLE_CPU_VCPU_QUOTA,
|
|
|
9119d9 |
value_l) < 0)
|
|
|
9119d9 |
goto cleanup;
|
|
|
9119d9 |
}
|
|
|
9119d9 |
@@ -9381,7 +9381,7 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr dom,
|
|
|
9119d9 |
|
|
|
9119d9 |
if (virTypedParamsAddULLong(&eventParams, &eventNparams,
|
|
|
9119d9 |
&eventMaxNparams,
|
|
|
9119d9 |
- VIR_DOMAIN_EVENT_CPUTUNE_EMULATOR_PERIOD,
|
|
|
9119d9 |
+ VIR_DOMAIN_TUNABLE_CPU_EMULATOR_PERIOD,
|
|
|
9119d9 |
value_ul) < 0)
|
|
|
9119d9 |
goto cleanup;
|
|
|
9119d9 |
}
|
|
|
9119d9 |
@@ -9402,7 +9402,7 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr dom,
|
|
|
9119d9 |
|
|
|
9119d9 |
if (virTypedParamsAddLLong(&eventParams, &eventNparams,
|
|
|
9119d9 |
&eventMaxNparams,
|
|
|
9119d9 |
- VIR_DOMAIN_EVENT_CPUTUNE_EMULATOR_QUOTA,
|
|
|
9119d9 |
+ VIR_DOMAIN_TUNABLE_CPU_EMULATOR_QUOTA,
|
|
|
9119d9 |
value_l) < 0)
|
|
|
9119d9 |
goto cleanup;
|
|
|
9119d9 |
}
|
|
|
9119d9 |
@@ -16105,7 +16105,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom,
|
|
|
9119d9 |
goto endjob;
|
|
|
9119d9 |
|
|
|
9119d9 |
if (virTypedParamsAddString(&eventParams, &eventNparams, &eventMaxparams,
|
|
|
9119d9 |
- VIR_DOMAIN_EVENT_BLKDEVIOTUNE_DISK, disk) < 0)
|
|
|
9119d9 |
+ VIR_DOMAIN_TUNABLE_BLKDEV_DISK, disk) < 0)
|
|
|
9119d9 |
goto endjob;
|
|
|
9119d9 |
|
|
|
9119d9 |
for (i = 0; i < nparams; i++) {
|
|
|
9119d9 |
@@ -16123,7 +16123,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom,
|
|
|
9119d9 |
set_bytes = true;
|
|
|
9119d9 |
if (virTypedParamsAddULLong(&eventParams, &eventNparams,
|
|
|
9119d9 |
&eventMaxparams,
|
|
|
9119d9 |
- VIR_DOMAIN_EVENT_BLKDEVIOTUNE_TOTAL_BYTES_SEC,
|
|
|
9119d9 |
+ VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_BYTES_SEC,
|
|
|
9119d9 |
param->value.ul) < 0)
|
|
|
9119d9 |
goto endjob;
|
|
|
9119d9 |
} else if (STREQ(param->field,
|
|
|
9119d9 |
@@ -16132,7 +16132,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom,
|
|
|
9119d9 |
set_bytes = true;
|
|
|
9119d9 |
if (virTypedParamsAddULLong(&eventParams, &eventNparams,
|
|
|
9119d9 |
&eventMaxparams,
|
|
|
9119d9 |
- VIR_DOMAIN_EVENT_BLKDEVIOTUNE_READ_BYTES_SEC,
|
|
|
9119d9 |
+ VIR_DOMAIN_TUNABLE_BLKDEV_READ_BYTES_SEC,
|
|
|
9119d9 |
param->value.ul) < 0)
|
|
|
9119d9 |
goto endjob;
|
|
|
9119d9 |
} else if (STREQ(param->field,
|
|
|
9119d9 |
@@ -16141,7 +16141,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom,
|
|
|
9119d9 |
set_bytes = true;
|
|
|
9119d9 |
if (virTypedParamsAddULLong(&eventParams, &eventNparams,
|
|
|
9119d9 |
&eventMaxparams,
|
|
|
9119d9 |
- VIR_DOMAIN_EVENT_BLKDEVIOTUNE_WRITE_BYTES_SEC,
|
|
|
9119d9 |
+ VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_BYTES_SEC,
|
|
|
9119d9 |
param->value.ul) < 0)
|
|
|
9119d9 |
goto endjob;
|
|
|
9119d9 |
} else if (STREQ(param->field,
|
|
|
9119d9 |
@@ -16150,7 +16150,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom,
|
|
|
9119d9 |
set_iops = true;
|
|
|
9119d9 |
if (virTypedParamsAddULLong(&eventParams, &eventNparams,
|
|
|
9119d9 |
&eventMaxparams,
|
|
|
9119d9 |
- VIR_DOMAIN_EVENT_BLKDEVIOTUNE_TOTAL_IOPS_SEC,
|
|
|
9119d9 |
+ VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_IOPS_SEC,
|
|
|
9119d9 |
param->value.ul) < 0)
|
|
|
9119d9 |
goto endjob;
|
|
|
9119d9 |
} else if (STREQ(param->field,
|
|
|
9119d9 |
@@ -16159,7 +16159,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom,
|
|
|
9119d9 |
set_iops = true;
|
|
|
9119d9 |
if (virTypedParamsAddULLong(&eventParams, &eventNparams,
|
|
|
9119d9 |
&eventMaxparams,
|
|
|
9119d9 |
- VIR_DOMAIN_EVENT_BLKDEVIOTUNE_READ_IOPS_SEC,
|
|
|
9119d9 |
+ VIR_DOMAIN_TUNABLE_BLKDEV_READ_IOPS_SEC,
|
|
|
9119d9 |
param->value.ul) < 0)
|
|
|
9119d9 |
goto endjob;
|
|
|
9119d9 |
} else if (STREQ(param->field,
|
|
|
9119d9 |
@@ -16168,7 +16168,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom,
|
|
|
9119d9 |
set_iops = true;
|
|
|
9119d9 |
if (virTypedParamsAddULLong(&eventParams, &eventNparams,
|
|
|
9119d9 |
&eventMaxparams,
|
|
|
9119d9 |
- VIR_DOMAIN_EVENT_BLKDEVIOTUNE_WRITE_IOPS_SEC,
|
|
|
9119d9 |
+ VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_IOPS_SEC,
|
|
|
9119d9 |
param->value.ul) < 0)
|
|
|
9119d9 |
goto endjob;
|
|
|
9119d9 |
}
|
|
|
9119d9 |
--
|
|
|
9119d9 |
2.1.1
|
|
|
9119d9 |
|