[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

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



When doing XML-to-native conversion, addresses are not assigned.
The code building memballon device string assumed they are and
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?

 src/qemu/qemu_command.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 6f6b61b..6e1fff2 100644
--- a/src/qemu/qemu_command.c
+++ 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;
         case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW:
             virBufferAddLit(&buf, "virtio-balloon-ccw");
             break;
         default:
-            goto error;
+            virBufferAddLit(&buf, "virtio-balloon-pci");
+            break;
     }
 
     virBufferAsprintf(&buf, ",id=%s", dev->info.alias);
-- 
1.8.1.5


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]