mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-10-03 09:44:00 +00:00
virtio-serial: fix command line compatibility.
The bus name is wrong since the refactoring. This keeps the behaviour of the command line. Signed-off-by: KONRAD Frederic <fred.konrad@greensocs.com> Tested-by: Cornelia Huck <cornelia.huck@de.ibm.com> Message-id: 1367330931-12994-5-git-send-email-fred.konrad@greensocs.com Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
11fc853c4c
commit
80270a1968
|
@ -911,7 +911,8 @@ static int virtio_serial_device_init(VirtIODevice *vdev)
|
||||||
sizeof(struct virtio_console_config));
|
sizeof(struct virtio_console_config));
|
||||||
|
|
||||||
/* Spawn a new virtio-serial bus on which the ports will ride as devices */
|
/* Spawn a new virtio-serial bus on which the ports will ride as devices */
|
||||||
qbus_create_inplace(&vser->bus.qbus, TYPE_VIRTIO_SERIAL_BUS, qdev, NULL);
|
qbus_create_inplace(&vser->bus.qbus, TYPE_VIRTIO_SERIAL_BUS, qdev,
|
||||||
|
vdev->bus_name);
|
||||||
vser->bus.qbus.allow_hotplug = 1;
|
vser->bus.qbus.allow_hotplug = 1;
|
||||||
vser->bus.vser = vser;
|
vser->bus.vser = vser;
|
||||||
QTAILQ_INIT(&vser->ports);
|
QTAILQ_INIT(&vser->ports);
|
||||||
|
|
|
@ -197,9 +197,20 @@ static int s390_virtio_serial_init(VirtIOS390Device *s390_dev)
|
||||||
DeviceState *qdev = DEVICE(s390_dev);
|
DeviceState *qdev = DEVICE(s390_dev);
|
||||||
VirtIOS390Bus *bus;
|
VirtIOS390Bus *bus;
|
||||||
int r;
|
int r;
|
||||||
|
char *bus_name;
|
||||||
|
|
||||||
bus = DO_UPCAST(VirtIOS390Bus, bus, qdev->parent_bus);
|
bus = DO_UPCAST(VirtIOS390Bus, bus, qdev->parent_bus);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* For command line compatibility, this sets the virtio-serial-device bus
|
||||||
|
* name as before.
|
||||||
|
*/
|
||||||
|
if (qdev->id) {
|
||||||
|
bus_name = g_strdup_printf("%s.0", qdev->id);
|
||||||
|
virtio_device_set_child_bus_name(VIRTIO_DEVICE(vdev), bus_name);
|
||||||
|
g_free(bus_name);
|
||||||
|
}
|
||||||
|
|
||||||
qdev_set_parent_bus(vdev, BUS(&s390_dev->bus));
|
qdev_set_parent_bus(vdev, BUS(&s390_dev->bus));
|
||||||
if (qdev_init(vdev) < 0) {
|
if (qdev_init(vdev) < 0) {
|
||||||
return -1;
|
return -1;
|
||||||
|
|
|
@ -593,6 +593,18 @@ static int virtio_ccw_serial_init(VirtioCcwDevice *ccw_dev)
|
||||||
{
|
{
|
||||||
VirtioSerialCcw *dev = VIRTIO_SERIAL_CCW(ccw_dev);
|
VirtioSerialCcw *dev = VIRTIO_SERIAL_CCW(ccw_dev);
|
||||||
DeviceState *vdev = DEVICE(&dev->vdev);
|
DeviceState *vdev = DEVICE(&dev->vdev);
|
||||||
|
DeviceState *proxy = DEVICE(ccw_dev);
|
||||||
|
char *bus_name;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* For command line compatibility, this sets the virtio-serial-device bus
|
||||||
|
* name as before.
|
||||||
|
*/
|
||||||
|
if (proxy->id) {
|
||||||
|
bus_name = g_strdup_printf("%s.0", proxy->id);
|
||||||
|
virtio_device_set_child_bus_name(VIRTIO_DEVICE(vdev), bus_name);
|
||||||
|
g_free(bus_name);
|
||||||
|
}
|
||||||
|
|
||||||
qdev_set_parent_bus(vdev, BUS(&ccw_dev->bus));
|
qdev_set_parent_bus(vdev, BUS(&ccw_dev->bus));
|
||||||
if (qdev_init(vdev) < 0) {
|
if (qdev_init(vdev) < 0) {
|
||||||
|
|
|
@ -1297,6 +1297,8 @@ static int virtio_serial_pci_init(VirtIOPCIProxy *vpci_dev)
|
||||||
{
|
{
|
||||||
VirtIOSerialPCI *dev = VIRTIO_SERIAL_PCI(vpci_dev);
|
VirtIOSerialPCI *dev = VIRTIO_SERIAL_PCI(vpci_dev);
|
||||||
DeviceState *vdev = DEVICE(&dev->vdev);
|
DeviceState *vdev = DEVICE(&dev->vdev);
|
||||||
|
DeviceState *proxy = DEVICE(vpci_dev);
|
||||||
|
char *bus_name;
|
||||||
|
|
||||||
if (vpci_dev->class_code != PCI_CLASS_COMMUNICATION_OTHER &&
|
if (vpci_dev->class_code != PCI_CLASS_COMMUNICATION_OTHER &&
|
||||||
vpci_dev->class_code != PCI_CLASS_DISPLAY_OTHER && /* qemu 0.10 */
|
vpci_dev->class_code != PCI_CLASS_DISPLAY_OTHER && /* qemu 0.10 */
|
||||||
|
@ -1310,6 +1312,16 @@ static int virtio_serial_pci_init(VirtIOPCIProxy *vpci_dev)
|
||||||
vpci_dev->nvectors = dev->vdev.serial.max_virtserial_ports + 1;
|
vpci_dev->nvectors = dev->vdev.serial.max_virtserial_ports + 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* For command line compatibility, this sets the virtio-serial-device bus
|
||||||
|
* name as before.
|
||||||
|
*/
|
||||||
|
if (proxy->id) {
|
||||||
|
bus_name = g_strdup_printf("%s.0", proxy->id);
|
||||||
|
virtio_device_set_child_bus_name(VIRTIO_DEVICE(vdev), bus_name);
|
||||||
|
g_free(bus_name);
|
||||||
|
}
|
||||||
|
|
||||||
qdev_set_parent_bus(vdev, BUS(&vpci_dev->bus));
|
qdev_set_parent_bus(vdev, BUS(&vpci_dev->bus));
|
||||||
if (qdev_init(vdev) < 0) {
|
if (qdev_init(vdev) < 0) {
|
||||||
return -1;
|
return -1;
|
||||||
|
|
Loading…
Reference in a new issue