Re: [libvirt] [PATCH v4] Add new attribute wrpolicy to <driver> element

On 01/17/2012 05:44 AM, Deepak C Shetty wrote: You had lots of trailing whitespace, caught by 'make syntax-check'. Trivial merge conflict here; nothing too hard to figure out. Excellent - that's what I was looking for in an added test. ACK after fixing up the whitespace and one other test failure, so I pushed with this squashed in: diff --git i/docs/formatdomain.html.in w/docs/formatdomain.html.in index 1d6484a..de9b480 100644 --- i/docs/formatdomain.html.in +++ w/docs/formatdomain.html.in @@ -1424,10 +1424,10 @@ attribute <code>type='path'</code> or <code>type='handle'</code> <span class="since">(since 0.9.7)</span>. The driver block has an optional attribute - <code>wrpolicy</code> that further controls interaction with - the host page cache; omitting the attribute gives default behavior, - while the value <code>immediate</code> means that a host writeback - is immediately triggered for all pages touched during a guest file + <code>wrpolicy</code> that further controls interaction with + the host page cache; omitting the attribute gives default behavior, + while the value <code>immediate</code> means that a host writeback + is immediately triggered for all pages touched during a guest file write operation <span class="since">(since 0.9.10)</span>. </dd> <dt><code>type='template'</code></dt> diff --git i/src/conf/domain_conf.c w/src/conf/domain_conf.c index 28f9b1b..f97014e 100644 --- i/src/conf/domain_conf.c +++ w/src/conf/domain_conf.c @@ -10210,7 +10210,6 @@ virDomainFSDefFormat(virBufferPtr buf, } virBufferAddLit(buf, "/>\n"); - } if (def->src) { diff --git i/tests/qemuhelptest.c w/tests/qemuhelptest.c index 164707d..8802271 100644 --- i/tests/qemuhelptest.c +++ w/tests/qemuhelptest.c @@ -666,7 +666,8 @@ mymain(void) QEMU_CAPS_FSDEV_READONLY, QEMU_CAPS_VIRTIO_BLK_SCSI, QEMU_CAPS_VIRTIO_BLK_SG_IO, - QEMU_CAPS_CPU_HOST); + QEMU_CAPS_CPU_HOST, + QEMU_CAPS_FSDEV_WRITEOUT); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- Eric Blake eblake(a)redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org