From patchwork Thu May 1 04:26:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wenchao Xia X-Patchwork-Id: 344421 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id AC2CD140115 for ; Thu, 1 May 2014 14:38:49 +1000 (EST) Received: from localhost ([::1]:60413 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wfilj-0005Zp-Jd for incoming@patchwork.ozlabs.org; Thu, 01 May 2014 00:38:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49518) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wfic2-0001oF-Ve for qemu-devel@nongnu.org; Thu, 01 May 2014 00:28:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wfibt-0002P4-Ub for qemu-devel@nongnu.org; Thu, 01 May 2014 00:28:46 -0400 Received: from mail-ig0-x22b.google.com ([2607:f8b0:4001:c05::22b]:47670) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wfibt-0002Ov-Q4 for qemu-devel@nongnu.org; Thu, 01 May 2014 00:28:37 -0400 Received: by mail-ig0-f171.google.com with SMTP id c1so89524igq.10 for ; Wed, 30 Apr 2014 21:28:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=gRy42k4iBbnv56vDU2pDFi/aMKlEA0JD0b4mnTK1jts=; b=S7cQss9lUSpvt0KHm6MmaN2DAvDXnSQDtF1e9PnnZw0rOyFULp72nxF0/2WRviig+J SexWlDJHqRs7hkhL7RrKR86PKtqvpngVojmnQaUSCH4z6EjI3vsmJFQPuZDdpVXBQAcg dcGI/QwQ7syZNcy/pRnKD2aPMsRyn0LDGuxSL69LJ8Wlqbk5ox0L5s5g06sTwcNtSzc4 3AmbX3QNi1iDQvZncXC0MD5giQEs7JbBQnvBHEsgG9RGMXyr18EzhfOtliLjox6ViMMi rHanz+1VRAPm/5sRpn6wNN8h5Q6XwdlSiOPmC4FFKZDfvxEvgI5O1U26E7BJP1sKRlN+ tphA== X-Received: by 10.50.119.132 with SMTP id ku4mr442303igb.35.1398918517336; Wed, 30 Apr 2014 21:28:37 -0700 (PDT) Received: from localhost.localdomain.localdomain ([118.250.93.201]) by mx.google.com with ESMTPSA id ii7sm4626797igb.17.2014.04.30.21.28.33 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Apr 2014 21:28:36 -0700 (PDT) From: Wenchao Xia To: qemu-devel@nongnu.org Date: Wed, 30 Apr 2014 21:26:54 -0700 Message-Id: <1398918422-3019-21-git-send-email-wenchaoqemu@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1398918422-3019-1-git-send-email-wenchaoqemu@gmail.com> References: <1398918422-3019-1-git-send-email-wenchaoqemu@gmail.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:4001:c05::22b Cc: mdroth@linux.vnet.ibm.com, armbru@redhat.com, Wenchao Xia , lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH V5 20/28] qapi event: convert BLOCK_IMAGE_CORRUPTED X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Wenchao Xia --- 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 */