[libvirt] [PATCH v5 2/4] qemu: Add PCI-Express root to ARM virt machine

Michal Privoznik mprivozn at redhat.com
Thu Aug 6 12:35:14 UTC 2015


On 17.07.2015 13:27, Pavel Fedin wrote:
> Here we assume that if qemu supports generic PCI host controller,
> it is a part of virt machine and can be used for adding PCI devices.
> 
> In qemu this is actually a PCIe bus, so we also declare multibus
> capability so that 0'th bus is specified to qemu correctly as 'pcie.0'
> 
> Signed-off-by: Pavel Fedin <p.fedin at samsung.com>
> ---
>  src/qemu/qemu_capabilities.c |  8 ++++++++
>  src/qemu/qemu_domain.c       | 17 +++++++++++++----
>  2 files changed, 21 insertions(+), 4 deletions(-)
> 
> diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
> index d570fdd..f3486c7 100644
> --- a/src/qemu/qemu_capabilities.c
> +++ b/src/qemu/qemu_capabilities.c
> @@ -2138,6 +2138,14 @@ bool virQEMUCapsHasPCIMultiBus(virQEMUCapsPtr qemuCaps,
>          return false;
>      }
>  
> +    if (ARCH_IS_ARM(def->os.arch)) {
> +        /* If 'virt' supports PCI, it supports multibus.
> +         * No extra conditions here for simplicity.
> +         */
> +        if (STREQ(def->os.machine, "virt"))
> +            return true;
> +    }
> +
>      return false;
>  }
>  
> diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
> index 8b050a0..c7d14e4 100644
> --- a/src/qemu/qemu_domain.c
> +++ b/src/qemu/qemu_domain.c
> @@ -981,7 +981,7 @@ virDomainXMLNamespace virQEMUDriverDomainXMLNamespace = {
>  static int
>  qemuDomainDefPostParse(virDomainDefPtr def,
>                         virCapsPtr caps,
> -                       void *opaque ATTRIBUTE_UNUSED)
> +                       void *opaque)
>  {
>      bool addDefaultUSB = true;
>      bool addImplicitSATA = false;
> @@ -1030,12 +1030,21 @@ qemuDomainDefPostParse(virDomainDefPtr def,
>          break;
>  
>      case VIR_ARCH_ARMV7L:
> -       addDefaultUSB = false;
> -       addDefaultMemballoon = false;
> -       break;
>      case VIR_ARCH_AARCH64:
>         addDefaultUSB = false;
>         addDefaultMemballoon = false;
> +       if (STREQ(def->os.machine, "virt") ||
> +           STRPREFIX(def->os.machine, "virt-")) {
> +           virQEMUDriverPtr driver = opaque;

I believe this will be reused later. I'd like to make this variable function wide.

> +
> +           /* This condition is actually a (temporary) hack for test suite which
> +            * does not create capabilities cache */
> +           if (driver->qemuCapsCache) {
> +               virQEMUCapsPtr qemuCaps =
> +                   virQEMUCapsCacheLookup(driver->qemuCapsCache, def->emulator);
> +               addPCIeRoot = virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_GPEX);

You actually need to unref the @qemuCaps when no longer needed.

> +           }
> +       }
>         break;
>  
>      case VIR_ARCH_PPC64:
> 


ACK with this squashed in:

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 42c9753..02906d3 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -983,6 +983,8 @@ qemuDomainDefPostParse(virDomainDefPtr def,
                        virCapsPtr caps,
                        void *opaque)
 {
+    virQEMUDriverPtr driver = opaque;
+    virQEMUCapsPtr qemuCaps = NULL;
     bool addDefaultUSB = true;
     bool addImplicitSATA = false;
     bool addPCIRoot = false;
@@ -991,17 +993,24 @@ qemuDomainDefPostParse(virDomainDefPtr def,
     bool addDefaultUSBKBD = false;
     bool addDefaultUSBMouse = false;
     bool addPanicDevice = false;
+    int ret = -1;
 
     if (def->os.bootloader || def->os.bootloaderArgs) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                        _("bootloader is not supported by QEMU"));
-        return -1;
+        return ret;
     }
 
     /* check for emulator and create a default one if needed */
     if (!def->emulator &&
         !(def->emulator = virDomainDefGetDefaultEmulator(def, caps)))
-        return -1;
+        return ret;
+
+
+    /* This condition is actually a (temporary) hack for test suite which
+     * does not create capabilities cache */
+    if (driver->qemuCapsCache)
+        qemuCaps = virQEMUCapsCacheLookup(driver->qemuCapsCache, def->emulator);
 
     /* Add implicit PCI root controller if the machine has one */
     switch (def->os.arch) {
@@ -1031,21 +1040,13 @@ qemuDomainDefPostParse(virDomainDefPtr def,
 
     case VIR_ARCH_ARMV7L:
     case VIR_ARCH_AARCH64:
-       addDefaultUSB = false;
-       addDefaultMemballoon = false;
-       if (STREQ(def->os.machine, "virt") ||
-           STRPREFIX(def->os.machine, "virt-")) {
-           virQEMUDriverPtr driver = opaque;
-
-           /* This condition is actually a (temporary) hack for test suite which
-            * does not create capabilities cache */
-           if (driver->qemuCapsCache) {
-               virQEMUCapsPtr qemuCaps =
-                   virQEMUCapsCacheLookup(driver->qemuCapsCache, def->emulator);
-               addPCIeRoot = virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_GPEX);
-           }
-       }
-       break;
+        addDefaultUSB = false;
+        addDefaultMemballoon = false;
+        if (STREQ(def->os.machine, "virt") ||
+            STRPREFIX(def->os.machine, "virt-")) {
+            addPCIeRoot = virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_GPEX);
+        }
+        break;
 
     case VIR_ARCH_PPC64:
     case VIR_ARCH_PPC64LE:
@@ -1085,18 +1086,18 @@ qemuDomainDefPostParse(virDomainDefPtr def,
     if (addDefaultUSB &&
         virDomainDefMaybeAddController(
             def, VIR_DOMAIN_CONTROLLER_TYPE_USB, 0, -1) < 0)
-        return -1;
+        goto cleanup;
 
     if (addImplicitSATA &&
         virDomainDefMaybeAddController(
             def, VIR_DOMAIN_CONTROLLER_TYPE_SATA, 0, -1) < 0)
-        return -1;
+        goto cleanup;
 
     if (addPCIRoot &&
         virDomainDefMaybeAddController(
             def, VIR_DOMAIN_CONTROLLER_TYPE_PCI, 0,
             VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT) < 0)
-        return -1;
+        goto cleanup;
 
     /* When a machine has a pcie-root, make sure that there is always
      * a dmi-to-pci-bridge controller added as bus 1, and a pci-bridge
@@ -1112,14 +1113,14 @@ qemuDomainDefPostParse(virDomainDefPtr def,
             virDomainDefMaybeAddController(
                 def, VIR_DOMAIN_CONTROLLER_TYPE_PCI, 2,
                 VIR_DOMAIN_CONTROLLER_MODEL_PCI_BRIDGE) < 0) {
-        return -1;
+            goto cleanup;
         }
     }
 
     if (addDefaultMemballoon && !def->memballoon) {
         virDomainMemballoonDefPtr memballoon;
         if (VIR_ALLOC(memballoon) < 0)
-            return -1;
+            goto cleanup;
 
         memballoon->model = VIR_DOMAIN_MEMBALLOON_MODEL_VIRTIO;
         def->memballoon = memballoon;
@@ -1130,24 +1131,27 @@ qemuDomainDefPostParse(virDomainDefPtr def,
         virDomainDefMaybeAddInput(def,
                                   VIR_DOMAIN_INPUT_TYPE_KBD,
                                   VIR_DOMAIN_INPUT_BUS_USB) < 0)
-        return -1;
+        goto cleanup;
 
     if (addDefaultUSBMouse &&
         def->ngraphics > 0 &&
         virDomainDefMaybeAddInput(def,
                                   VIR_DOMAIN_INPUT_TYPE_MOUSE,
                                   VIR_DOMAIN_INPUT_BUS_USB) < 0)
-        return -1;
+        goto cleanup;
 
     if (addPanicDevice && !def->panic) {
         virDomainPanicDefPtr panic;
         if (VIR_ALLOC(panic) < 0)
-            return -1;
+            goto cleanup;
 
         def->panic = panic;
     }
 
-    return 0;
+    ret = 0;
+ cleanup:
+    virObjectUnref(qemuCaps);
+    return ret;
 }
 
 static const char *


Michal




More information about the libvir-list mailing list