diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-01-09 17:59:16 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-01-09 17:59:16 +0000 |
| commit | 11fe680858653e32782b1c24f939e77427f285b4 (patch) | |
| tree | 90ee78199ad45a89cd33d6ca764640785326451f /include/hw | |
| parent | a4ba200894e851f4df9be67eb2d091333a17f499 (diff) | |
| parent | 08f432aa3eb62d6d781eaa085e161e8628a9a538 (diff) | |
| download | qemu-11fe680858653e32782b1c24f939e77427f285b4.zip qemu-11fe680858653e32782b1c24f939e77427f285b4.tar.gz qemu-11fe680858653e32782b1c24f939e77427f285b4.tar.bz2 | |
Merge remote-tracking branch 'remotes/amit/tags/for-2.3' into staging
Migration fix for virtio-serial devices on bi-endian targets by David
Gibson.
# gpg: Signature made Mon 05 Jan 2015 07:26:07 GMT using RSA key ID 854083B6
# gpg: Good signature from "Amit Shah <amit@amitshah.net>"
# gpg: aka "Amit Shah <amit@kernel.org>"
# gpg: aka "Amit Shah <amitshah@gmx.net>"
* remotes/amit/tags/for-2.3:
virtio-serial: Don't keep a persistent copy of config space
virtio_serial: Don't use vser->config.max_nr_ports internally
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw')
| -rw-r--r-- | include/hw/virtio/virtio-serial.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/hw/virtio/virtio-serial.h b/include/hw/virtio/virtio-serial.h index a679e54..11af978 100644 --- a/include/hw/virtio/virtio-serial.h +++ b/include/hw/virtio/virtio-serial.h @@ -207,8 +207,6 @@ struct VirtIOSerial { /* bitmap for identifying active ports */ uint32_t *ports_map; - struct virtio_console_config config; - struct VirtIOSerialPostLoad *post_load; virtio_serial_conf serial; |