summary refs log tree commit diff stats
path: root/hw/char/virtio-serial-bus.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-01-14 11:16:50 +0000
committerPeter Maydell <peter.maydell@linaro.org>2016-01-14 11:16:50 +0000
commited56fdb25692920d2e2915b9c979ad477b0c018e (patch)
tree9af39937a52023ffe89559f085cd148408336026 /hw/char/virtio-serial-bus.c
parent91728bda76c1bfe49ac680af763154ec51988732 (diff)
parentd9eb0be229635a8c625a0a3d29d2d88aba1508a5 (diff)
downloadfocaccia-qemu-ed56fdb25692920d2e2915b9c979ad477b0c018e.tar.gz
focaccia-qemu-ed56fdb25692920d2e2915b9c979ad477b0c018e.zip
Merge remote-tracking branch 'remotes/amit/tags/vs-for-2.6-1' into staging
small change to qom'ify virtio-serial

# gpg: Signature made Wed 13 Jan 2016 09:51:18 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/vs-for-2.6-1:
  virtio serial port: fix to incomplete QOMify

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/char/virtio-serial-bus.c')
-rw-r--r--hw/char/virtio-serial-bus.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c
index 497b0afd9f..2d2a6594fc 100644
--- a/hw/char/virtio-serial-bus.c
+++ b/hw/char/virtio-serial-bus.c
@@ -798,7 +798,7 @@ static const TypeInfo virtser_bus_info = {
 
 static void virtser_bus_dev_print(Monitor *mon, DeviceState *qdev, int indent)
 {
-    VirtIOSerialPort *port = DO_UPCAST(VirtIOSerialPort, dev, qdev);
+    VirtIOSerialPort *port = VIRTIO_SERIAL_PORT(qdev);
 
     monitor_printf(mon, "%*sport %d, guest %s, host %s, throttle %s\n",
                    indent, "", port->id,