From e87f7fc67948da80a0452c4fd523ec45f0d03f26 Mon Sep 17 00:00:00 2001
From: Anthony Liguori <aliguori@us.ibm.com>
Date: Mon, 6 Feb 2012 11:07:18 -0600
Subject: [PATCH] s390x: fix qom-ification fall-out
Tested-by: Andreas Faerber <afaerber@suse.de>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---
hw/s390-virtio-bus.c | 1 +
vl.c | 6 +++++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/hw/s390-virtio-bus.c b/hw/s390-virtio-bus.c
index b66ef68bc2..49140f8a9e 100644
--- a/hw/s390-virtio-bus.c
+++ b/hw/s390-virtio-bus.c
@@ -429,6 +429,7 @@ static TypeInfo virtio_s390_device_info = {
.parent = TYPE_DEVICE,
.instance_size = sizeof(VirtIOS390Device),
.class_init = virtio_s390_device_class_init,
+ .class_size = sizeof(VirtIOS390DeviceClass),
.abstract = true,
};
diff --git a/vl.c b/vl.c
index 2d464cf65c..63dd725216 100644
--- a/vl.c
+++ b/vl.c
@@ -1947,7 +1947,11 @@ static int virtcon_parse(const char *devname)
}
bus_opts = qemu_opts_create(device, NULL, 0);
- qemu_opt_set(bus_opts, "driver", "virtio-serial");
+ if (arch_type == QEMU_ARCH_S390X) {
+ qemu_opt_set(bus_opts, "driver", "virtio-serial-s390");
+ } else {
+ qemu_opt_set(bus_opts, "driver", "virtio-serial-pci");
+ }
dev_opts = qemu_opts_create(device, NULL, 0);
qemu_opt_set(dev_opts, "driver", "virtconsole");