ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

s390x: fix qom-ification fall-out 

Tested-by: Andreas Faerber <afaerber@suse.de>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Anthony Liguori 2012-02-06 11:07:18 -06:00
parent 4cafe60604
commit e87f7fc679
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/s390-virtio-bus.c
View File

@ -429,6 +429,7 @@ static TypeInfo virtio_s390_device_info = {
.parent = TYPE_DEVICE, .parent = TYPE_DEVICE,
.instance_size = sizeof(VirtIOS390Device), .instance_size = sizeof(VirtIOS390Device),
.class_init = virtio_s390_device_class_init, .class_init = virtio_s390_device_class_init,
.class_size = sizeof(VirtIOS390DeviceClass),
.abstract = true, .abstract = true,
}; };

6
vl.c
View File

@ -1947,7 +1947,11 @@ static int virtcon_parse(const char *devname)
} }
bus_opts = qemu_opts_create(device, NULL, 0); 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); dev_opts = qemu_opts_create(device, NULL, 0);
qemu_opt_set(dev_opts, "driver", "virtconsole"); qemu_opt_set(dev_opts, "driver", "virtconsole");