qemu: Don't assign alias to disabled balloon device

<memballoon model='none'/> is the only way to disable balloon driver
since libvirt will add one automatically if the memballoon element is
missing. In other words, there's no balloon device if model is 'none'
and generating an alias for it makes no sense. The alias will be ignored
when parsing the XML and it will disappear once libvirtd is restarted.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>

src/qemu/qemu_alias.c

@@ -612,7 +612,8 @@ qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCapsPtr qemuCaps)
         if (qemuAssignDeviceWatchdogAlias(def->watchdog) < 0)
             return -1;
     }
-    if (def->memballoon) {
+    if (def->memballoon &&
+        def->memballoon->model != VIR_DOMAIN_MEMBALLOON_MODEL_NONE) {
         if (qemuAssingDeviceMemballoonAlias(def->memballoon, 0) < 0)
             return -1;
     }

tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml

@@ -50,9 +50,7 @@
     <input type='keyboard' bus='ps2'>
       <alias name='input1'/>
     </input>
-    <memballoon model='none'>
+    <memballoon model='none'/>
-      <alias name='balloon0'/>
-    </memballoon>
     <panic model='s390'/>
   </devices>
   <seclabel type='none' model='none'/>

tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml

@@ -60,9 +60,7 @@
     <input type='keyboard' bus='ps2'>
       <alias name='input1'/>
     </input>
-    <memballoon model='none'>
+    <memballoon model='none'/>
-      <alias name='balloon0'/>
-    </memballoon>
     <panic model='s390'/>
   </devices>
   <seclabel type='none' model='none'/>

tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml

@@ -50,9 +50,7 @@
     <input type='keyboard' bus='ps2'>
       <alias name='input1'/>
     </input>
-    <memballoon model='none'>
+    <memballoon model='none'/>
-      <alias name='balloon0'/>
-    </memballoon>
     <panic model='s390'/>
   </devices>
   <seclabel type='none' model='none'/>

tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml

@@ -59,9 +59,7 @@
     <input type='keyboard' bus='ps2'>
       <alias name='input1'/>
     </input>
-    <memballoon model='none'>
+    <memballoon model='none'/>
-      <alias name='balloon0'/>
-    </memballoon>
     <panic model='s390'/>
   </devices>
   <seclabel type='none' model='none'/>

tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml

@@ -59,9 +59,7 @@
     <input type='keyboard' bus='ps2'>
       <alias name='input1'/>
     </input>
-    <memballoon model='none'>
+    <memballoon model='none'/>
-      <alias name='balloon0'/>
-    </memballoon>
     <panic model='s390'/>
   </devices>
   <seclabel type='none' model='none'/>

tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio.xml

@@ -49,9 +49,7 @@
     <input type='keyboard' bus='ps2'>
       <alias name='input1'/>
     </input>
-    <memballoon model='none'>
+    <memballoon model='none'/>
-      <alias name='balloon0'/>
-    </memballoon>
     <panic model='s390'/>
   </devices>
   <seclabel type='none' model='none'/>

tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml

@@ -40,9 +40,7 @@
     <input type='keyboard' bus='ps2'>
       <alias name='input1'/>
     </input>
-    <memballoon model='none'>
+    <memballoon model='none'/>
-      <alias name='balloon0'/>
-    </memballoon>
     <panic model='s390'/>
   </devices>
   <seclabel type='none' model='none'/>

tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi-wwn+disk-scsi-duplicate-wwn.xml

@@ -66,9 +66,7 @@
     <input type='keyboard' bus='ps2'>
       <alias name='input1'/>
     </input>
-    <memballoon model='none'>
+    <memballoon model='none'/>
-      <alias name='balloon0'/>
-    </memballoon>
   </devices>
   <seclabel type='none' model='none'/>
 </domain>

tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi.xml

@@ -54,9 +54,7 @@
     <input type='keyboard' bus='ps2'>
       <alias name='input1'/>
     </input>
-    <memballoon model='none'>
+    <memballoon model='none'/>
-      <alias name='balloon0'/>
-    </memballoon>
   </devices>
   <seclabel type='none' model='none'/>
 </domain>

tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-usb.xml

@@ -54,9 +54,7 @@
     <input type='keyboard' bus='ps2'>
       <alias name='input1'/>
     </input>
-    <memballoon model='none'>
+    <memballoon model='none'/>
-      <alias name='balloon0'/>
-    </memballoon>
   </devices>
   <seclabel type='none' model='none'/>
 </domain>

tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-virtio.xml

@@ -54,9 +54,7 @@
     <input type='keyboard' bus='ps2'>
       <alias name='input1'/>
     </input>
-    <memballoon model='none'>
+    <memballoon model='none'/>
-      <alias name='balloon0'/>
-    </memballoon>
   </devices>
   <seclabel type='none' model='none'/>
 </domain>

tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-doorbell.xml

@@ -44,9 +44,7 @@
     <input type='keyboard' bus='ps2'>
       <alias name='input1'/>
     </input>
-    <memballoon model='none'>
+    <memballoon model='none'/>
-      <alias name='balloon0'/>
-    </memballoon>
     <shmem name='shmem0'>
       <model type='ivshmem-plain'/>
       <size unit='M'>4</size>

tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-plain.xml

@@ -44,9 +44,7 @@
     <input type='keyboard' bus='ps2'>
       <alias name='input1'/>
     </input>
-    <memballoon model='none'>
+    <memballoon model='none'/>
-      <alias name='balloon0'/>
-    </memballoon>
     <shmem name='shmem0'>
       <model type='ivshmem-plain'/>
       <size unit='M'>4</size>

tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent.xml

@@ -50,9 +50,7 @@
     <input type='keyboard' bus='ps2'>
       <alias name='input1'/>
     </input>
-    <memballoon model='none'>
+    <memballoon model='none'/>
-      <alias name='balloon0'/>
-    </memballoon>
   </devices>
   <seclabel type='none' model='none'/>
 </domain>

tests/qemuhotplugtestdomains/qemuhotplug-base-live+watchdog-user-alias.xml

@@ -48,9 +48,7 @@
       <alias name='ua-UserWatchdog'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
     </watchdog>
-    <memballoon model='none'>
+    <memballoon model='none'/>
-      <alias name='balloon0'/>
-    </memballoon>
   </devices>
   <seclabel type='none' model='none'/>
 </domain>

tests/qemuhotplugtestdomains/qemuhotplug-base-live+watchdog.xml

@@ -48,9 +48,7 @@
       <alias name='watchdog0'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
     </watchdog>
-    <memballoon model='none'>
+    <memballoon model='none'/>
-      <alias name='balloon0'/>
-    </memballoon>
   </devices>
   <seclabel type='none' model='none'/>
 </domain>

tests/qemuhotplugtestdomains/qemuhotplug-base-live.xml

@@ -44,9 +44,7 @@
     <input type='keyboard' bus='ps2'>
       <alias name='input1'/>
     </input>
-    <memballoon model='none'>
+    <memballoon model='none'/>
-      <alias name='balloon0'/>
-    </memballoon>
   </devices>
   <seclabel type='none' model='none'/>
 </domain>

tests/qemuhotplugtestdomains/qemuhotplug-base-with-scsi-controller-live.xml

@@ -48,9 +48,7 @@
     <input type='keyboard' bus='ps2'>
       <alias name='input1'/>
     </input>
-    <memballoon model='none'>
+    <memballoon model='none'/>
-      <alias name='balloon0'/>
-    </memballoon>
   </devices>
   <seclabel type='none' model='none'/>
 </domain>

tests/qemuhotplugtestdomains/qemuhotplug-base-without-scsi-controller-live+disk-scsi-2.xml

@@ -58,9 +58,7 @@
     <input type='keyboard' bus='ps2'>
       <alias name='input1'/>
     </input>
-    <memballoon model='none'>
+    <memballoon model='none'/>
-      <alias name='balloon0'/>
-    </memballoon>
   </devices>
   <seclabel type='none' model='none'/>
 </domain>