shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-20 18:03:50 +03:00
Code Releases Activity

virQEMUCapsHasPCIMultiBus: use def->os.arch

Browse Source 
We do not fill out qemuCaps->arch when parsing status XML.

Use def->os.arch like we do for PPC.

This fixes hotplug after daemon restart for domains that use
a user alias for the implicit pci-root on x86.

https://bugzilla.redhat.com/show_bug.cgi?id=1518148
This commit is contained in:
Ján Tomko 2017-11-29 14:51:22 +01:00
parent dacfc6b10b
commit fdf354fb51
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qemu/qemu_capabilities.c
View File

@ -2416,7 +2416,7 @@ bool virQEMUCapsHasPCIMultiBus(virQEMUCapsPtr qemuCaps,
{ {
/* x86_64 and i686 support PCI-multibus on all machine types /* x86_64 and i686 support PCI-multibus on all machine types
* since forever */ * since forever */
if (ARCH_IS_X86(qemuCaps->arch)) if (ARCH_IS_X86(def->os.arch))
return true; return true;
if (def->os.arch == VIR_ARCH_PPC || if (def->os.arch == VIR_ARCH_PPC ||

2
tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-live.xml
View File

@ -56,7 +56,7 @@
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
</controller> </controller>
<controller type='pci' index='0' model='pci-root'> <controller type='pci' index='0' model='pci-root'>
<alias name='pci'/> <alias name='pci.0'/>
</controller> </controller>
<input type='mouse' bus='ps2'> <input type='mouse' bus='ps2'>
<alias name='input0'/> <alias name='input0'/>

2
tests/qemuhotplugtestcpus/ppc64-modern-individual-result-live.xml
View File

@ -56,7 +56,7 @@
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
</controller> </controller>
<controller type='pci' index='0' model='pci-root'> <controller type='pci' index='0' model='pci-root'>
<alias name='pci'/> <alias name='pci.0'/>
</controller> </controller>
<input type='mouse' bus='ps2'> <input type='mouse' bus='ps2'>
<alias name='input0'/> <alias name='input0'/>

2
tests/qemuhotplugtestcpus/x86-modern-bulk-result-live.xml
View File

@ -32,7 +32,7 @@
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
</controller> </controller>
<controller type='pci' index='0' model='pci-root'> <controller type='pci' index='0' model='pci-root'>
<alias name='pci'/> <alias name='pci.0'/>
</controller> </controller>
<input type='mouse' bus='ps2'> <input type='mouse' bus='ps2'>
<alias name='input0'/> <alias name='input0'/>

2
tests/qemuhotplugtestcpus/x86-modern-individual-add-result-live.xml
View File

@ -32,7 +32,7 @@
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
</controller> </controller>
<controller type='pci' index='0' model='pci-root'> <controller type='pci' index='0' model='pci-root'>
<alias name='pci'/> <alias name='pci.0'/>
</controller> </controller>
<input type='mouse' bus='ps2'> <input type='mouse' bus='ps2'>
<alias name='input0'/> <alias name='input0'/>

2
tests/qemuhotplugtestcpus/x86-old-bulk-result-live.xml
View File

@ -22,7 +22,7 @@
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
</controller> </controller>
<controller type='pci' index='0' model='pci-root'> <controller type='pci' index='0' model='pci-root'>
<alias name='pci'/> <alias name='pci.0'/>
</controller> </controller>
<input type='mouse' bus='ps2'> <input type='mouse' bus='ps2'>
<alias name='input0'/> <alias name='input0'/>