External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 04:15:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Don't assign alias to disabled balloon device

Browse Source 
<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>
This commit is contained in:
Jiri Denemark 2018-03-19 18:14:52 +01:00
parent 8ef5db6581
commit 1554eafbe6
20 changed files with 21 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/qemu/qemu_alias.c
View File

@ -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;
}

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

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

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

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

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

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

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

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

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

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

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

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

4
tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml
View File

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

4
tests/qemuhotplugtestdomains/qemuhotplug-base-live+watchdog.xml
View File

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

4
tests/qemuhotplugtestdomains/qemuhotplug-base-live.xml
View File

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

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

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

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

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