"Daniel P. Berrange" <berrange@redhat.com> wrote: ...
Further up in this code its already adding cache=off for shared disks.
Probably introduced by me in the merge.
There's also quite a few code style issues, not following conventions of the surrounding code.
Here's a patch which addresses all that, and more importantly adds test cases covering all the cache variants QEMU has.
b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.args | 1 b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.xml | 29 +++++++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.args | 1 b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.xml | 29 +++++++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wt.args | 1 b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wt.xml | 29 +++++++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.args | 1 b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.xml | 29 +++++++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.args | 1 b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.xml | 29 +++++++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.args | 1 b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.xml | 29 +++++++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared.args | 1 b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared.xml | 30 +++++++
I looked through the incremental changes, and they look ok, but see that they do introduce new test failures: 4) qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.xml FAILED Relax-NG validity error : Extra element devices in interleave /c/libvirt/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.xml:15: element devices: Relax-NG validity error : Element domain failed to validate content /c/libvirt/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.xml fails to validate ... 6) qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.xml FAILED Relax-NG validity error : Extra element devices in interleave /c/libvirt/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.xml:15: element devices: Relax-NG validity error : Element domain failed to validate content /c/libvirt/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.xml fails to validate ... 14) qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.xml FAILED Relax-NG validity error : Extra element devices in interleave /c/libvirt/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.xml:15: element devices: Relax-NG validity error : Element domain failed to validate content /c/libvirt/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.xml fails to validate ... ^R 17) qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.xml FAILED Relax-NG validity error : Extra element devices in interleave /c/libvirt/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.xml:15: element devices: Relax-NG validity error : Element domain failed to validate content /c/libvirt/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.xml fails to validate ... 22) qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.xml FAILED Relax-NG validity error : Extra element devices in interleave /c/libvirt/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.xml:15: element devices: Relax-NG validity error : Element domain failed to validate content /c/libvirt/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.xml fails to validate ... 42) qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wt.xml FAILED Relax-NG validity error : Extra element devices in interleave /c/libvirt/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wt.xml:15: element devices: Relax-NG validity error : Element domain failed to validate content /c/libvirt/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wt.xml fails to validate