7:56 a.m.
Modify _virDomainBlockIoTuneInfo and rng schema to support the _length
options for bps/iops throttling values. Document the new values.
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
docs/formatdomain.html.in | 40 ++++++++++++-
docs/schemas/domaincommon.rng | 38 +++++++++++++
src/conf/domain_conf.c | 45 ++++++++++++++-
.../qemuxml2argv-blkdeviotune-max-length.xml | 65 ++++++++++++++++++++++
.../qemuxml2xmlout-blkdeviotune-max-length.xml | 1 +
tests/qemuxml2xmltest.c | 1 +
6 files changed, 188 insertions(+), 2 deletions(-)
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max-length.xml
create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-blkdeviotune-max-length.xml
diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index f48a4d8..d88f084 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -2616,7 +2616,45 @@
maximum write I/O operations per second.</dd>
<dt><code>size_iops_sec</code></dt>
<dd>The optional <code>size_iops_sec</code> element is the
- size of I/O operations per second.</dd>
+ size of I/O operations per second.
+ <p>
+ <span class="since">Throughput limits since 1.2.11 and QEMU
1.7</span>
+ </p>
+ </dd>
+ <dt><code>total_bytes_sec_max_length</code></dt>
+ <dd>The optional <code>total_bytes_sec_max_length</code>
+ element is the maximum duration in seconds for the
+ <code>total_bytes_sec_max</code> burst period. Only valid
+ when the <code>total_bytes_sec_max</code> is set.</dd>
+ <dt><code>read_bytes_sec_max_length</code></dt>
+ <dd>The optional <code>read_bytes_sec_max_length</code>
+ element is the maximum duration in seconds for the
+ <code>read_bytes_sec_max</code> burst period. Only valid
+ when the <code>read_bytes_sec_max</code> is set.</dd>
+ <dt><code>write_bytes_sec_max</code></dt>
+ <dd>The optional <code>write_bytes_sec_max_length</code>
+ element is the maximum duration in seconds for the
+ <code>write_bytes_sec_max</code> burst period. Only valid
+ when the if <code>write_bytes_sec_max</code> is set.</dd>
+ <dt><code>total_iops_sec_max_length</code></dt>
+ <dd>The optional <code>total_iops_sec_max_length</code>
+ element is the maximum duration in seconds for the
+ <code>total_iops_sec_max</code> burst period. Only valid
+ when the <code>total_iops_sec_max</code> is set.</dd>
+ <dt><code>read_iops_sec_max_length</code></dt>
+ <dd>The optional <code>read_iops_sec_max_length</code>
+ element is the maximum duration in seconds for the
+ <code>read_iops_sec_max</code> burst period. Only valid
+ when the <code>read_iops_sec_max</code> is set.</dd>
+ <dt><code>write_iops_sec_max</code></dt>
+ <dd>The optional <code>write_iops_sec_max_length</code>
+ element is the maximum duration in seconds for the
+ <code>write_iops_sec_max</code> burst period. Only valid
+ when the <code>write_iops_sec_max</code> is set.
+ <p>
+ <span class="since">Throughput length since 2.3.0 and QEMU
2.6</span>
+ </p>
+ </dd>
</dl>
</dd>
<dt><code>driver</code></dt>
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 95c7882..0c3a411 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -4949,6 +4949,44 @@
<data type="unsignedLong"/>
</element>
</optional>
+ <choice>
+ <element name="total_bytes_sec_max_length">
+ <data type="unsignedLong"/>
+ </element>
+ <group>
+ <interleave>
+ <optional>
+ <element name="read_bytes_sec_max_length">
+ <data type="unsignedLong"/>
+ </element>
+ </optional>
+ <optional>
+ <element name="write_bytes_sec_max_length">
+ <data type="unsignedLong"/>
+ </element>
+ </optional>
+ </interleave>
+ </group>
+ </choice>
+ <choice>
+ <element name="total_iops_sec_max_length">
+ <data type="unsignedLong"/>
+ </element>
+ <group>
+ <interleave>
+ <optional>
+ <element name="read_iops_sec_max_length">
+ <data type="unsignedLong"/>
+ </element>
+ </optional>
+ <optional>
+ <element name="write_iops_sec_max_length">
+ <data type="unsignedLong"/>
+ </element>
+ </optional>
+ </interleave>
+ </group>
+ </choice>
</interleave>
</element>
</define>
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 861a15d..6e405c4 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -7134,6 +7134,21 @@ virDomainDiskBackingStoreParse(xmlXPathContextPtr ctxt,
_("disk iotune field '%s_max' must be an
integer"), \
#val); \
return -1; \
+ } \
+ if (virXPathULongLong("string(./iotune/" #val "_max_length)",
\
+ ctxt, &def->blkdeviotune.val##_max_length) == -2) { \
+ virReportError(VIR_ERR_XML_ERROR, \
+ _("disk iotune field '%s_max_length' must be "
\
+ "an integer"), #val);
\
+ return -1; \
+ }
+
+#define CHECK_IOTUNE_MAX_LENGTH(val) \
+ if (def->blkdeviotune.val##_length && !def->blkdeviotune.val) {
\
+ virReportError(VIR_ERR_XML_ERROR, \
+ _("disk iotune '%s'_length cannot be set unless
" \
+ "disk iotune '%s' is also set"), #val, #val);
\
+ return -1; \
}
static int
@@ -7155,6 +7170,13 @@ virDomainDiskDefIotuneParse(virDomainDiskDefPtr def,
return -1;
}
+ //PARSE_IOTUNE(total_bytes_sec_max_length);
+ //PARSE_IOTUNE(read_bytes_sec_max_length);
+ //PARSE_IOTUNE(write_bytes_sec_max_length);
+ //PARSE_IOTUNE(total_iops_sec_max_length);
+ //PARSE_IOTUNE(read_iops_sec_max_length);
+ //PARSE_IOTUNE(write_iops_sec_max_length);
+
if ((def->blkdeviotune.total_bytes_sec &&
def->blkdeviotune.read_bytes_sec) ||
(def->blkdeviotune.total_bytes_sec &&
@@ -7195,8 +7217,16 @@ virDomainDiskDefIotuneParse(virDomainDiskDefPtr def,
return -1;
}
+ CHECK_IOTUNE_MAX_LENGTH(total_bytes_sec_max);
+ CHECK_IOTUNE_MAX_LENGTH(read_bytes_sec_max);
+ CHECK_IOTUNE_MAX_LENGTH(write_bytes_sec_max);
+ CHECK_IOTUNE_MAX_LENGTH(total_iops_sec_max);
+ CHECK_IOTUNE_MAX_LENGTH(read_iops_sec_max);
+ CHECK_IOTUNE_MAX_LENGTH(write_iops_sec_max);
+
return 0;
}
+#undef CHECK_IOTUNE_MAX_LENGTH
#undef PARSE_IOTUNE
@@ -20257,7 +20287,13 @@ virDomainDiskDefFormat(virBufferPtr buf,
def->blkdeviotune.total_iops_sec_max ||
def->blkdeviotune.read_iops_sec_max ||
def->blkdeviotune.write_iops_sec_max ||
- def->blkdeviotune.size_iops_sec) {
+ def->blkdeviotune.size_iops_sec ||
+ def->blkdeviotune.total_bytes_sec_max_length ||
+ def->blkdeviotune.read_bytes_sec_max_length ||
+ def->blkdeviotune.write_bytes_sec_max_length ||
+ def->blkdeviotune.total_iops_sec_max_length ||
+ def->blkdeviotune.read_iops_sec_max_length ||
+ def->blkdeviotune.write_iops_sec_max_length) {
virBufferAddLit(buf, "<iotune>\n");
virBufferAdjustIndent(buf, 2);
@@ -20280,6 +20316,13 @@ virDomainDiskDefFormat(virBufferPtr buf,
def->blkdeviotune.size_iops_sec);
}
+ FORMAT_IOTUNE(total_bytes_sec_max_length);
+ FORMAT_IOTUNE(read_bytes_sec_max_length);
+ FORMAT_IOTUNE(write_bytes_sec_max_length);
+ FORMAT_IOTUNE(total_iops_sec_max_length);
+ FORMAT_IOTUNE(read_iops_sec_max_length);
+ FORMAT_IOTUNE(write_iops_sec_max_length);
+
virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</iotune>\n");
}
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max-length.xml
b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max-length.xml
new file mode 100644
index 0000000..c740751
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max-length.xml
@@ -0,0 +1,65 @@
+<domain type='qemu'>
+ <name>QEMUGuest1</name>
+ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+ <memory unit='KiB'>219100</memory>
+ <currentMemory unit='KiB'>219100</currentMemory>
+ <vcpu placement='static'>1</vcpu>
+ <os>
+ <type arch='i686' 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</emulator>
+ <disk type='block' device='disk'>
+ <driver name='qemu' type='qcow2' cache='none'/>
+ <source dev='/dev/HostVG/QEMUGuest1'/>
+ <target dev='hda' bus='ide'/>
+ <iotune>
+ <total_bytes_sec>5000</total_bytes_sec>
+ <total_iops_sec>6000</total_iops_sec>
+ <total_bytes_sec_max>10000</total_bytes_sec_max>
+ <total_iops_sec_max>11000</total_iops_sec_max>
+ <total_bytes_sec_max_length>3</total_bytes_sec_max_length>
+ <total_iops_sec_max_length>5</total_iops_sec_max_length>
+ </iotune>
+ <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
+ </disk>
+ <disk type='block' device='disk'>
+ <driver name='qemu' type='qcow2' cache='none'/>
+ <source dev='/dev/HostVG/QEMUGuest2'/>
+ <target dev='hdb' bus='ide'/>
+ <iotune>
+ <read_bytes_sec>5000</read_bytes_sec>
+ <write_bytes_sec>5500</write_bytes_sec>
+ <read_iops_sec>3500</read_iops_sec>
+ <write_iops_sec>4000</write_iops_sec>
+ <read_bytes_sec_max>6000</read_bytes_sec_max>
+ <write_bytes_sec_max>6500</write_bytes_sec_max>
+ <read_iops_sec_max>7000</read_iops_sec_max>
+ <write_iops_sec_max>7500</write_iops_sec_max>
+ <size_iops_sec>2000</size_iops_sec>
+ <read_bytes_sec_max_length>3</read_bytes_sec_max_length>
+ <write_bytes_sec_max_length>5</write_bytes_sec_max_length>
+ <read_iops_sec_max_length>7</read_iops_sec_max_length>
+ <write_iops_sec_max_length>9</write_iops_sec_max_length>
+ </iotune>
+ <address type='drive' controller='0' bus='0'
target='0' unit='1'/>
+ </disk>
+ <controller type='usb' index='0'>
+ <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'/>
+ <input type='mouse' bus='ps2'/>
+ <input type='keyboard' bus='ps2'/>
+ <memballoon model='virtio'>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ </memballoon>
+ </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-blkdeviotune-max-length.xml
b/tests/qemuxml2xmloutdata/qemuxml2xmlout-blkdeviotune-max-length.xml
new file mode 120000
index 0000000..67f3e9a
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-blkdeviotune-max-length.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/qemuxml2argv-blkdeviotune-max-length.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 4b58986..5c50512 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -608,6 +608,7 @@ mymain(void)
DO_TEST("usb-redir-filter-version", NONE);
DO_TEST("blkdeviotune", NONE);
DO_TEST("blkdeviotune-max", NONE);
+ DO_TEST("blkdeviotune-max-length", NONE);
DO_TEST("controller-usb-order", NONE);
DO_TEST_FULL("seclabel-dynamic-baselabel", WHEN_INACTIVE, GIC_NONE, NONE);
--
2.7.4