Re: [libvirt] [PATCH 6/6] Add documentation for blkiotune elements.

On 02/08/2011 12:02 AM, Gui Jianfeng wrote: Adding 'cgroup:' to the subject. Pre-existing, and you copied it, but indentation wasn't consistent; that's easy to fix. Pre-existing, and you copied it, but I'm more familiar with 'tunable' than 'tuneable'. Both forms are listed in the dictionary, but tuneable is listed second, and http://www.googlefight.com/index.php?word1=tunable&word2=tuneable confirms that it is less common. /me what has the world come to, when I settle spelling questions via google fight? ACK with this squashed in: diff --git i/docs/formatdomain.html.in w/docs/formatdomain.html.in index 407e5f4..9130767 100644 --- i/docs/formatdomain.html.in +++ w/docs/formatdomain.html.in @@ -303,15 +303,15 @@ hugepages instead of the normal native page size.</dd> <dt><code>blkiotune</code></dt> <dd> The optional <code>blkiotune</code> element provides the ability - to tune Blkio cgroup tuneable parameters for the domain. If this is - omitted, OS will provides the default values.</dd> + to tune Blkio cgroup tunable parameters for the domain. If this is + omitted, OS will provides the default values.</dd> <dt><code>weight</code></dt> <dd> The optional <code>weight</code> element is the I/O weight of the - guest. The value should be in range [100, 1000].</dd> + guest. The value should be in range [100, 1000].</dd> <dt><code>memtune</code></dt> <dd> The optional <code>memtune</code> element provides details - regarding the memory tuneable parameters for the domain. If this is - omitted, it defaults to the OS provided defaults.</dd> + regarding the memory tunable parameters for the domain. If this is + omitted, it defaults to the OS provided defaults.</dd> <dt><code>hard_limit</code></dt> <dd> The optional <code>hard_limit</code> element is the maximum memory the guest can use. The units for this value are kilobytes (i.e. blocks [Oh, and that makes for a minor conflict with my patch to remove all TABs, which is still pending review: https://www.redhat.com/archives/libvir-list/2011-February/msg00129.html] Oops; I also realized you missed one review comment: https://www.redhat.com/archives/libvir-list/2011-January/msg01081.html which asked for a new testcase in qemuxml2argv. I'm squashing this in to patch 4: diff --git c/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args i/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args new file mode 100644 index 0000000..651793d --- /dev/null +++ i/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args @@ -0,0 +1,4 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ +pc -m 214 -smp 1 -name QEMUGuest1 -nographic -monitor unix:/tmp/test-monitor,\ +server,nowait -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial \ +none -parallel none -usb diff --git c/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.xml i/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.xml new file mode 100644 index 0000000..4fa03ef --- /dev/null +++ i/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.xml @@ -0,0 +1,28 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219136</memory> + <currentMemory>219136</currentMemory> + <blkiotune> + <weight>800</weight> + </blkiotune> + <vcpu>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'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' unit='0'/> + </disk> + <controller type='ide' index='0'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git c/tests/qemuxml2argvtest.c i/tests/qemuxml2argvtest.c index 9512bdc..52808b5 100644 --- c/tests/qemuxml2argvtest.c +++ i/tests/qemuxml2argvtest.c @@ -480,6 +480,9 @@ mymain(int argc, char **argv) DO_TEST("cpu-exact2", 0, false); DO_TEST("cpu-strict1", 0, false); + DO_TEST("memtune", QEMUD_CMD_FLAG_NAME, false); + DO_TEST("blkiotune", QEMUD_CMD_FLAG_NAME, false); + free(driver.stateDir); virCapabilitiesFree(driver.caps); diff --git c/tests/qemuxml2xmltest.c i/tests/qemuxml2xmltest.c index dad91d4..15d94b7 100644 --- c/tests/qemuxml2xmltest.c +++ i/tests/qemuxml2xmltest.c @@ -182,6 +182,7 @@ mymain(int argc, char **argv) DO_TEST("encrypted-disk"); DO_TEST("memtune"); + DO_TEST("blkiotune"); DO_TEST("smp"); So, since I've [h]ack'd your series, I've now applied the amended results. Thanks again for the contribution! -- Eric Blake eblake(a)redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org