diff options
| author | Markus Armbruster | 2011-06-22 14:03:54 +0200 |
|---|---|---|
| committer | Stefan Hajnoczi | 2011-06-24 10:13:36 +0200 |
| commit | 6daf194dde15acda153b824299f36f12dfa527a6 (patch) | |
| tree | e501eb043697f6ec77338ef8fe4cb5602177fdb0 /hw/virtio.c | |
| parent | sheepdog: qemu_bh_new() can't return null pointer, drop check (diff) | |
| download | qemu-6daf194dde15acda153b824299f36f12dfa527a6.tar.gz qemu-6daf194dde15acda153b824299f36f12dfa527a6.tar.xz qemu-6daf194dde15acda153b824299f36f12dfa527a6.zip | |
Strip trailing '\n' from error_report()'s first argument
error_report() prepends location, and appends a newline. The message
constructed from the arguments should not contain a newline. Fix the
obvious offenders.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Diffstat (limited to 'hw/virtio.c')
| -rw-r--r-- | hw/virtio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/virtio.c b/hw/virtio.c index e6043de827..cc47a06a4e 100644 --- a/hw/virtio.c +++ b/hw/virtio.c @@ -797,7 +797,7 @@ int virtio_load(VirtIODevice *vdev, QEMUFile *f) /* Check it isn't doing very strange things with descriptor numbers. */ if (nheads > vdev->vq[i].vring.num) { error_report("VQ %d size 0x%x Guest index 0x%x " - "inconsistent with Host index 0x%x: delta 0x%x\n", + "inconsistent with Host index 0x%x: delta 0x%x", i, vdev->vq[i].vring.num, vring_avail_idx(&vdev->vq[i]), vdev->vq[i].last_avail_idx, nheads); @@ -805,7 +805,7 @@ int virtio_load(VirtIODevice *vdev, QEMUFile *f) } } else if (vdev->vq[i].last_avail_idx) { error_report("VQ %d address 0x0 " - "inconsistent with Host index 0x%x\n", + "inconsistent with Host index 0x%x", i, vdev->vq[i].last_avail_idx); return -1; } |