From: Osier Yang Date: Tue, 14 May 2013 09:03:02 +0000 (+0800) Subject: conf: Fix the bug of disk->copy_on_read formating X-Git-Tag: v1.0.6-rc1~157 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3b40bec426273028c218f3bef147d424ad7759a;p=thirdparty%2Flibvirt.git conf: Fix the bug of disk->copy_on_read formating The reason for it's not exposed for such long time is that the enums for VirtioEventIdx and CopyOnReadType have same enum values and Correspondingstrings. This fixes the bug and adds test. --- diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f0ca9d59a3..81e8087df7 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13708,7 +13708,7 @@ virDomainDiskDefFormat(virBufferPtr buf, const char *iomode = virDomainDiskIoTypeToString(def->iomode); const char *ioeventfd = virDomainIoEventFdTypeToString(def->ioeventfd); const char *event_idx = virDomainVirtioEventIdxTypeToString(def->event_idx); - const char *copy_on_read = virDomainVirtioEventIdxTypeToString(def->copy_on_read); + const char *copy_on_read = virDomainDiskCopyOnReadTypeToString(def->copy_on_read); const char *sgio = virDomainDiskSGIOTypeToString(def->sgio); const char *discard = virDomainDiskDiscardTypeToString(def->discard); diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.xml index 0834cf20cb..076095e276 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.xml @@ -1,6 +1,8 @@ test + 468404ad-d49c-40f2-9e14-02294f9c1be3 1048576 + 1048576 1 hvm @@ -20,27 +22,30 @@
- +
+ + +
+ + + - - -
- + diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 148a05aab0..807b623417 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -293,6 +293,8 @@ mymain(void) DO_TEST("hostdev-scsi-virtio-scsi"); DO_TEST("hostdev-scsi-readonly"); + DO_TEST("disk-copy_on_read"); + virObjectUnref(driver.caps); virObjectUnref(driver.xmlopt);