mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

virtio-serial: Clean up virtser_bus_dev_print() output

Browse Source 
Old version looks like this in info qtree (last four lines):

          dev: virtconsole, id ""
            dev-prop: is_console = 1
            dev-prop: nr = 0
            dev-prop: chardev = <null>
            dev-prop: name = <null>
             dev-prop-int: id: 0
             dev-prop-int: guest_connected: 1
             dev-prop-int: host_connected: 0
             dev-prop-int: throttled: 0

Indentation is off, and "dev-prop-int" suggests these are properties
you can configure with -device, which isn't the case.  The other
buses' print_dev() callbacks don't do that.  For instance, PCI's
output looks like this:

        class Ethernet controller, addr 00:03.0, pci id 1af4:1000 (sub 1af4:0001)
        bar 0: i/o at 0xffffffffffffffff [0x1e]
        bar 1: mem at 0xffffffffffffffff [0xffe]
        bar 6: mem at 0xffffffffffffffff [0xfffe]

Change virtser_bus_dev_print() to that style.  Result:

          dev: virtconsole, id ""
            dev-prop: is_console = 1
            dev-prop: nr = 0
            dev-prop: chardev = <null>
            dev-prop: name = <null>
            port 0, guest on, host off, throttle off

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Markus Armbruster 2011-05-19 13:37:15 +02:00 committed by Anthony Liguori
parent 1cc2428cce
commit 021a131860
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hw/virtio-serial-bus.c
View File

@ -674,14 +674,11 @@ static void virtser_bus_dev_print(Monitor *mon, DeviceState *qdev, int indent)
{ {
VirtIOSerialPort *port = DO_UPCAST(VirtIOSerialPort, dev, qdev); VirtIOSerialPort *port = DO_UPCAST(VirtIOSerialPort, dev, qdev);
monitor_printf(mon, "%*s dev-prop-int: id: %u\n", monitor_printf(mon, "%*sport %d, guest %s, host %s, throttle %s\n",
indent, "", port->id); indent, "", port->id,
monitor_printf(mon, "%*s dev-prop-int: guest_connected: %d\n", port->guest_connected ? "on" : "off",
indent, "", port->guest_connected); port->host_connected ? "on" : "off",
monitor_printf(mon, "%*s dev-prop-int: host_connected: %d\n", port->throttled ? "on" : "off");
indent, "", port->host_connected);
monitor_printf(mon, "%*s dev-prop-int: throttled: %d\n",
indent, "", port->throttled);
} }
/* This function is only used if a port id is not provided by the user */ /* This function is only used if a port id is not provided by the user */