[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V5 20/28] qapi event: convert BLOCK_IMAGE_CORRUPTED
From: |
Wenchao Xia |
Subject: |
[Qemu-devel] [PATCH V5 20/28] qapi event: convert BLOCK_IMAGE_CORRUPTED |
Date: |
Wed, 30 Apr 2014 21:26:54 -0700 |
Signed-off-by: Wenchao Xia <address@hidden>
---
block/qcow2-refcount.c | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
index a37ee45..3ab6b4e 100644
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -27,6 +27,7 @@
#include "block/qcow2.h"
#include "qemu/range.h"
#include "qapi/qmp/types.h"
+#include "qapi-event.h"
static int64_t alloc_clusters_noref(BlockDriverState *bs, uint64_t size);
static int QEMU_WARN_UNUSED_RESULT update_refcount(BlockDriverState *bs,
@@ -1793,7 +1794,6 @@ int qcow2_pre_write_overlap_check(BlockDriverState *bs,
int ign, int64_t offset,
} else if (ret > 0) {
int metadata_ol_bitnr = ffs(ret) - 1;
char *message;
- QObject *data;
assert(metadata_ol_bitnr < QCOW2_OL_MAX_BITNR);
@@ -1802,12 +1802,14 @@ int qcow2_pre_write_overlap_check(BlockDriverState *bs,
int ign, int64_t offset,
metadata_ol_names[metadata_ol_bitnr]);
message = g_strdup_printf("Prevented %s overwrite",
metadata_ol_names[metadata_ol_bitnr]);
- data = qobject_from_jsonf("{ 'device': %s, 'msg': %s, 'offset': %"
- PRId64 ", 'size': %" PRId64 " }", bs->device_name, message,
- offset, size);
- monitor_protocol_event(QEVENT_BLOCK_IMAGE_CORRUPTED, data);
+ qapi_event_send_block_image_corrupted(bdrv_get_device_name(bs),
+ message,
+ true,
+ offset,
+ true,
+ size,
+ NULL);
g_free(message);
- qobject_decref(data);
qcow2_mark_corrupt(bs);
bs->drv = NULL; /* make BDS unusable */
--
1.7.1
- [Qemu-devel] [PATCH V5 10/28] qapi event: convert STOP, (continued)
- [Qemu-devel] [PATCH V5 10/28] qapi event: convert STOP, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 11/28] qapi event: convert RESUME, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 12/28] qapi event: convert SUSPEND, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 13/28] qapi event: convert SUSPEND_DISK, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 14/28] qapi event: convert WAKEUP, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 15/28] qapi event: convert RTC_CHANGE, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 16/28] qapi event: convert WATCHDOG, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 17/28] qapi event: convert DEVICE_DELETED, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 18/28] qapi event: convert DEVICE_TRAY_MOVED, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 19/28] qapi event: convert BLOCK_IO_ERROR and BLOCK_JOB_ERROR, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 20/28] qapi event: convert BLOCK_IMAGE_CORRUPTED,
Wenchao Xia <=
- [Qemu-devel] [PATCH V5 21/28] qapi event: convert other BLOCK_JOB events, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 22/28] qapi event: convert NIC_RX_FILTER_CHANGED, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 23/28] qapi event: convert VNC events, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 24/28] qapi event: convert SPICE events, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 25/28] qapi event: convert BALLOON_CHANGE, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 26/28] qapi event: convert GUEST_PANICKED, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 27/28] qapi event: convert QUORUM events, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 28/28] qapi event: clean up, Wenchao Xia, 2014/05/01