diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-06-27 11:25:23 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-06-27 11:25:23 -0500 |
| commit | bb820c03e2d638038fd48f42ee71e4004e55aba8 (patch) | |
| tree | 43266acaef2a63fcd06de565a42c264a4f71e95f /hw/virtio-serial-bus.c | |
| parent | 2fb0c09f4ff036f68474277ed4edc036f6529de8 (diff) | |
| parent | 20fa53ece42bec6ce5db801bead125277b26ab8a (diff) | |
| download | focaccia-qemu-bb820c03e2d638038fd48f42ee71e4004e55aba8.tar.gz focaccia-qemu-bb820c03e2d638038fd48f42ee71e4004e55aba8.zip | |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
Diffstat (limited to 'hw/virtio-serial-bus.c')
| -rw-r--r-- | hw/virtio-serial-bus.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/hw/virtio-serial-bus.c b/hw/virtio-serial-bus.c index 9a12104982..bff4004bcc 100644 --- a/hw/virtio-serial-bus.c +++ b/hw/virtio-serial-bus.c @@ -337,7 +337,7 @@ static void handle_control_message(VirtIOSerial *vser, void *buf, size_t len) switch(cpkt.event) { case VIRTIO_CONSOLE_DEVICE_READY: if (!cpkt.value) { - error_report("virtio-serial-bus: Guest failure in adding device %s\n", + error_report("virtio-serial-bus: Guest failure in adding device %s", vser->bus.qbus.name); break; } @@ -352,7 +352,7 @@ static void handle_control_message(VirtIOSerial *vser, void *buf, size_t len) case VIRTIO_CONSOLE_PORT_READY: if (!cpkt.value) { - error_report("virtio-serial-bus: Guest failure in adding port %u for device %s\n", + error_report("virtio-serial-bus: Guest failure in adding port %u for device %s", port->id, vser->bus.qbus.name); break; } @@ -741,7 +741,7 @@ static int virtser_port_qdev_init(DeviceState *qdev, DeviceInfo *base) plugging_port0 = info->is_console && !find_port_by_id(port->vser, 0); if (find_port_by_id(port->vser, port->id)) { - error_report("virtio-serial-bus: A port already exists at id %u\n", + error_report("virtio-serial-bus: A port already exists at id %u", port->id); return -1; } @@ -752,7 +752,7 @@ static int virtser_port_qdev_init(DeviceState *qdev, DeviceInfo *base) } else { port->id = find_free_port_id(port->vser); if (port->id == VIRTIO_CONSOLE_BAD_ID) { - error_report("virtio-serial-bus: Maximum port limit for this device reached\n"); + error_report("virtio-serial-bus: Maximum port limit for this device reached"); return -1; } } @@ -760,7 +760,7 @@ static int virtser_port_qdev_init(DeviceState *qdev, DeviceInfo *base) max_nr_ports = tswap32(port->vser->config.max_nr_ports); if (port->id >= max_nr_ports) { - error_report("virtio-serial-bus: Out-of-range port id specified, max. allowed: %u\n", + error_report("virtio-serial-bus: Out-of-range port id specified, max. allowed: %u", max_nr_ports - 1); return -1; } |