Failed in applying to current master (
apply log)
...ource-auth.xml => disk-network-source-auth.xml} | 0
...work-tlsx509.args => disk-network-tlsx509.args} | 0
.../disk-network-tlsx509.x86_64-latest.args | 59 +++++++++++
...etwork-tlsx509.xml => disk-network-tlsx509.xml} | 0
...ve-network-vxhs.args => disk-network-vxhs.args} | 0
...rive-network-vxhs.xml => disk-network-vxhs.xml} | 0
.../{disk-drive-no-boot.args => disk-no-boot.args} | 0
.../{disk-drive-no-boot.xml => disk-no-boot.xml} | 0
...-readonly-disk.args => disk-readonly-disk.args} | 0
.../disk-readonly-disk.x86_64-latest.args | 34 +++++++
...ve-readonly-disk.xml => disk-readonly-disk.xml} | 0
...hared-locking.args => disk-shared-locking.args} | 0
...-shared-locking.xml => disk-shared-locking.xml} | 0
...-drive-shared-qcow.xml => disk-shared-qcow.xml} | 0
.../{disk-drive-shared.args => disk-shared.args} | 0
.../disk-shared.x86_64-latest.args | 37 +++++++
.../{disk-drive-shared.xml => disk-shared.xml} | 0
...o-drive-queues.args => disk-virtio-queues.args} | 0
...tio-drive-queues.xml => disk-virtio-queues.xml} | 0
.../floppy-drive-fat.x86_64-latest.args | 33 ++++++
tests/qemuxml2argvtest.c | 112 ++++++++++-----------
...sk-drive-boot-cdrom.xml => disk-boot-cdrom.xml} | 0
...disk-drive-boot-disk.xml => disk-boot-disk.xml} | 0
.../{disk-many.xml => disk-cache.xml} | 36 ++++---
tests/qemuxml2xmloutdata/disk-cdrom-empty.xml | 40 --------
tests/qemuxml2xmloutdata/disk-cdrom.xml | 6 ++
tests/qemuxml2xmloutdata/disk-detect-zeroes.xml | 1 +
.../{disk-drive-discard.xml => disk-discard.xml} | 0
.../disk-drive-cache-directsync.xml | 41 --------
.../qemuxml2xmloutdata/disk-drive-cache-unsafe.xml | 41 --------
.../disk-drive-cache-v2-none.xml | 41 --------
.../qemuxml2xmloutdata/disk-drive-cache-v2-wb.xml | 41 --------
.../qemuxml2xmloutdata/disk-drive-cache-v2-wt.xml | 41 --------
.../qemuxml2xmloutdata/disk-drive-copy-on-read.xml | 36 -------
.../disk-drive-detect-zeroes.xml | 1 -
.../disk-drive-network-iscsi.xml | 41 --------
.../disk-drive-network-nbd-export.xml | 42 --------
.../disk-drive-network-nbd-ipv6-export.xml | 42 --------
.../disk-drive-network-nbd-ipv6.xml | 42 --------
.../disk-drive-network-nbd-unix.xml | 42 --------
.../qemuxml2xmloutdata/disk-drive-network-nbd.xml | 42 --------
.../disk-drive-network-rbd-auth.xml | 47 ---------
.../disk-drive-network-rbd-ceph-env.xml | 44 --------
.../disk-drive-network-rbd-ipv6.xml | 45 ---------
...rive-error-policy.xml => disk-error-policy.xml} | 0
.../{disk-drive-fat.xml => disk-fat.xml} | 0
.../{disk-drive-fmt-qcow.xml => disk-fmt-qcow.xml} | 0
...etwork-gluster.xml => disk-network-gluster.xml} | 0
...twork-iscsi-auth.xml => disk-network-iscsi.xml} | 35 ++++++-
tests/qemuxml2xmloutdata/disk-network-nbd.xml | 68 +++++++++++++
...-drive-network-rbd.xml => disk-network-rbd.xml} | 30 ++++--
...work-sheepdog.xml => disk-network-sheepdog.xml} | 0
...ource-auth.xml => disk-network-source-auth.xml} | 0
...etwork-tlsx509.xml => disk-network-tlsx509.xml} | 0
...rive-network-vxhs.xml => disk-network-vxhs.xml} | 0
...tio-drive-queues.xml => disk-virtio-queues.xml} | 0
tests/qemuxml2xmltest.c | 47 +++------
162 files changed, 1184 insertions(+), 2481 deletions(-)
rename tests/qemuxml2argvdata/{disk-drive-address-conflict.xml => disk-address-conflict.xml} (100%)
create mode 100644 tests/qemuxml2argvdata/disk-aio.x86_64-latest.args
rename tests/qemuxml2argvdata/{disk-drive-boot-cdrom.args => disk-boot-cdrom.args} (100%)
rename tests/qemuxml2argvdata/{disk-drive-boot-cdrom.xml => disk-boot-cdrom.xml} (100%)
rename tests/qemuxml2argvdata/{disk-drive-boot-disk.args => disk-boot-disk.args} (100%)
rename tests/qemuxml2argvdata/{disk-drive-boot-disk.xml => disk-boot-disk.xml} (100%)
create mode 100644 tests/qemuxml2argvdata/disk-cache.args
rename tests/qemuxml2argvdata/{disk-drive-write-cache.x86_64-2.6.0.args => disk-cache.x86_64-2.6.0.args} (90%)
rename tests/qemuxml2argvdata/{disk-drive-write-cache.x86_64-2.7.0.args => disk-cache.x86_64-2.7.0.args} (90%)
rename tests/qemuxml2argvdata/{disk-drive-write-cache.x86_64-latest.args => disk-cache.x86_64-latest.args} (90%)
rename tests/qemuxml2argvdata/{disk-drive-write-cache.xml => disk-cache.xml} (86%)
delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-empty.args
delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-empty.xml
delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-ftp.args
delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-ftp.xml
delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-ftps.args
delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-ftps.xml
delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-http.args
delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-http.xml
delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-tftp.args
delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-tftp.xml
rename tests/qemuxml2argvdata/{disk-cdrom-network-https.args => disk-cdrom-network.args} (58%)
create mode 100644 tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args
rename tests/qemuxml2argvdata/{disk-cdrom-network-https.xml => disk-cdrom-network.xml} (52%)
delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-tray-no-device-cap.args
delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-tray-no-device-cap.xml
create mode 100644 tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args
create mode 100644 tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args
create mode 100644 tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args
rename tests/qemuxml2argvdata/{disk-drive-detect-zeroes.args => disk-detect-zeroes.args} (100%)
create mode 100644 tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args
rename tests/qemuxml2argvdata/{disk-drive-detect-zeroes.xml => disk-detect-zeroes.xml} (100%)
rename tests/qemuxml2argvdata/{disk-drive-discard.args => disk-discard.args} (100%)
rename tests/qemuxml2argvdata/{disk-drive-discard.xml => disk-discard.xml} (100%)
delete mode 100644 tests/qemuxml2argvdata/disk-drive-cache-directsync.args
delete mode 100644 tests/qemuxml2argvdata/disk-drive-cache-directsync.xml
delete mode 100644 tests/qemuxml2argvdata/disk-drive-cache-unsafe.args
delete mode 100644 tests/qemuxml2argvdata/disk-drive-cache-unsafe.xml
delete mode 100644 tests/qemuxml2argvdata/disk-drive-cache-v2-none.args
delete mode 100644 tests/qemuxml2argvdata/disk-drive-cache-v2-none.xml
delete mode 100644 tests/qemuxml2argvdata/disk-drive-cache-v2-wb.args
delete mode 100644 tests/qemuxml2argvdata/disk-drive-cache-v2-wb.xml
delete mode 100644 tests/qemuxml2argvdata/disk-drive-cache-v2-wt.args
delete mode 100644 tests/qemuxml2argvdata/disk-drive-cache-v2-wt.xml
delete mode 100644 tests/qemuxml2argvdata/disk-drive-copy-on-read.xml
delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-iscsi-lun.args
delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-iscsi-lun.xml
delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-iscsi.args
delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-iscsi.xml
delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-nbd-export.args
delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-nbd-export.xml
delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-nbd-ipv6-export.args
delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-nbd-ipv6-export.xml
delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-nbd-ipv6.args
delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-nbd-ipv6.xml
delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-nbd-unix.args
delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-nbd-unix.xml
delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-nbd.args
delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-nbd.xml
delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-rbd-auth-AES.xml
delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-rbd-auth.args
delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-rbd-auth.xml
delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-rbd-ceph-env.args
delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-rbd-ceph-env.xml
delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-rbd-ipv6.args
delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-rbd-ipv6.xml
delete mode 100644 tests/qemuxml2argvdata/disk-drive-readonly-no-device.args
delete mode 100644 tests/qemuxml2argvdata/disk-drive-readonly-no-device.xml
rename tests/qemuxml2argvdata/{disk-drive-error-policy.args => disk-error-policy.args} (100%)
rename tests/qemuxml2argvdata/{disk-drive-error-policy.x86_64-latest.args => disk-error-policy.x86_64-latest.args} (100%)
rename tests/qemuxml2argvdata/{disk-drive-error-policy.xml => disk-error-policy.xml} (100%)
delete mode 100644 tests/qemuxml2argvdata/disk-floppy-tray-no-device-cap.xml
rename tests/qemuxml2argvdata/{disk-floppy-tray-no-device-cap.args => disk-floppy.x86_64-latest.args} (53%)
rename tests/qemuxml2argvdata/{disk-drive-fmt-cow.xml => disk-fmt-cow.xml} (100%)
rename tests/qemuxml2argvdata/{disk-drive-fmt-dir.xml => disk-fmt-dir.xml} (100%)
rename tests/qemuxml2argvdata/{disk-drive-fmt-iso.xml => disk-fmt-iso.xml} (100%)
rename tests/qemuxml2argvdata/{disk-drive-fmt-qcow.args => disk-fmt-qcow.args} (100%)
rename tests/qemuxml2argvdata/{disk-drive-fmt-qcow.xml => disk-fmt-qcow.xml} (100%)
rename tests/qemuxml2argvdata/{disk-ide-drive-split.args => disk-ide-split.args} (100%)
rename tests/qemuxml2argvdata/{disk-ide-drive-split.xml => disk-ide-split.xml} (100%)
delete mode 100644 tests/qemuxml2argvdata/disk-many.args
delete mode 100644 tests/qemuxml2argvdata/disk-many.xml
rename tests/qemuxml2argvdata/{disk-drive-network-gluster.args => disk-network-gluster.args} (100%)
create mode 100644 tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args
rename tests/qemuxml2argvdata/{disk-drive-network-gluster.xml => disk-network-gluster.xml} (100%)
rename tests/qemuxml2argvdata/{disk-drive-network-iscsi-auth-secrettype-invalid.xml => disk-network-iscsi-auth-secrettype-invalid.xml} (100%)
rename tests/qemuxml2argvdata/{disk-drive-network-iscsi-auth-wrong-secrettype.xml => disk-network-iscsi-auth-wrong-secrettype.xml} (100%)
rename tests/qemuxml2argvdata/{disk-drive-network-iscsi-auth.args => disk-network-iscsi.args} (54%)
create mode 100644 tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args
rename tests/qemuxml2argvdata/{disk-drive-network-iscsi-auth.xml => disk-network-iscsi.xml} (63%)
rename tests/qemuxml2argvdata/{disk-drive-network-rbd.args => disk-network-nbd.args} (56%)
create mode 100644 tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args
create mode 100644 tests/qemuxml2argvdata/disk-network-nbd.xml
rename tests/qemuxml2argvdata/{disk-drive-network-rbd-no-colon.xml => disk-network-rbd-no-colon.xml} (100%)
create mode 100644 tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args
create mode 100644 tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args
rename tests/qemuxml2argvdata/{disk-drive-network-rbd.xml => disk-network-rbd.xml} (71%)
rename tests/qemuxml2argvdata/{disk-drive-network-sheepdog.args => disk-network-sheepdog.args} (100%)
create mode 100644 tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args
rename tests/qemuxml2argvdata/{disk-drive-network-sheepdog.xml => disk-network-sheepdog.xml} (100%)
rename tests/qemuxml2argvdata/{disk-drive-network-source-auth-both.xml => disk-network-source-auth-both.xml} (100%)
rename tests/qemuxml2argvdata/{disk-drive-network-source-auth.args => disk-network-source-auth.args} (100%)
rename tests/qemuxml2argvdata/{disk-drive-network-rbd-auth-AES.args => disk-network-source-auth.x86_64-latest.args} (51%)
rename tests/qemuxml2argvdata/{disk-drive-network-source-auth.xml => disk-network-source-auth.xml} (100%)
rename tests/qemuxml2argvdata/{disk-drive-network-tlsx509.args => disk-network-tlsx509.args} (100%)
create mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args
rename tests/qemuxml2argvdata/{disk-drive-network-tlsx509.xml => disk-network-tlsx509.xml} (100%)
rename tests/qemuxml2argvdata/{disk-drive-network-vxhs.args => disk-network-vxhs.args} (100%)
rename tests/qemuxml2argvdata/{disk-drive-network-vxhs.xml => disk-network-vxhs.xml} (100%)
rename tests/qemuxml2argvdata/{disk-drive-no-boot.args => disk-no-boot.args} (100%)
rename tests/qemuxml2argvdata/{disk-drive-no-boot.xml => disk-no-boot.xml} (100%)
rename tests/qemuxml2argvdata/{disk-drive-readonly-disk.args => disk-readonly-disk.args} (100%)
create mode 100644 tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args
rename tests/qemuxml2argvdata/{disk-drive-readonly-disk.xml => disk-readonly-disk.xml} (100%)
rename tests/qemuxml2argvdata/{disk-drive-shared-locking.args => disk-shared-locking.args} (100%)
rename tests/qemuxml2argvdata/{disk-drive-shared-locking.xml => disk-shared-locking.xml} (100%)
rename tests/qemuxml2argvdata/{disk-drive-shared-qcow.xml => disk-shared-qcow.xml} (100%)
rename tests/qemuxml2argvdata/{disk-drive-shared.args => disk-shared.args} (100%)
create mode 100644 tests/qemuxml2argvdata/disk-shared.x86_64-latest.args
rename tests/qemuxml2argvdata/{disk-drive-shared.xml => disk-shared.xml} (100%)
rename tests/qemuxml2argvdata/{disk-virtio-drive-queues.args => disk-virtio-queues.args} (100%)
rename tests/qemuxml2argvdata/{disk-virtio-drive-queues.xml => disk-virtio-queues.xml} (100%)
create mode 100644 tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args
rename tests/qemuxml2xmloutdata/{disk-drive-boot-cdrom.xml => disk-boot-cdrom.xml} (100%)
rename tests/qemuxml2xmloutdata/{disk-drive-boot-disk.xml => disk-boot-disk.xml} (100%)
rename tests/qemuxml2xmloutdata/{disk-many.xml => disk-cache.xml} (54%)
delete mode 100644 tests/qemuxml2xmloutdata/disk-cdrom-empty.xml
create mode 120000 tests/qemuxml2xmloutdata/disk-detect-zeroes.xml
rename tests/qemuxml2xmloutdata/{disk-drive-discard.xml => disk-discard.xml} (100%)
delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-cache-directsync.xml
delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-cache-unsafe.xml
delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-cache-v2-none.xml
delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-cache-v2-wb.xml
delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-cache-v2-wt.xml
delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-copy-on-read.xml
delete mode 120000 tests/qemuxml2xmloutdata/disk-drive-detect-zeroes.xml
delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-network-iscsi.xml
delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-network-nbd-export.xml
delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-network-nbd-ipv6-export.xml
delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-network-nbd-ipv6.xml
delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-network-nbd-unix.xml
delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-network-nbd.xml
delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-network-rbd-auth.xml
delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-network-rbd-ceph-env.xml
delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-network-rbd-ipv6.xml
rename tests/qemuxml2xmloutdata/{disk-drive-error-policy.xml => disk-error-policy.xml} (100%)
rename tests/qemuxml2xmloutdata/{disk-drive-fat.xml => disk-fat.xml} (100%)
rename tests/qemuxml2xmloutdata/{disk-drive-fmt-qcow.xml => disk-fmt-qcow.xml} (100%)
rename tests/qemuxml2xmloutdata/{disk-drive-network-gluster.xml => disk-network-gluster.xml} (100%)
rename tests/qemuxml2xmloutdata/{disk-drive-network-iscsi-auth.xml => disk-network-iscsi.xml} (59%)
create mode 100644 tests/qemuxml2xmloutdata/disk-network-nbd.xml
rename tests/qemuxml2xmloutdata/{disk-drive-network-rbd.xml => disk-network-rbd.xml} (72%)
rename tests/qemuxml2xmloutdata/{disk-drive-network-sheepdog.xml => disk-network-sheepdog.xml} (100%)
rename tests/qemuxml2xmloutdata/{disk-drive-network-source-auth.xml => disk-network-source-auth.xml} (100%)
rename tests/qemuxml2xmloutdata/{disk-drive-network-tlsx509.xml => disk-network-tlsx509.xml} (100%)
rename tests/qemuxml2xmloutdata/{disk-drive-network-vxhs.xml => disk-network-vxhs.xml} (100%)
rename tests/qemuxml2xmloutdata/{disk-virtio-drive-queues.xml => disk-virtio-queues.xml} (100%)