[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/9] Strip trailing '\n' from error_report()'s first
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH 2/9] Strip trailing '\n' from error_report()'s first argument (again) |
Date: |
Fri, 6 Jan 2012 15:51:21 +0000 |
From: Markus Armbruster <address@hidden>
Commit 6daf194d got rid of them, but Hans and Gerd added some more
lately. Tracked down with this Coccinelle semantic patch:
@r@
expression fmt;
position p;
@@
error_report(fmt, ...)@p
@script:python@
fmt << r.fmt;
p << r.p;
@@
if "\\n" in str(fmt):
print "%s:%s:%s:%s" % (p[0].file, p[0].line, p[0].column, fmt)
Signed-off-by: Markus Armbruster <address@hidden>
---
hw/usb-bus.c | 12 ++++++------
usb-redir.c | 4 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/hw/usb-bus.c b/hw/usb-bus.c
index 8203390..bd4afa7 100644
--- a/hw/usb-bus.c
+++ b/hw/usb-bus.c
@@ -137,7 +137,7 @@ USBDevice *usb_create(USBBus *bus, const char *name)
bus = usb_bus_find(-1);
if (!bus)
return NULL;
- error_report("%s: no bus specified, using \"%s\" for \"%s\"\n",
+ error_report("%s: no bus specified, using \"%s\" for \"%s\"",
__FUNCTION__, bus->qbus.name, name);
}
#endif
@@ -152,12 +152,12 @@ USBDevice *usb_create_simple(USBBus *bus, const char
*name)
int rc;
if (!dev) {
- error_report("Failed to create USB device '%s'\n", name);
+ error_report("Failed to create USB device '%s'", name);
return NULL;
}
rc = qdev_init(&dev->qdev);
if (rc < 0) {
- error_report("Failed to initialize USB device '%s'\n", name);
+ error_report("Failed to initialize USB device '%s'", name);
return NULL;
}
return dev;
@@ -244,7 +244,7 @@ int usb_claim_port(USBDevice *dev)
}
}
if (port == NULL) {
- error_report("Error: usb port %s (bus %s) not found (in use?)\n",
+ error_report("Error: usb port %s (bus %s) not found (in use?)",
dev->port_path, bus->qbus.name);
return -1;
}
@@ -255,7 +255,7 @@ int usb_claim_port(USBDevice *dev)
}
if (bus->nfree == 0) {
error_report("Error: tried to attach usb device %s to a bus "
- "with no free ports\n", dev->product_desc);
+ "with no free ports", dev->product_desc);
return -1;
}
port = QTAILQ_FIRST(&bus->free);
@@ -302,7 +302,7 @@ int usb_device_attach(USBDevice *dev)
if (!(port->speedmask & dev->speedmask)) {
error_report("Warning: speed mismatch trying to attach "
- "usb device %s to bus %s\n",
+ "usb device %s to bus %s",
dev->product_desc, bus->qbus.name);
return -1;
}
diff --git a/usb-redir.c b/usb-redir.c
index a36f2a7..2b53cf3 100644
--- a/usb-redir.c
+++ b/usb-redir.c
@@ -174,7 +174,7 @@ static void usbredir_log(void *priv, int level, const char
*msg)
return;
}
- error_report("%s\n", msg);
+ error_report("%s", msg);
}
static void usbredir_log_data(USBRedirDevice *dev, const char *desc,
@@ -193,7 +193,7 @@ static void usbredir_log_data(USBRedirDevice *dev, const
char *desc,
for (j = 0; j < 8 && i + j < len; j++) {
n += sprintf(buf + n, " %02X", data[i + j]);
}
- error_report("%s\n", buf);
+ error_report("%s", buf);
}
}
--
1.7.7.3
- [Qemu-devel] [PULL 0/9] Trivial patches for 20 December 2011 to 6 January 2012, Stefan Hajnoczi, 2012/01/06
- [Qemu-devel] [PATCH 5/9] configure: Fix test for supported host CPU type, Stefan Hajnoczi, 2012/01/06
- [Qemu-devel] [PATCH 3/9] scsi virtio-blk usb-msd: Clean up device init error messages, Stefan Hajnoczi, 2012/01/06
- [Qemu-devel] [PATCH 7/9] net/socket.c: Fix fd leak in net_socket_listen_init() error paths, Stefan Hajnoczi, 2012/01/06
- [Qemu-devel] [PATCH 2/9] Strip trailing '\n' from error_report()'s first argument (again),
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH 8/9] Make python mandatory, Stefan Hajnoczi, 2012/01/06
- [Qemu-devel] [PATCH 6/9] gdbstub: Fix fd leak in gdbserver_open() error path, Stefan Hajnoczi, 2012/01/06
- [Qemu-devel] [PATCH 1/9] qemu-options.hx: fix tls-channel help text, Stefan Hajnoczi, 2012/01/06
- [Qemu-devel] [PATCH 4/9] configure: CONFIG_QEMU_INTERP_PREFIX only for user mode, Stefan Hajnoczi, 2012/01/06
- [Qemu-devel] [PATCH 9/9] qemu-nbd: drop loop which can never loop, Stefan Hajnoczi, 2012/01/06
- Re: [Qemu-devel] [PULL 0/9] Trivial patches for 20 December 2011 to 6 January 2012, Anthony Liguori, 2012/01/09