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>
This commit is contained in:
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user