[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 18/18] block/sheepdog: Don't use qerror_report()
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 18/18] block/sheepdog: Don't use qerror_report() |
Date: |
Tue, 13 May 2014 18:02:52 +0200 |
qerror_report() is a transitional interface to help with converting
existing HMP commands to QMP. It should not be used elsewhere.
Replace by error_report().
Cc: MORITA Kazutaka <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
---
block/sheepdog.c | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/block/sheepdog.c b/block/sheepdog.c
index cd5981e..d3386b6 100644
--- a/block/sheepdog.c
+++ b/block/sheepdog.c
@@ -723,7 +723,7 @@ static coroutine_fn void reconnect_to_sdog(void *opaque)
s->fd = get_sheep_fd(s, &local_err);
if (s->fd < 0) {
DPRINTF("Wait for connection to be established\n");
- qerror_report_err(local_err);
+ error_report("%s", error_get_pretty(local_err));
error_free(local_err);
co_aio_sleep_ns(bdrv_get_aio_context(s->bs), QEMU_CLOCK_REALTIME,
1000000000ULL);
@@ -1270,7 +1270,7 @@ static int reload_inode(BDRVSheepdogState *s, uint32_t
snapid, const char *tag)
fd = connect_to_sdog(s, &local_err);
if (fd < 0) {
- qerror_report_err(local_err);
+ error_report("%s", error_get_pretty(local_err));;
error_free(local_err);
return -EIO;
}
@@ -1279,7 +1279,7 @@ static int reload_inode(BDRVSheepdogState *s, uint32_t
snapid, const char *tag)
ret = find_vdi_name(s, s->name, snapid, tag, &vid, false, &local_err);
if (ret) {
- qerror_report_err(local_err);
+ error_report("%s", error_get_pretty(local_err));;
error_free(local_err);
goto out;
}
@@ -1745,7 +1745,7 @@ static void sd_close(BlockDriverState *bs)
fd = connect_to_sdog(s, &local_err);
if (fd < 0) {
- qerror_report_err(local_err);
+ error_report("%s", error_get_pretty(local_err));;
error_free(local_err);
return;
}
@@ -1796,7 +1796,7 @@ static int sd_truncate(BlockDriverState *bs, int64_t
offset)
fd = connect_to_sdog(s, &local_err);
if (fd < 0) {
- qerror_report_err(local_err);
+ error_report("%s", error_get_pretty(local_err));;
error_free(local_err);
return fd;
}
@@ -1869,7 +1869,7 @@ static bool sd_delete(BDRVSheepdogState *s)
fd = connect_to_sdog(s, &local_err);
if (fd < 0) {
- qerror_report_err(local_err);
+ error_report("%s", error_get_pretty(local_err));;
error_free(local_err);
return false;
}
@@ -1916,7 +1916,7 @@ static int sd_create_branch(BDRVSheepdogState *s)
deleted = sd_delete(s);
ret = do_sd_create(s, &vid, !deleted, &local_err);
if (ret) {
- qerror_report_err(local_err);
+ error_report("%s", error_get_pretty(local_err));;
error_free(local_err);
goto out;
}
@@ -1925,7 +1925,7 @@ static int sd_create_branch(BDRVSheepdogState *s)
fd = connect_to_sdog(s, &local_err);
if (fd < 0) {
- qerror_report_err(local_err);
+ error_report("%s", error_get_pretty(local_err));;
error_free(local_err);
ret = fd;
goto out;
@@ -2172,7 +2172,7 @@ static int sd_snapshot_create(BlockDriverState *bs,
QEMUSnapshotInfo *sn_info)
/* refresh inode. */
fd = connect_to_sdog(s, &local_err);
if (fd < 0) {
- qerror_report_err(local_err);
+ error_report("%s", error_get_pretty(local_err));;
error_free(local_err);
ret = fd;
goto cleanup;
@@ -2187,7 +2187,7 @@ static int sd_snapshot_create(BlockDriverState *bs,
QEMUSnapshotInfo *sn_info)
ret = do_sd_create(s, &new_vid, 1, &local_err);
if (ret < 0) {
- qerror_report_err(local_err);
+ error_report("%s", error_get_pretty(local_err));;
error_free(local_err);
error_report("failed to create inode for snapshot. %s",
strerror(errno));
@@ -2289,7 +2289,7 @@ static int sd_snapshot_list(BlockDriverState *bs,
QEMUSnapshotInfo **psn_tab)
fd = connect_to_sdog(s, &local_err);
if (fd < 0) {
- qerror_report_err(local_err);
+ error_report("%s", error_get_pretty(local_err));;
error_free(local_err);
ret = fd;
goto out;
@@ -2318,7 +2318,7 @@ static int sd_snapshot_list(BlockDriverState *bs,
QEMUSnapshotInfo **psn_tab)
fd = connect_to_sdog(s, &local_err);
if (fd < 0) {
- qerror_report_err(local_err);
+ error_report("%s", error_get_pretty(local_err));;
error_free(local_err);
ret = fd;
goto out;
@@ -2380,7 +2380,7 @@ static int do_load_save_vmstate(BDRVSheepdogState *s,
uint8_t *data,
fd = connect_to_sdog(s, &local_err);
if (fd < 0) {
- qerror_report_err(local_err);
+ error_report("%s", error_get_pretty(local_err));;
error_free(local_err);
return fd;
}
--
1.8.1.4
- [Qemu-devel] [PATCH 06/18] block/ssh: Propagate errors through check_host_key(), (continued)
- [Qemu-devel] [PATCH 06/18] block/ssh: Propagate errors through check_host_key(), Markus Armbruster, 2014/05/13
- [Qemu-devel] [PATCH 11/18] block/vvfat: Propagate errors through init_directories(), Markus Armbruster, 2014/05/13
- [Qemu-devel] [PATCH 13/18] block/sheepdog: Propagate errors through get_sheep_fd(), Markus Armbruster, 2014/05/13
- [Qemu-devel] [PATCH 09/18] block/ssh: Propagate errors to open and create methods, Markus Armbruster, 2014/05/13
- [Qemu-devel] [PATCH 18/18] block/sheepdog: Don't use qerror_report(),
Markus Armbruster <=
- [Qemu-devel] [PATCH 15/18] block/sheepdog: Propagate errors through do_sd_create(), Markus Armbruster, 2014/05/13
- [Qemu-devel] [PATCH 12/18] block/sheepdog: Propagate errors through connect_to_sdog(), Markus Armbruster, 2014/05/13
- [Qemu-devel] [PATCH 16/18] block/sheepdog: Propagate errors through find_vdi_name(), Markus Armbruster, 2014/05/13
- [Qemu-devel] [PATCH 14/18] block/sheepdog: Propagate errors through sd_prealloc(), Markus Armbruster, 2014/05/13