diff options
| author | Anthony Liguori | 2010-09-08 21:26:14 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2010-09-08 21:26:14 +0200 |
| commit | dccbe6fbab47c9a2589f436e0592933b47cbe40b (patch) | |
| tree | e5a851b48a3801dd28282eb17533975cade7ac23 /hw/s390-virtio-bus.h | |
| parent | virtio-9p: Change handling of flags in open() path for 9P2000.L (diff) | |
| parent | virtio-net: Introduce a new bottom half packet TX (diff) | |
| download | qemu-dccbe6fbab47c9a2589f436e0592933b47cbe40b.tar.gz qemu-dccbe6fbab47c9a2589f436e0592933b47cbe40b.tar.xz qemu-dccbe6fbab47c9a2589f436e0592933b47cbe40b.zip | |
Merge remote branch 'mst/for_anthony' into staging
Diffstat (limited to 'hw/s390-virtio-bus.h')
| -rw-r--r-- | hw/s390-virtio-bus.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/s390-virtio-bus.h b/hw/s390-virtio-bus.h index 333fea8963..41558c9c67 100644 --- a/hw/s390-virtio-bus.h +++ b/hw/s390-virtio-bus.h @@ -43,6 +43,7 @@ typedef struct VirtIOS390Device { uint32_t host_features; /* Max. number of ports we can have for a the virtio-serial device */ uint32_t max_virtserial_ports; + virtio_net_conf net; } VirtIOS390Device; typedef struct VirtIOS390Bus { |