[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/21/13 18:07, Peter Krempa wrote:
> 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

and also the corresponding XML changes:

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-export.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-export.xml
index f2b5ca4..7a84604 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-export.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-export.xml
@@ -15,6 +15,7 @@
   <devices>
     <emulator>/usr/bin/qemu</emulator>
     <disk type='block' device='disk'>
+      <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6-export.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6-export.xml
index 595d7ea..c063db8 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6-export.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6-export.xml
@@ -15,6 +15,7 @@
   <devices>
     <emulator>/usr/bin/qemu</emulator>
     <disk type='block' device='disk'>
+      <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6.xml
index 3c5c99d..540aa02 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6.xml
@@ -15,6 +15,7 @@
   <devices>
     <emulator>/usr/bin/qemu</emulator>
     <disk type='block' device='disk'>
+      <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.xml
index 46114d5..a4126f5 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.xml
@@ -15,6 +15,7 @@
   <devices>
     <emulator>/usr/bin/qemu</emulator>
     <disk type='block' device='disk'>
+      <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>



...

> 
> I already squashed that to my local tree.
> 
> Peter
> 
> --
> libvir-list mailing list
> libvir-list redhat com
> https://www.redhat.com/mailman/listinfo/libvir-list
> 


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