[libvirt] [PATCHv2] Fix explicit usage of default video PCI slots

[Eric Blake]

On 01/03/2014 04:06 AM, Ján Tomko wrote:
> Do not leave the PCI address of the primary video card set
> to the legacy default (0000:00:02.0) if we're doing two-pass
> allocation.
> 
> Since QEMU 1.6 (QEMU_CAPS_VIDEO_PRIMARY) we allow the primary
> video card to be on other slots than 0000:00:02.0 (as we use
> -device instead of -vga).
> 
> However we fail to assign it an address if:
> * another device explicitly uses 0000:00:02.0 and
> * the primary video device has no address specified
> 
> On the first pass, we have set the address to default, then checked
> if it's available, leaving it set even if it wasn't. This address
> got picked up by the second pass, resulting in a conflict:
> 
> XML error: Attempted double use of PCI slot 0000:00:02.0
> (may need "multifunction='on'" for device on function 0)
> 
> Also fix the test that was supposed to catch this.
> ---

ACK.

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 604 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20140104/f3d8e31c/attachment-0001.sig>