* [Qemu-devel] [PATCH trivial 0/5] Fix error_report() calls
@ 2011-06-22 12:03 Markus Armbruster
2011-06-22 12:03 ` [Qemu-devel] [PATCH trivial 1/5] sheepdog: qemu_bh_new() can't return null pointer, drop check Markus Armbruster
` (6 more replies)
0 siblings, 7 replies; 8+ messages in thread
From: Markus Armbruster @ 2011-06-22 12:03 UTC (permalink / raw)
To: qemu-devel; +Cc: stefanha
I limited myself to truly trivial fixes. I hope that's still useful
enough to excuse a little rant.
"bug: 0 0" is not a useful error message. Neither are "Desc next is
128", " too short" (too short indeed), "wrong magic" (some "wrong
magic" skills will be handy to figure out what went wrong). I'm
stopping here for brevity's sake, not for want of examples.
If you can't be bothered to provide an intelligible error message and
*test* it to verify it actually makes sense for the user, maybe you
should stick to assert() or something. Makes your laziness stand out
properly.
Markus Armbruster (5):
sheepdog: qemu_bh_new() can't return null pointer, drop check
Strip trailing '\n' from error_report()'s first argument
qemu-img: Don't prepend qemu-img to error messages twice.
Spell "unkown" correctly in error_report() arguments
blockdev: Put space after comma in error message
block-migration.c | 2 +-
block/qcow2.c | 2 +-
block/sheepdog.c | 90 ++++++++++++++++++++++-------------------------
blockdev.c | 2 +-
hw/lm32_sys.c | 2 +-
hw/lm32_timer.c | 4 +-
hw/lm32_uart.c | 4 +-
hw/milkymist-ac97.c | 4 +-
hw/milkymist-memcard.c | 4 +-
hw/milkymist-minimac2.c | 6 ++--
hw/milkymist-pfpu.c | 4 +-
hw/milkymist-softusb.c | 8 ++--
hw/milkymist-sysctl.c | 4 +-
hw/milkymist-tmu2.c | 8 ++--
hw/qdev.c | 2 +-
hw/strongarm.c | 4 +-
hw/usb-ccid.c | 2 +-
hw/virtio-serial-bus.c | 10 +++---
hw/virtio.c | 4 +-
net.c | 2 +-
net/socket.c | 6 ++--
qemu-error.c | 2 +
qemu-img.c | 12 +++---
23 files changed, 92 insertions(+), 96 deletions(-)
--
1.7.2.3
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Qemu-devel] [PATCH trivial 1/5] sheepdog: qemu_bh_new() can't return null pointer, drop check
2011-06-22 12:03 [Qemu-devel] [PATCH trivial 0/5] Fix error_report() calls Markus Armbruster
@ 2011-06-22 12:03 ` Markus Armbruster
2011-06-22 12:03 ` [Qemu-devel] [PATCH trivial 2/5] Strip trailing '\n' from error_report()'s first argument Markus Armbruster
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Markus Armbruster @ 2011-06-22 12:03 UTC (permalink / raw)
To: qemu-devel; +Cc: stefanha
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
block/sheepdog.c | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/block/sheepdog.c b/block/sheepdog.c
index 0392ca8..2180299 100644
--- a/block/sheepdog.c
+++ b/block/sheepdog.c
@@ -449,13 +449,7 @@ static int sd_schedule_bh(QEMUBHFunc *cb, SheepdogAIOCB *acb)
}
acb->bh = qemu_bh_new(cb, acb);
- if (!acb->bh) {
- error_report("oom: %d %d\n", acb->aiocb_type, acb->aiocb_type);
- return -EIO;
- }
-
qemu_bh_schedule(acb->bh);
-
return 0;
}
--
1.7.2.3
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Qemu-devel] [PATCH trivial 2/5] Strip trailing '\n' from error_report()'s first argument
2011-06-22 12:03 [Qemu-devel] [PATCH trivial 0/5] Fix error_report() calls Markus Armbruster
2011-06-22 12:03 ` [Qemu-devel] [PATCH trivial 1/5] sheepdog: qemu_bh_new() can't return null pointer, drop check Markus Armbruster
@ 2011-06-22 12:03 ` Markus Armbruster
2011-06-22 12:03 ` [Qemu-devel] [PATCH trivial 3/5] qemu-img: Don't prepend qemu-img to error messages twice Markus Armbruster
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Markus Armbruster @ 2011-06-22 12:03 UTC (permalink / raw)
To: qemu-devel; +Cc: stefanha
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>
---
block-migration.c | 2 +-
block/qcow2.c | 2 +-
block/sheepdog.c | 84 +++++++++++++++++++++++-----------------------
hw/milkymist-minimac2.c | 6 ++--
hw/milkymist-pfpu.c | 4 +-
hw/milkymist-softusb.c | 8 ++--
hw/milkymist-tmu2.c | 8 ++--
hw/qdev.c | 2 +-
hw/strongarm.c | 4 +-
hw/usb-ccid.c | 2 +-
hw/virtio-serial-bus.c | 10 +++---
hw/virtio.c | 4 +-
net.c | 2 +-
net/socket.c | 6 ++--
qemu-error.c | 2 +
qemu-img.c | 4 +-
16 files changed, 76 insertions(+), 74 deletions(-)
diff --git a/block-migration.c b/block-migration.c
index 8d06a23..0936c7d 100644
--- a/block-migration.c
+++ b/block-migration.c
@@ -671,7 +671,7 @@ static int block_load(QEMUFile *f, void *opaque, int version_id)
bs_prev = bs;
total_sectors = bdrv_getlength(bs) >> BDRV_SECTOR_BITS;
if (total_sectors <= 0) {
- error_report("Error getting length of block device %s\n",
+ error_report("Error getting length of block device %s",
device_name);
return -EINVAL;
}
diff --git a/block/qcow2.c b/block/qcow2.c
index 2c51e7c..48e1b95 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -936,7 +936,7 @@ static int qcow2_create2(const char *filename, int64_t total_size,
(1 << cluster_bits) != cluster_size)
{
error_report(
- "Cluster size must be a power of two between %d and %dk\n",
+ "Cluster size must be a power of two between %d and %dk",
1 << MIN_CLUSTER_BITS, 1 << (MAX_CLUSTER_BITS - 10));
return -EINVAL;
}
diff --git a/block/sheepdog.c b/block/sheepdog.c
index 2180299..80d106c 100644
--- a/block/sheepdog.c
+++ b/block/sheepdog.c
@@ -444,7 +444,7 @@ static SheepdogAIOCB *sd_aio_setup(BlockDriverState *bs, QEMUIOVector *qiov,
static int sd_schedule_bh(QEMUBHFunc *cb, SheepdogAIOCB *acb)
{
if (acb->bh) {
- error_report("bug: %d %d\n", acb->aiocb_type, acb->aiocb_type);
+ error_report("bug: %d %d", acb->aiocb_type, acb->aiocb_type);
return -EIO;
}
@@ -592,7 +592,7 @@ static int connect_to_sdog(const char *addr, const char *port)
ret = getaddrinfo(addr, port, &hints, &res0);
if (ret) {
- error_report("unable to get address info %s, %s\n",
+ error_report("unable to get address info %s, %s",
addr, strerror(errno));
return -1;
}
@@ -622,7 +622,7 @@ static int connect_to_sdog(const char *addr, const char *port)
goto success;
}
fd = -1;
- error_report("failed connect to %s:%s\n", addr, port);
+ error_report("failed connect to %s:%s", addr, port);
success:
freeaddrinfo(res0);
return fd;
@@ -638,7 +638,7 @@ again:
if (errno == EINTR || errno == EAGAIN) {
goto again;
}
- error_report("failed to recv a rsp, %s\n", strerror(errno));
+ error_report("failed to recv a rsp, %s", strerror(errno));
return 1;
}
@@ -697,7 +697,7 @@ static int send_req(int sockfd, SheepdogReq *hdr, void *data,
ret = do_writev(sockfd, iov, sizeof(*hdr) + *wlen, 0);
if (ret) {
- error_report("failed to send a req, %s\n", strerror(errno));
+ error_report("failed to send a req, %s", strerror(errno));
ret = -1;
}
@@ -717,7 +717,7 @@ static int do_req(int sockfd, SheepdogReq *hdr, void *data,
ret = do_read(sockfd, hdr, sizeof(*hdr));
if (ret) {
- error_report("failed to get a rsp, %s\n", strerror(errno));
+ error_report("failed to get a rsp, %s", strerror(errno));
ret = -1;
goto out;
}
@@ -729,7 +729,7 @@ static int do_req(int sockfd, SheepdogReq *hdr, void *data,
if (*rlen) {
ret = do_read(sockfd, data, *rlen);
if (ret) {
- error_report("failed to get the data, %s\n", strerror(errno));
+ error_report("failed to get the data, %s", strerror(errno));
ret = -1;
goto out;
}
@@ -766,7 +766,7 @@ static void send_pending_req(BDRVSheepdogState *s, uint64_t oid, uint32_t id)
ret = add_aio_request(s, aio_req, acb->qiov->iov,
acb->qiov->niov, 0, acb->aiocb_type);
if (ret < 0) {
- error_report("add_aio_request is failed\n");
+ error_report("add_aio_request is failed");
free_aio_req(s, aio_req);
if (QLIST_EMPTY(&acb->aioreq_head)) {
sd_finish_aiocb(acb);
@@ -799,7 +799,7 @@ static void aio_read_response(void *opaque)
/* read a header */
ret = do_read(fd, &rsp, sizeof(rsp));
if (ret) {
- error_report("failed to get the header, %s\n", strerror(errno));
+ error_report("failed to get the header, %s", strerror(errno));
return;
}
@@ -810,7 +810,7 @@ static void aio_read_response(void *opaque)
}
}
if (!aio_req) {
- error_report("cannot find aio_req %x\n", rsp.id);
+ error_report("cannot find aio_req %x", rsp.id);
return;
}
@@ -846,7 +846,7 @@ static void aio_read_response(void *opaque)
ret = do_readv(fd, acb->qiov->iov, rsp.data_length,
aio_req->iov_offset);
if (ret) {
- error_report("failed to get the data, %s\n", strerror(errno));
+ error_report("failed to get the data, %s", strerror(errno));
return;
}
break;
@@ -854,7 +854,7 @@ static void aio_read_response(void *opaque)
if (rsp.result != SD_RES_SUCCESS) {
acb->ret = -EIO;
- error_report("%s\n", sd_strerror(rsp.result));
+ error_report("%s", sd_strerror(rsp.result));
}
rest = free_aio_req(s, aio_req);
@@ -911,7 +911,7 @@ static int get_sheep_fd(BDRVSheepdogState *s)
fd = connect_to_sdog(s->addr, s->port);
if (fd < 0) {
- error_report("%s\n", strerror(errno));
+ error_report("%s", strerror(errno));
return -1;
}
@@ -919,7 +919,7 @@ static int get_sheep_fd(BDRVSheepdogState *s)
ret = set_nodelay(fd);
if (ret) {
- error_report("%s\n", strerror(errno));
+ error_report("%s", strerror(errno));
closesocket(fd);
return -1;
}
@@ -1035,7 +1035,7 @@ static int find_vdi_name(BDRVSheepdogState *s, char *filename, uint32_t snapid,
}
if (rsp->result != SD_RES_SUCCESS) {
- error_report("cannot get vdi info, %s, %s %d %s\n",
+ error_report("cannot get vdi info, %s, %s %d %s",
sd_strerror(rsp->result), filename, snapid, tag);
ret = -1;
goto out;
@@ -1063,7 +1063,7 @@ static int add_aio_request(BDRVSheepdogState *s, AIOReq *aio_req,
uint64_t old_oid = aio_req->base_oid;
if (!nr_copies) {
- error_report("bug\n");
+ error_report("bug");
}
memset(&hdr, 0, sizeof(hdr));
@@ -1096,14 +1096,14 @@ static int add_aio_request(BDRVSheepdogState *s, AIOReq *aio_req,
/* send a header */
ret = do_write(s->fd, &hdr, sizeof(hdr));
if (ret) {
- error_report("failed to send a req, %s\n", strerror(errno));
+ error_report("failed to send a req, %s", strerror(errno));
return -EIO;
}
if (wlen) {
ret = do_writev(s->fd, iov, wlen, aio_req->iov_offset);
if (ret) {
- error_report("failed to send a data, %s\n", strerror(errno));
+ error_report("failed to send a data, %s", strerror(errno));
return -EIO;
}
}
@@ -1145,7 +1145,7 @@ static int read_write_object(int fd, char *buf, uint64_t oid, int copies,
ret = do_req(fd, (SheepdogReq *)&hdr, buf, &wlen, &rlen);
if (ret) {
- error_report("failed to send a request to the sheep\n");
+ error_report("failed to send a request to the sheep");
return -1;
}
@@ -1153,7 +1153,7 @@ static int read_write_object(int fd, char *buf, uint64_t oid, int copies,
case SD_RES_SUCCESS:
return 0;
default:
- error_report("%s\n", sd_strerror(rsp->result));
+ error_report("%s", sd_strerror(rsp->result));
return -1;
}
}
@@ -1206,7 +1206,7 @@ static int sd_open(BlockDriverState *bs, const char *filename, int flags)
fd = connect_to_sdog(s->addr, s->port);
if (fd < 0) {
- error_report("failed to connect\n");
+ error_report("failed to connect");
goto out;
}
@@ -1275,7 +1275,7 @@ static int do_sd_create(char *filename, int64_t vdi_size,
}
if (rsp->result != SD_RES_SUCCESS) {
- error_report("%s, %s\n", sd_strerror(rsp->result), filename);
+ error_report("%s, %s", sd_strerror(rsp->result), filename);
return -EIO;
}
@@ -1302,7 +1302,7 @@ static int sd_create(const char *filename, QEMUOptionParameter *options)
memset(vdi, 0, sizeof(vdi));
memset(tag, 0, sizeof(tag));
if (parse_vdiname(&s, filename, vdi, &snapid, tag) < 0) {
- error_report("invalid filename\n");
+ error_report("invalid filename");
return -EINVAL;
}
@@ -1316,7 +1316,7 @@ static int sd_create(const char *filename, QEMUOptionParameter *options)
}
if (vdi_size > SD_MAX_VDI_SIZE) {
- error_report("too big image size\n");
+ error_report("too big image size");
return -EINVAL;
}
@@ -1328,7 +1328,7 @@ static int sd_create(const char *filename, QEMUOptionParameter *options)
/* Currently, only Sheepdog backing image is supported. */
drv = bdrv_find_protocol(backing_file);
if (!drv || strcmp(drv->protocol_name, "sheepdog") != 0) {
- error_report("backing_file must be a sheepdog image\n");
+ error_report("backing_file must be a sheepdog image");
return -EINVAL;
}
@@ -1339,7 +1339,7 @@ static int sd_create(const char *filename, QEMUOptionParameter *options)
s = bs->opaque;
if (!is_snapshot(&s->inode)) {
- error_report("cannot clone from a non snapshot vdi\n");
+ error_report("cannot clone from a non snapshot vdi");
bdrv_delete(bs);
return -EINVAL;
}
@@ -1379,7 +1379,7 @@ static void sd_close(BlockDriverState *bs)
if (!ret && rsp->result != SD_RES_SUCCESS &&
rsp->result != SD_RES_VDI_NOT_LOCKED) {
- error_report("%s, %s\n", sd_strerror(rsp->result), s->name);
+ error_report("%s, %s", sd_strerror(rsp->result), s->name);
}
qemu_aio_set_fd_handler(s->fd, NULL, NULL, NULL, NULL, NULL);
@@ -1401,10 +1401,10 @@ static int sd_truncate(BlockDriverState *bs, int64_t offset)
unsigned int datalen;
if (offset < s->inode.vdi_size) {
- error_report("shrinking is not supported\n");
+ error_report("shrinking is not supported");
return -EINVAL;
} else if (offset > SD_MAX_VDI_SIZE) {
- error_report("too big image size\n");
+ error_report("too big image size");
return -EINVAL;
}
@@ -1421,7 +1421,7 @@ static int sd_truncate(BlockDriverState *bs, int64_t offset)
close(fd);
if (ret < 0) {
- error_report("failed to update an inode.\n");
+ error_report("failed to update an inode.");
return -EIO;
}
@@ -1494,7 +1494,7 @@ static int sd_create_branch(BDRVSheepdogState *s)
fd = connect_to_sdog(s->addr, s->port);
if (fd < 0) {
- error_report("failed to connect\n");
+ error_report("failed to connect");
goto out;
}
@@ -1612,7 +1612,7 @@ static void sd_readv_writev_bh_cb(void *p)
ret = add_aio_request(s, aio_req, acb->qiov->iov, acb->qiov->niov,
create, acb->aiocb_type);
if (ret < 0) {
- error_report("add_aio_request is failed\n");
+ error_report("add_aio_request is failed");
free_aio_req(s, aio_req);
acb->ret = -EIO;
goto out;
@@ -1689,7 +1689,7 @@ static int sd_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info)
if (s->is_snapshot) {
error_report("You can't create a snapshot of a snapshot VDI, "
- "%s (%" PRIu32 ").\n", s->name, s->inode.vdi_id);
+ "%s (%" PRIu32 ").", s->name, s->inode.vdi_id);
return -EINVAL;
}
@@ -1712,7 +1712,7 @@ static int sd_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info)
ret = write_object(fd, (char *)&s->inode, vid_to_vdi_oid(s->inode.vdi_id),
s->inode.nr_copies, datalen, 0, 0);
if (ret < 0) {
- error_report("failed to write snapshot's inode.\n");
+ error_report("failed to write snapshot's inode.");
ret = -EIO;
goto cleanup;
}
@@ -1720,7 +1720,7 @@ static int sd_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info)
ret = do_sd_create(s->name, s->inode.vdi_size, s->inode.vdi_id, &new_vid, 1,
s->addr, s->port);
if (ret < 0) {
- error_report("failed to create inode for snapshot. %s\n",
+ error_report("failed to create inode for snapshot. %s",
strerror(errno));
ret = -EIO;
goto cleanup;
@@ -1732,7 +1732,7 @@ static int sd_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info)
s->inode.nr_copies, datalen, 0);
if (ret < 0) {
- error_report("failed to read new inode info. %s\n", strerror(errno));
+ error_report("failed to read new inode info. %s", strerror(errno));
ret = -EIO;
goto cleanup;
}
@@ -1771,14 +1771,14 @@ static int sd_snapshot_goto(BlockDriverState *bs, const char *snapshot_id)
ret = find_vdi_name(s, vdi, snapid, tag, &vid, 1);
if (ret) {
- error_report("Failed to find_vdi_name\n");
+ error_report("Failed to find_vdi_name");
ret = -ENOENT;
goto out;
}
fd = connect_to_sdog(s->addr, s->port);
if (fd < 0) {
- error_report("failed to connect\n");
+ error_report("failed to connect");
goto out;
}
@@ -1796,7 +1796,7 @@ static int sd_snapshot_goto(BlockDriverState *bs, const char *snapshot_id)
memcpy(&s->inode, buf, sizeof(s->inode));
if (!s->inode.vm_state_size) {
- error_report("Invalid snapshot\n");
+ error_report("Invalid snapshot");
ret = -ENOENT;
goto out;
}
@@ -1813,7 +1813,7 @@ out:
qemu_free(buf);
qemu_free(old_s);
- error_report("failed to open. recover old bdrv_sd_state.\n");
+ error_report("failed to open. recover old bdrv_sd_state.");
return ret;
}
@@ -1868,7 +1868,7 @@ static int sd_snapshot_list(BlockDriverState *bs, QEMUSnapshotInfo **psn_tab)
fd = connect_to_sdog(s->addr, s->port);
if (fd < 0) {
- error_report("failed to connect\n");
+ error_report("failed to connect");
goto out;
}
@@ -1942,7 +1942,7 @@ static int do_load_save_vmstate(BDRVSheepdogState *s, uint8_t *data,
}
if (ret < 0) {
- error_report("failed to save vmstate %s\n", strerror(errno));
+ error_report("failed to save vmstate %s", strerror(errno));
ret = -EIO;
goto cleanup;
}
diff --git a/hw/milkymist-minimac2.c b/hw/milkymist-minimac2.c
index c4e2818..cd36026 100644
--- a/hw/milkymist-minimac2.c
+++ b/hw/milkymist-minimac2.c
@@ -234,20 +234,20 @@ static void minimac2_tx(MilkymistMinimac2State *s)
uint8_t *buf = s->tx_buf;
if (txcount < 64) {
- error_report("milkymist_minimac2: ethernet frame too small (%u < %u)\n",
+ error_report("milkymist_minimac2: ethernet frame too small (%u < %u)",
txcount, 64);
goto err;
}
if (txcount > MINIMAC2_MTU) {
- error_report("milkymist_minimac2: MTU exceeded (%u > %u)\n",
+ error_report("milkymist_minimac2: MTU exceeded (%u > %u)",
txcount, MINIMAC2_MTU);
goto err;
}
if (memcmp(buf, preamble_sfd, 8) != 0) {
error_report("milkymist_minimac2: frame doesn't contain the preamble "
- "and/or the SFD (%02x %02x %02x %02x %02x %02x %02x %02x)\n",
+ "and/or the SFD (%02x %02x %02x %02x %02x %02x %02x %02x)",
buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6], buf[7]);
goto err;
}
diff --git a/hw/milkymist-pfpu.c b/hw/milkymist-pfpu.c
index 94e6315..306d1ce 100644
--- a/hw/milkymist-pfpu.c
+++ b/hw/milkymist-pfpu.c
@@ -301,7 +301,7 @@ static int pfpu_decode_insn(MilkymistPFPUState *s)
} break;
default:
- error_report("milkymist_pfpu: unknown opcode %d\n", op);
+ error_report("milkymist_pfpu: unknown opcode %d", op);
break;
}
@@ -358,7 +358,7 @@ static void pfpu_start(MilkymistPFPUState *s)
/* decode at most MICROCODE_WORDS instructions */
if (i++ >= MICROCODE_WORDS) {
error_report("milkymist_pfpu: too many instructions "
- "executed in microcode. No VECTOUT?\n");
+ "executed in microcode. No VECTOUT?");
break;
}
}
diff --git a/hw/milkymist-softusb.c b/hw/milkymist-softusb.c
index 028f3b7..5ab35c3 100644
--- a/hw/milkymist-softusb.c
+++ b/hw/milkymist-softusb.c
@@ -131,7 +131,7 @@ static inline void softusb_read_dmem(MilkymistSoftUsbState *s,
{
if (offset + len >= s->dmem_size) {
error_report("milkymist_softusb: read dmem out of bounds "
- "at offset 0x%x, len %d\n", offset, len);
+ "at offset 0x%x, len %d", offset, len);
return;
}
@@ -143,7 +143,7 @@ static inline void softusb_write_dmem(MilkymistSoftUsbState *s,
{
if (offset + len >= s->dmem_size) {
error_report("milkymist_softusb: write dmem out of bounds "
- "at offset 0x%x, len %d\n", offset, len);
+ "at offset 0x%x, len %d", offset, len);
return;
}
@@ -155,7 +155,7 @@ static inline void softusb_read_pmem(MilkymistSoftUsbState *s,
{
if (offset + len >= s->pmem_size) {
error_report("milkymist_softusb: read pmem out of bounds "
- "at offset 0x%x, len %d\n", offset, len);
+ "at offset 0x%x, len %d", offset, len);
return;
}
@@ -167,7 +167,7 @@ static inline void softusb_write_pmem(MilkymistSoftUsbState *s,
{
if (offset + len >= s->pmem_size) {
error_report("milkymist_softusb: write pmem out of bounds "
- "at offset 0x%x, len %d\n", offset, len);
+ "at offset 0x%x, len %d", offset, len);
return;
}
diff --git a/hw/milkymist-tmu2.c b/hw/milkymist-tmu2.c
index 9cebe31..790cdcb 100644
--- a/hw/milkymist-tmu2.c
+++ b/hw/milkymist-tmu2.c
@@ -352,21 +352,21 @@ static uint32_t tmu2_read(void *opaque, target_phys_addr_t addr)
static void tmu2_check_registers(MilkymistTMU2State *s)
{
if (s->regs[R_BRIGHTNESS] > MAX_BRIGHTNESS) {
- error_report("milkymist_tmu2: max brightness is %d\n", MAX_BRIGHTNESS);
+ error_report("milkymist_tmu2: max brightness is %d", MAX_BRIGHTNESS);
}
if (s->regs[R_ALPHA] > MAX_ALPHA) {
- error_report("milkymist_tmu2: max alpha is %d\n", MAX_ALPHA);
+ error_report("milkymist_tmu2: max alpha is %d", MAX_ALPHA);
}
if (s->regs[R_VERTICESADDR] & 0x07) {
error_report("milkymist_tmu2: vertex mesh address has to be 64-bit "
- "aligned\n");
+ "aligned");
}
if (s->regs[R_TEXFBUF] & 0x01) {
error_report("milkymist_tmu2: texture buffer address has to be "
- "16-bit aligned\n");
+ "16-bit aligned");
}
}
diff --git a/hw/qdev.c b/hw/qdev.c
index 9519f5d..0fd27d5 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -371,7 +371,7 @@ void qdev_init_nofail(DeviceState *dev)
DeviceInfo *info = dev->info;
if (qdev_init(dev) < 0) {
- error_report("Initialization of device %s failed\n", info->name);
+ error_report("Initialization of device %s failed", info->name);
exit(1);
}
}
diff --git a/hw/strongarm.c b/hw/strongarm.c
index de08bdf..0e03d61 100644
--- a/hw/strongarm.c
+++ b/hw/strongarm.c
@@ -1536,14 +1536,14 @@ StrongARMState *sa1110_init(unsigned int sdram_size, const char *rev)
}
if (strncmp(rev, "sa1110", 6)) {
- error_report("Machine requires a SA1110 processor.\n");
+ error_report("Machine requires a SA1110 processor.");
exit(1);
}
s->env = cpu_init(rev);
if (!s->env) {
- error_report("Unable to find CPU definition\n");
+ error_report("Unable to find CPU definition");
exit(1);
}
diff --git a/hw/usb-ccid.c b/hw/usb-ccid.c
index 59c6431..524b841 100644
--- a/hw/usb-ccid.c
+++ b/hw/usb-ccid.c
@@ -1240,7 +1240,7 @@ static int ccid_card_init(DeviceState *qdev, DeviceInfo *base)
return -1;
}
if (s->card != NULL) {
- error_report("Warning: usb-ccid card already full, not adding\n");
+ error_report("Warning: usb-ccid card already full, not adding");
return -1;
}
ret = info->initfn ? info->initfn(card) : ret;
diff --git a/hw/virtio-serial-bus.c b/hw/virtio-serial-bus.c
index 9a12104..bff4004 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;
}
diff --git a/hw/virtio.c b/hw/virtio.c
index 6e8814c..096adce 100644
--- a/hw/virtio.c
+++ b/hw/virtio.c
@@ -725,7 +725,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);
@@ -733,7 +733,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;
}
diff --git a/net.c b/net.c
index 4f777c3..8f7199c 100644
--- a/net.c
+++ b/net.c
@@ -710,7 +710,7 @@ int qemu_find_nic_model(NICInfo *nd, const char * const *models,
return i;
}
- error_report("qemu: Unsupported NIC model: %s", nd->model);
+ error_report("Unsupported NIC model: %s", nd->model);
return -1;
}
diff --git a/net/socket.c b/net/socket.c
index 7337f4f..bc1bf58 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -530,7 +530,7 @@ int net_init_socket(QemuOpts *opts,
qemu_opt_get(opts, "connect") ||
qemu_opt_get(opts, "mcast") ||
qemu_opt_get(opts, "localaddr")) {
- error_report("listen=, connect=, mcast= and localaddr= is invalid with fd=\n");
+ error_report("listen=, connect=, mcast= and localaddr= is invalid with fd=");
return -1;
}
@@ -550,7 +550,7 @@ int net_init_socket(QemuOpts *opts,
qemu_opt_get(opts, "connect") ||
qemu_opt_get(opts, "mcast") ||
qemu_opt_get(opts, "localaddr")) {
- error_report("fd=, connect=, mcast= and localaddr= is invalid with listen=\n");
+ error_report("fd=, connect=, mcast= and localaddr= is invalid with listen=");
return -1;
}
@@ -566,7 +566,7 @@ int net_init_socket(QemuOpts *opts,
qemu_opt_get(opts, "listen") ||
qemu_opt_get(opts, "mcast") ||
qemu_opt_get(opts, "localaddr")) {
- error_report("fd=, listen=, mcast= and localaddr= is invalid with connect=\n");
+ error_report("fd=, listen=, mcast= and localaddr= is invalid with connect=");
return -1;
}
diff --git a/qemu-error.c b/qemu-error.c
index 41c191d..4b20d28 100644
--- a/qemu-error.c
+++ b/qemu-error.c
@@ -193,6 +193,8 @@ void error_print_loc(void)
/*
* Print an error message to current monitor if we have one, else to stderr.
+ * Format arguments like sprintf(). The result should not contain
+ * newlines.
* Prepend the current location and append a newline.
* It's wrong to call this in a QMP monitor. Use qerror_report() there.
*/
diff --git a/qemu-img.c b/qemu-img.c
index 4f162d1..1a37828 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -690,12 +690,12 @@ static int img_convert(int argc, char **argv)
if (snapshot_name != NULL) {
if (bs_n > 1) {
- error_report("No support for concatenating multiple snapshot\n");
+ error_report("No support for concatenating multiple snapshot");
ret = -1;
goto out;
}
if (bdrv_snapshot_load_tmp(bs[0], snapshot_name) < 0) {
- error_report("Failed to load snapshot\n");
+ error_report("Failed to load snapshot");
ret = -1;
goto out;
}
--
1.7.2.3
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Qemu-devel] [PATCH trivial 3/5] qemu-img: Don't prepend qemu-img to error messages twice.
2011-06-22 12:03 [Qemu-devel] [PATCH trivial 0/5] Fix error_report() calls Markus Armbruster
2011-06-22 12:03 ` [Qemu-devel] [PATCH trivial 1/5] sheepdog: qemu_bh_new() can't return null pointer, drop check Markus Armbruster
2011-06-22 12:03 ` [Qemu-devel] [PATCH trivial 2/5] Strip trailing '\n' from error_report()'s first argument Markus Armbruster
@ 2011-06-22 12:03 ` Markus Armbruster
2011-06-22 12:03 ` [Qemu-devel] [PATCH trivial 4/5] Spell "unkown" correctly in error_report() arguments Markus Armbruster
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Markus Armbruster @ 2011-06-22 12:03 UTC (permalink / raw)
To: qemu-devel; +Cc: stefanha
error_report() prepends the location already. Example:
$ qemu-img convert -6
qemu-img: qemu-img: option -6 is deprecated, please use '-o compat6' instead!
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
qemu-img.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index 1a37828..32628b3 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -304,11 +304,11 @@ static int img_create(int argc, char **argv)
fmt = optarg;
break;
case 'e':
- error_report("qemu-img: option -e is deprecated, please use \'-o "
+ error_report("option -e is deprecated, please use \'-o "
"encryption\' instead!");
return 1;
case '6':
- error_report("qemu-img: option -6 is deprecated, please use \'-o "
+ error_report("option -6 is deprecated, please use \'-o "
"compat6\' instead!");
return 1;
case 'o':
@@ -633,11 +633,11 @@ static int img_convert(int argc, char **argv)
compress = 1;
break;
case 'e':
- error_report("qemu-img: option -e is deprecated, please use \'-o "
+ error_report("option -e is deprecated, please use \'-o "
"encryption\' instead!");
return 1;
case '6':
- error_report("qemu-img: option -6 is deprecated, please use \'-o "
+ error_report("option -6 is deprecated, please use \'-o "
"compat6\' instead!");
return 1;
case 'o':
--
1.7.2.3
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Qemu-devel] [PATCH trivial 4/5] Spell "unkown" correctly in error_report() arguments
2011-06-22 12:03 [Qemu-devel] [PATCH trivial 0/5] Fix error_report() calls Markus Armbruster
` (2 preceding siblings ...)
2011-06-22 12:03 ` [Qemu-devel] [PATCH trivial 3/5] qemu-img: Don't prepend qemu-img to error messages twice Markus Armbruster
@ 2011-06-22 12:03 ` Markus Armbruster
2011-06-22 12:03 ` [Qemu-devel] [PATCH trivial 5/5] blockdev: Put space after comma in error message Markus Armbruster
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Markus Armbruster @ 2011-06-22 12:03 UTC (permalink / raw)
To: qemu-devel; +Cc: stefanha
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
hw/lm32_sys.c | 2 +-
hw/lm32_timer.c | 4 ++--
hw/lm32_uart.c | 4 ++--
hw/milkymist-ac97.c | 4 ++--
hw/milkymist-memcard.c | 4 ++--
hw/milkymist-sysctl.c | 4 ++--
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/hw/lm32_sys.c b/hw/lm32_sys.c
index 427b05f..e5ff962 100644
--- a/hw/lm32_sys.c
+++ b/hw/lm32_sys.c
@@ -83,7 +83,7 @@ static void sys_write(void *opaque, target_phys_addr_t addr, uint32_t value)
break;
default:
- error_report("lm32_sys: write access to unkown register 0x"
+ error_report("lm32_sys: write access to unknown register 0x"
TARGET_FMT_plx, addr << 2);
break;
}
diff --git a/hw/lm32_timer.c b/hw/lm32_timer.c
index ed28984..49cbb22 100644
--- a/hw/lm32_timer.c
+++ b/hw/lm32_timer.c
@@ -86,7 +86,7 @@ static uint32_t timer_read(void *opaque, target_phys_addr_t addr)
r = (uint32_t)ptimer_get_count(s->ptimer);
break;
default:
- error_report("lm32_timer: read access to unkown register 0x"
+ error_report("lm32_timer: read access to unknown register 0x"
TARGET_FMT_plx, addr << 2);
break;
}
@@ -124,7 +124,7 @@ static void timer_write(void *opaque, target_phys_addr_t addr, uint32_t value)
TARGET_FMT_plx, addr << 2);
break;
default:
- error_report("lm32_timer: write access to unkown register 0x"
+ error_report("lm32_timer: write access to unknown register 0x"
TARGET_FMT_plx, addr << 2);
break;
}
diff --git a/hw/lm32_uart.c b/hw/lm32_uart.c
index e225087..09090e9 100644
--- a/hw/lm32_uart.c
+++ b/hw/lm32_uart.c
@@ -149,7 +149,7 @@ static uint32_t uart_read(void *opaque, target_phys_addr_t addr)
TARGET_FMT_plx, addr << 2);
break;
default:
- error_report("lm32_uart: read access to unkown register 0x"
+ error_report("lm32_uart: read access to unknown register 0x"
TARGET_FMT_plx, addr << 2);
break;
}
@@ -185,7 +185,7 @@ static void uart_write(void *opaque, target_phys_addr_t addr, uint32_t value)
TARGET_FMT_plx, addr << 2);
break;
default:
- error_report("lm32_uart: write access to unkown register 0x"
+ error_report("lm32_uart: write access to unknown register 0x"
TARGET_FMT_plx, addr << 2);
break;
}
diff --git a/hw/milkymist-ac97.c b/hw/milkymist-ac97.c
index 6c9e318..6104732 100644
--- a/hw/milkymist-ac97.c
+++ b/hw/milkymist-ac97.c
@@ -103,7 +103,7 @@ static uint32_t ac97_read(void *opaque, target_phys_addr_t addr)
break;
default:
- error_report("milkymist_ac97: read access to unkown register 0x"
+ error_report("milkymist_ac97: read access to unknown register 0x"
TARGET_FMT_plx, addr << 2);
break;
}
@@ -152,7 +152,7 @@ static void ac97_write(void *opaque, target_phys_addr_t addr, uint32_t value)
break;
default:
- error_report("milkymist_ac97: write access to unkown register 0x"
+ error_report("milkymist_ac97: write access to unknown register 0x"
TARGET_FMT_plx, addr);
break;
}
diff --git a/hw/milkymist-memcard.c b/hw/milkymist-memcard.c
index 06077af..22dc377 100644
--- a/hw/milkymist-memcard.c
+++ b/hw/milkymist-memcard.c
@@ -154,7 +154,7 @@ static uint32_t memcard_read(void *opaque, target_phys_addr_t addr)
break;
default:
- error_report("milkymist_memcard: read access to unkown register 0x"
+ error_report("milkymist_memcard: read access to unknown register 0x"
TARGET_FMT_plx, addr << 2);
break;
}
@@ -210,7 +210,7 @@ static void memcard_write(void *opaque, target_phys_addr_t addr, uint32_t value)
break;
default:
- error_report("milkymist_memcard: write access to unkown register 0x"
+ error_report("milkymist_memcard: write access to unknown register 0x"
TARGET_FMT_plx, addr << 2);
break;
}
diff --git a/hw/milkymist-sysctl.c b/hw/milkymist-sysctl.c
index 6bd0cb9..7b2d544 100644
--- a/hw/milkymist-sysctl.c
+++ b/hw/milkymist-sysctl.c
@@ -119,7 +119,7 @@ static uint32_t sysctl_read(void *opaque, target_phys_addr_t addr)
break;
default:
- error_report("milkymist_sysctl: read access to unkown register 0x"
+ error_report("milkymist_sysctl: read access to unknown register 0x"
TARGET_FMT_plx, addr << 2);
break;
}
@@ -189,7 +189,7 @@ static void sysctl_write(void *opaque, target_phys_addr_t addr, uint32_t value)
break;
default:
- error_report("milkymist_sysctl: write access to unkown register 0x"
+ error_report("milkymist_sysctl: write access to unknown register 0x"
TARGET_FMT_plx, addr << 2);
break;
}
--
1.7.2.3
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Qemu-devel] [PATCH trivial 5/5] blockdev: Put space after comma in error message
2011-06-22 12:03 [Qemu-devel] [PATCH trivial 0/5] Fix error_report() calls Markus Armbruster
` (3 preceding siblings ...)
2011-06-22 12:03 ` [Qemu-devel] [PATCH trivial 4/5] Spell "unkown" correctly in error_report() arguments Markus Armbruster
@ 2011-06-22 12:03 ` Markus Armbruster
2011-06-22 12:41 ` [Qemu-devel] [PATCH trivial 0/5] Fix error_report() calls Anthony Liguori
2011-06-23 13:33 ` Stefan Hajnoczi
6 siblings, 0 replies; 8+ messages in thread
From: Markus Armbruster @ 2011-06-22 12:03 UTC (permalink / raw)
To: qemu-devel; +Cc: stefanha
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
blockdev.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index 1502575..7d579d6 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -293,7 +293,7 @@ DriveInfo *drive_init(QemuOpts *opts, int default_to_scsi)
if ((buf = qemu_opt_get(opts, "trans")) != NULL) {
if (!cyls) {
- error_report("'%s' trans must be used with cyls,heads and secs",
+ error_report("'%s' trans must be used with cyls, heads and secs",
buf);
return NULL;
}
--
1.7.2.3
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PATCH trivial 0/5] Fix error_report() calls
2011-06-22 12:03 [Qemu-devel] [PATCH trivial 0/5] Fix error_report() calls Markus Armbruster
` (4 preceding siblings ...)
2011-06-22 12:03 ` [Qemu-devel] [PATCH trivial 5/5] blockdev: Put space after comma in error message Markus Armbruster
@ 2011-06-22 12:41 ` Anthony Liguori
2011-06-23 13:33 ` Stefan Hajnoczi
6 siblings, 0 replies; 8+ messages in thread
From: Anthony Liguori @ 2011-06-22 12:41 UTC (permalink / raw)
To: Markus Armbruster; +Cc: stefanha, qemu-devel
On 06/22/2011 07:03 AM, Markus Armbruster wrote:
> I limited myself to truly trivial fixes. I hope that's still useful
> enough to excuse a little rant.
>
> "bug: 0 0" is not a useful error message. Neither are "Desc next is
> 128", " too short" (too short indeed), "wrong magic" (some "wrong
> magic" skills will be handy to figure out what went wrong). I'm
> stopping here for brevity's sake, not for want of examples.
>
> If you can't be bothered to provide an intelligible error message and
> *test* it to verify it actually makes sense for the user, maybe you
> should stick to assert() or something. Makes your laziness stand out
> properly.
Acked-by: Anthony Liguori <aliguori@us.ibm.com>
Regards,
Anthony Liguori
>
> Markus Armbruster (5):
> sheepdog: qemu_bh_new() can't return null pointer, drop check
> Strip trailing '\n' from error_report()'s first argument
> qemu-img: Don't prepend qemu-img to error messages twice.
> Spell "unkown" correctly in error_report() arguments
> blockdev: Put space after comma in error message
>
> block-migration.c | 2 +-
> block/qcow2.c | 2 +-
> block/sheepdog.c | 90 ++++++++++++++++++++++-------------------------
> blockdev.c | 2 +-
> hw/lm32_sys.c | 2 +-
> hw/lm32_timer.c | 4 +-
> hw/lm32_uart.c | 4 +-
> hw/milkymist-ac97.c | 4 +-
> hw/milkymist-memcard.c | 4 +-
> hw/milkymist-minimac2.c | 6 ++--
> hw/milkymist-pfpu.c | 4 +-
> hw/milkymist-softusb.c | 8 ++--
> hw/milkymist-sysctl.c | 4 +-
> hw/milkymist-tmu2.c | 8 ++--
> hw/qdev.c | 2 +-
> hw/strongarm.c | 4 +-
> hw/usb-ccid.c | 2 +-
> hw/virtio-serial-bus.c | 10 +++---
> hw/virtio.c | 4 +-
> net.c | 2 +-
> net/socket.c | 6 ++--
> qemu-error.c | 2 +
> qemu-img.c | 12 +++---
> 23 files changed, 92 insertions(+), 96 deletions(-)
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PATCH trivial 0/5] Fix error_report() calls
2011-06-22 12:03 [Qemu-devel] [PATCH trivial 0/5] Fix error_report() calls Markus Armbruster
` (5 preceding siblings ...)
2011-06-22 12:41 ` [Qemu-devel] [PATCH trivial 0/5] Fix error_report() calls Anthony Liguori
@ 2011-06-23 13:33 ` Stefan Hajnoczi
6 siblings, 0 replies; 8+ messages in thread
From: Stefan Hajnoczi @ 2011-06-23 13:33 UTC (permalink / raw)
To: Markus Armbruster; +Cc: qemu-devel
On Wed, Jun 22, 2011 at 02:03:52PM +0200, Markus Armbruster wrote:
> I limited myself to truly trivial fixes. I hope that's still useful
> enough to excuse a little rant.
>
> "bug: 0 0" is not a useful error message. Neither are "Desc next is
> 128", " too short" (too short indeed), "wrong magic" (some "wrong
> magic" skills will be handy to figure out what went wrong). I'm
> stopping here for brevity's sake, not for want of examples.
>
> If you can't be bothered to provide an intelligible error message and
> *test* it to verify it actually makes sense for the user, maybe you
> should stick to assert() or something. Makes your laziness stand out
> properly.
>
> Markus Armbruster (5):
> sheepdog: qemu_bh_new() can't return null pointer, drop check
> Strip trailing '\n' from error_report()'s first argument
> qemu-img: Don't prepend qemu-img to error messages twice.
> Spell "unkown" correctly in error_report() arguments
> blockdev: Put space after comma in error message
>
> block-migration.c | 2 +-
> block/qcow2.c | 2 +-
> block/sheepdog.c | 90 ++++++++++++++++++++++-------------------------
> blockdev.c | 2 +-
> hw/lm32_sys.c | 2 +-
> hw/lm32_timer.c | 4 +-
> hw/lm32_uart.c | 4 +-
> hw/milkymist-ac97.c | 4 +-
> hw/milkymist-memcard.c | 4 +-
> hw/milkymist-minimac2.c | 6 ++--
> hw/milkymist-pfpu.c | 4 +-
> hw/milkymist-softusb.c | 8 ++--
> hw/milkymist-sysctl.c | 4 +-
> hw/milkymist-tmu2.c | 8 ++--
> hw/qdev.c | 2 +-
> hw/strongarm.c | 4 +-
> hw/usb-ccid.c | 2 +-
> hw/virtio-serial-bus.c | 10 +++---
> hw/virtio.c | 4 +-
> net.c | 2 +-
> net/socket.c | 6 ++--
> qemu-error.c | 2 +
> qemu-img.c | 12 +++---
> 23 files changed, 92 insertions(+), 96 deletions(-)
Thanks, applied to trivial-patches tree:
http://repo.or.cz/w/qemu/stefanha.git/shortlog/refs/heads/trivial-patches
Stefan
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2011-06-23 13:34 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-22 12:03 [Qemu-devel] [PATCH trivial 0/5] Fix error_report() calls Markus Armbruster
2011-06-22 12:03 ` [Qemu-devel] [PATCH trivial 1/5] sheepdog: qemu_bh_new() can't return null pointer, drop check Markus Armbruster
2011-06-22 12:03 ` [Qemu-devel] [PATCH trivial 2/5] Strip trailing '\n' from error_report()'s first argument Markus Armbruster
2011-06-22 12:03 ` [Qemu-devel] [PATCH trivial 3/5] qemu-img: Don't prepend qemu-img to error messages twice Markus Armbruster
2011-06-22 12:03 ` [Qemu-devel] [PATCH trivial 4/5] Spell "unkown" correctly in error_report() arguments Markus Armbruster
2011-06-22 12:03 ` [Qemu-devel] [PATCH trivial 5/5] blockdev: Put space after comma in error message Markus Armbruster
2011-06-22 12:41 ` [Qemu-devel] [PATCH trivial 0/5] Fix error_report() calls Anthony Liguori
2011-06-23 13:33 ` Stefan Hajnoczi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).