[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [libvirt] [PATCHv4 7/9] virCaps: remove defaultDiskDriverType from the struct



On 03/15/13 16:26, Peter Krempa wrote:
> Use the qemu specific callback to fill this data in the qemu driver as
> it's the only place where it was used and fix tests as the qemu test
> capability object didn't configure the defaults for the tests.
> ---
> 
> Notes:
>      Version 4:
>      - new in series
> 
>   src/conf/capabilities.h                            |  1 -
>   src/conf/domain_conf.c                             |  5 ---
>   src/qemu/qemu_conf.c                               |  6 ----
>   src/qemu/qemu_domain.c                             | 42 ++++++++++++++++++----
>   .../qemuxml2argv-disk-drive-network-nbd.args       |  5 +--
>   .../qemuxml2argv-disk-drive-network-nbd.xml        |  1 +
>   .../qemuxml2argv-disk-drive-network-rbd-auth.args  |  2 +-
>   .../qemuxml2argv-disk-drive-network-rbd-ipv6.args  |  2 +-
>   .../qemuxml2argv-disk-drive-network-rbd-ipv6.xml   |  1 +
>   .../qemuxml2argv-disk-drive-network-rbd.args       |  2 +-
>   .../qemuxml2argv-disk-drive-network-rbd.xml        |  1 +
>   .../qemuxml2argv-disk-drive-network-sheepdog.args  |  3 +-
>   .../qemuxml2argv-disk-drive-network-sheepdog.xml   |  1 +
>   13 files changed, 47 insertions(+), 25 deletions(-)
> 

After recent Paolo's NBD patches this addition to the testsuite will be needed:

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-export.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-export.args
index bc9d93d..ca70ce4 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-export.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-export.args
@@ -1,5 +1,6 @@
 LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
 pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
--no-acpi -boot c -usb -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-no-acpi -boot c -usb \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -drive file=nbd:example.org:6000:exportname=bar,if=virtio,format=raw \
 -net none -serial none -parallel none
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6-export.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6-export.args
index a942935..d103abf 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6-export.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6-export.args
@@ -1,5 +1,6 @@
 LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
 pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
--no-acpi -boot c -usb -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-no-acpi -boot c -usb \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -drive 'file=nbd+tcp://[::1]:6000/bar,if=virtio,format=raw' -net none \
 -serial none -parallel none
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6.args
index 7cdbdd1..a03c4e8 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6.args
@@ -1,5 +1,6 @@
 LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
 pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
--no-acpi -boot c -usb -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-no-acpi -boot c -usb \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -drive 'file=nbd+tcp://[::1]:6000,if=virtio,format=raw' -net none \
 -serial none -parallel none
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.args
index 977b68f..84cae4a 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.args
@@ -1,5 +1,6 @@
 LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
 pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
--no-acpi -boot c -usb -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-no-acpi -boot c -usb \
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
 -drive file=nbd:unix:/var/run/nbdsock:exportname=bar,if=virtio,format=raw \
 -net none -serial none -parallel none

I already squashed that to my local tree.

Peter


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]