From: Hu Tao <hutao@cn.fujitsu.com>
Date: Mon, 28 Jul 2014 08:45:23 +0000 (+0800)
Subject: qemu: error out if PCI passthrough type is not supported
X-Git-Tag: v1.2.7-rc2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c5b02b6773c09fe4380002f5a23a46f9032ba0e8;p=thirdparty%2Flibvirt.git

qemu: error out if PCI passthrough type is not supported

If PCI passthrough type is not supported, we should error out rather than
continue building the command line.

When starting a domain, the type has been already checked by
qemuPrepareHostdevPCICheckSupport() before building qemu command line,
so the problem doesn't emerge.

But when coverting a domain xml without specifying passthrough type explictly
to qemu arg, we will get a malformed command line.

the xml:

    <hostdev mode='subsystem' type='pci' managed='yes'>
      <source>
        <address domain='0x0001' bus='0x03' slot='0x00' function='0x0'/>
      </source>
      <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
    </hostdev>

the converted command line:

  -device ,host=0001:03:00.0,id=hostdev0,bus=pci.0,addr=0x5

After this patch, virsh gives an error message:

  virsh domxml-to-native qemu-argv /tmp/tmp.xml
  error: internal error: invalid PCI passthrough type 'default'

Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
---

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index e115004210..4e074e5c34 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -4883,7 +4883,7 @@ qemuBuildPCIHostdevDevStr(virDomainDefPtr def,
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("invalid PCI passthrough type '%s'"),
                        virDomainHostdevSubsysPCIBackendTypeToString(backend));
-        break;
+        goto error;
     }
 
     virBufferAddLit(&buf, ",host=");