[libvirt] [PATCH v2] Do not generate security_model when fs driver is anything but 'path'

[Eric Blake]

On 01/10/2012 06:08 AM, Daniel P. Berrange wrote:
> On Tue, Jan 10, 2012 at 06:23:31PM +0530, Deepak C Shetty wrote:
>> On 01/10/2012 04:17 PM, Daniel P. Berrange wrote:
>>> On Tue, Jan 10, 2012 at 03:35:26PM +0530, Deepak C Shetty wrote:
>>>> ---
>>>> v2:
>>>> - removed xml accessmode changes as suggested by dan.
>>>> - every fs driver having a default accessmode always, retained.
>>>>
>>>>  src/qemu/qemu_command.c |   23 +++++++++++++++++------
>>>>  1 files changed, 17 insertions(+), 6 deletions(-)
>>> ACK
>>>
> 
> ACK to this version

Now pushed, after squashing this in to fix the 'make check' failure.  I
also added Deepak to AUTHORS; let me know if I need to update anything
for preferred spellings.

diff --git i/src/qemu/qemu_command.c w/src/qemu/qemu_command.c
index a7c0b5b..d051305 100644
--- i/src/qemu/qemu_command.c
+++ w/src/qemu/qemu_command.c
@@ -2142,8 +2142,8 @@ char *qemuBuildFSStr(virDomainFSDefPtr fs,
             virBufferAddLit(&opt, ",security_model=none");
         }
     } else {
-        /* For other fs drivers, default(passthru) should always */
-        /* be supported */
+        /* For other fs drivers, default(passthru) should always
+         * be supported */
         if (fs->accessmode != VIR_DOMAIN_FS_ACCESSMODE_PASSTHROUGH) {
             qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                         _("only supports passthrough accessmode"));
diff --git i/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args
w/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args
index 4c498ba..8579810 100644
--- i/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args
+++ w/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args
@@ -4,7 +4,10 @@ unix:/tmp/test-monitor,server,nowait -no-acpi -boot c
-hda \
 /dev/HostVG/QEMUGuest1 -fsdev
local,security_model=passthrough,id=fsdev-fs0,\
 path=/export/to/guest -device virtio-9p-pci,id=fs0,fsdev=fsdev-fs0,\
 mount_tag=/import/from/host,bus=pci.0,addr=0x3 \
--fsdev handle,security_model=mapped,id=fsdev-fs1,\
+-fsdev local,security_model=mapped,id=fsdev-fs1,\
 path=/export/to/guest2 -device virtio-9p-pci,id=fs1,fsdev=fsdev-fs1,\
 mount_tag=/import/from/host2,bus=pci.0,addr=0x4 \
--usb -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5
+-fsdev handle,id=fsdev-fs2,\
+path=/export/to/guest3 -device virtio-9p-pci,id=fs2,fsdev=fsdev-fs2,\
+mount_tag=/import/from/host3,bus=pci.0,addr=0x5 \
+-usb -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6
diff --git i/tests/qemuxml2argvdata/qemuxml2argv-fs9p.xml
w/tests/qemuxml2argvdata/qemuxml2argv-fs9p.xml
index 7ef5923..07d7e8a 100644
--- i/tests/qemuxml2argvdata/qemuxml2argv-fs9p.xml
+++ w/tests/qemuxml2argvdata/qemuxml2argv-fs9p.xml
@@ -25,9 +25,14 @@
       <target dir='/import/from/host'/>
     </filesystem>
     <filesystem accessmode='mapped'>
-      <driver type='handle'/>
+      <driver type='path'/>
       <source dir='/export/to/guest2'/>
       <target dir='/import/from/host2'/>
     </filesystem>
+    <filesystem>
+      <driver type='handle'/>
+      <source dir='/export/to/guest3'/>
+      <target dir='/import/from/host3'/>
+    </filesystem>
   </devices>
 </domain>


-- 
Eric Blake   eblake at redhat.com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 620 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20120111/9f0b344e/attachment-0001.sig>