s390x: fix s390-virtio-serial
Commit 6b331efb73
broke the s390 proxy version
of virtio-serial by only taking its PCI brother into account.
So let's adjust s390-virtio-serial the same way as its PCI counterpart, making
it compile and work again.
Signed-off-by: Alexander Graf <agraf@suse.de>
CC: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
This commit is contained in:
parent
359507eed1
commit
6be9b4147a
|
@ -139,7 +139,7 @@ static int s390_virtio_serial_init(VirtIOS390Device *dev)
|
||||||
|
|
||||||
bus = DO_UPCAST(VirtIOS390Bus, bus, dev->qdev.parent_bus);
|
bus = DO_UPCAST(VirtIOS390Bus, bus, dev->qdev.parent_bus);
|
||||||
|
|
||||||
vdev = virtio_serial_init((DeviceState *)dev, dev->max_virtserial_ports);
|
vdev = virtio_serial_init((DeviceState *)dev, &dev->serial);
|
||||||
if (!vdev) {
|
if (!vdev) {
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
@ -355,8 +355,8 @@ static VirtIOS390DeviceInfo s390_virtio_serial = {
|
||||||
.qdev.alias = "virtio-serial",
|
.qdev.alias = "virtio-serial",
|
||||||
.qdev.size = sizeof(VirtIOS390Device),
|
.qdev.size = sizeof(VirtIOS390Device),
|
||||||
.qdev.props = (Property[]) {
|
.qdev.props = (Property[]) {
|
||||||
DEFINE_PROP_UINT32("max_ports", VirtIOS390Device, max_virtserial_ports,
|
DEFINE_PROP_UINT32("max_ports", VirtIOS390Device,
|
||||||
31),
|
serial.max_virtserial_ports, 31),
|
||||||
DEFINE_PROP_END_OF_LIST(),
|
DEFINE_PROP_END_OF_LIST(),
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
|
@ -18,6 +18,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "virtio-net.h"
|
#include "virtio-net.h"
|
||||||
|
#include "virtio-serial.h"
|
||||||
|
|
||||||
#define VIRTIO_DEV_OFFS_TYPE 0 /* 8 bits */
|
#define VIRTIO_DEV_OFFS_TYPE 0 /* 8 bits */
|
||||||
#define VIRTIO_DEV_OFFS_NUM_VQ 1 /* 8 bits */
|
#define VIRTIO_DEV_OFFS_NUM_VQ 1 /* 8 bits */
|
||||||
|
@ -43,8 +44,7 @@ typedef struct VirtIOS390Device {
|
||||||
BlockConf block;
|
BlockConf block;
|
||||||
NICConf nic;
|
NICConf nic;
|
||||||
uint32_t host_features;
|
uint32_t host_features;
|
||||||
/* Max. number of ports we can have for a the virtio-serial device */
|
virtio_serial_conf serial;
|
||||||
uint32_t max_virtserial_ports;
|
|
||||||
virtio_net_conf net;
|
virtio_net_conf net;
|
||||||
} VirtIOS390Device;
|
} VirtIOS390Device;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue