[libvirt] [PATCH] qemu: assume virtio-memballon without an address to be PCI

[Eric Blake]

On 04/26/2013 05:51 AM, Ján Tomko wrote:
> When doing XML-to-native conversion, addresses are not assigned.
> The code building memballon device string assumed they are and

s/memballon/memballoon/

> returned an error without reporting any error message, leading to:
>     error: An error occurred, but the cause is unknown
> 
> Assume that address type none means it's a PCI device, as we do
> for other virtio devices.
> 
> Fixes https://bugzilla.redhat.com/show_bug.cgi?id=957077
> ---
> 
> This still leaves XML-to-native conversion broken for S390
> machines, not just for memballon, but for other virtio devices
> as well. Should we assign addresses in DomainXMLToNative as well,
> or just decide which virtio device to add based on the machine type?

> +++ b/src/qemu/qemu_command.c
> @@ -4083,14 +4083,12 @@ qemuBuildMemballoonDevStr(virDomainMemballoonDefPtr dev,
>      virBuffer buf = VIR_BUFFER_INITIALIZER;
>  
>      switch (dev->info.type) {
> -        case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI:
> -            virBufferAddLit(&buf, "virtio-balloon-pci");
> -            break;

I don't like removing this case.

>          case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW:
>              virBufferAddLit(&buf, "virtio-balloon-ccw");
>              break;
>          default:
> -            goto error;
> +            virBufferAddLit(&buf, "virtio-balloon-pci");
> +            break;

And here, I think we might be better off doing a machine-type query,
instead of hard-coding the answer.

This is worth fixing for 1.0.5; but I think we need a v2.

-- 
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: 621 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20130426/c63db9d1/attachment-0001.sig>