aboutsummaryrefslogtreecommitdiff
path: root/hw/s390-virtio-bus.h
diff options
context:
space:
mode:
authorAlexander Graf <agraf@suse.de>2011-03-29 15:29:31 +0200
committerAurelien Jarno <aurelien@aurel32.net>2011-04-04 00:34:10 +0200
commit6be9b4147adb27f78ec944af5abfc97e7cd0d066 (patch)
treec5fc629b8e9c7f0c9dfe7a8ee891469e35943631 /hw/s390-virtio-bus.h
parent359507eed1b6d8ae2392e0c8fe32d5f0de9d1d75 (diff)
s390x: fix s390-virtio-serial
Commit 6b331efb733a0f913ddc0b7762a1307dec304061 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>
Diffstat (limited to 'hw/s390-virtio-bus.h')
-rw-r--r--hw/s390-virtio-bus.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/s390-virtio-bus.h b/hw/s390-virtio-bus.h
index 33379a3ba4..edf6d04570 100644
--- a/hw/s390-virtio-bus.h
+++ b/hw/s390-virtio-bus.h
@@ -18,6 +18,7 @@
*/
#include "virtio-net.h"
+#include "virtio-serial.h"
#define VIRTIO_DEV_OFFS_TYPE 0 /* 8 bits */
#define VIRTIO_DEV_OFFS_NUM_VQ 1 /* 8 bits */
@@ -43,8 +44,7 @@ typedef struct VirtIOS390Device {
BlockConf block;
NICConf nic;
uint32_t host_features;
- /* Max. number of ports we can have for a the virtio-serial device */
- uint32_t max_virtserial_ports;
+ virtio_serial_conf serial;
virtio_net_conf net;
} VirtIOS390Device;