[libvirt] [PATCH v2 1/1] qemu: Remove default memory balloon for PPC64

[Li Zhang]

From: Li Zhang <zhlcindy at linux.vnet.ibm.com>

It doesn't need to add a default memory balloon for PPC64.
Only if users want it, it can be added explicitly.

Signed-off-by: Li Zhang <zhlcindy at linux.vnet.ibm.com>
---
 v2 -> v1:
   * Fix one qemuargv2xmltest failure

 src/qemu/qemu_command.c                               | 12 ------------
 src/qemu/qemu_domain.c                                | 12 ++++++++----
 tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.xml |  1 -
 3 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 8dc7e43..a1e5387 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -11989,18 +11989,6 @@ qemuParseCommandLine(virCapsPtr qemuCaps,
         def->videos[def->nvideos++] = vid;
     }
 
-    /*
-     * having a balloon is the default, define one with type="none" to avoid it
-     */
-    if (!def->memballoon) {
-        virDomainMemballoonDefPtr memballoon;
-        if (VIR_ALLOC(memballoon) < 0)
-            goto error;
-        memballoon->model = VIR_DOMAIN_MEMBALLOON_MODEL_VIRTIO;
-
-        def->memballoon = memballoon;
-    }
-
     VIR_FREE(nics);
 
     if (virDomainDefAddImplicitControllers(def) < 0)
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 346fec3..0744e89 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -724,13 +724,17 @@ qemuDomainDefPostParse(virDomainDefPtr def,
         break;
 
     case VIR_ARCH_ARMV7L:
-       addDefaultUSB = false;
-       addDefaultMemballoon = false;
-       break;
+        addDefaultUSB = false;
+        addDefaultMemballoon = false;
+        break;
+
+    case VIR_ARCH_PPC64:
+        addPCIRoot = true;
+        addDefaultMemballoon = false;
+        break;
 
     case VIR_ARCH_ALPHA:
     case VIR_ARCH_PPC:
-    case VIR_ARCH_PPC64:
     case VIR_ARCH_PPCEMB:
     case VIR_ARCH_SH4:
     case VIR_ARCH_SH4EB:
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.xml b/tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.xml
index d001ee7..567d993 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.xml
@@ -16,7 +16,6 @@
     <emulator>/usr/bin/qemu-system-ppc64</emulator>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
-    <memballoon model='virtio'/>
     <nvram>
       <address type='spapr-vio' reg='0x4000'/>
     </nvram>
-- 
1.8.2.1