From patchwork Thu May 1 04:27:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wenchao Xia X-Patchwork-Id: 344415 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 C8F83140115 for ; Thu, 1 May 2014 14:36:11 +1000 (EST) Received: from localhost ([::1]:60392 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WfijB-0002D8-NU for incoming@patchwork.ozlabs.org; Thu, 01 May 2014 00:36:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49694) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WficW-0002iO-Qm for qemu-devel@nongnu.org; Thu, 01 May 2014 00:29:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WficN-0002T7-Hh for qemu-devel@nongnu.org; Thu, 01 May 2014 00:29:16 -0400 Received: from mail-ig0-x22a.google.com ([2607:f8b0:4001:c05::22a]:53333) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WficN-0002T2-D1 for qemu-devel@nongnu.org; Thu, 01 May 2014 00:29:07 -0400 Received: by mail-ig0-f170.google.com with SMTP id uq10so156603igb.3 for ; Wed, 30 Apr 2014 21:29:07 -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=D4+gzJ4Q3zUBUySasm9QNW4VJIxnSJ3xFlSN4JY6KQs=; b=rHzQ4GSjj04h+7z5hKogDr1buunSpLKuIcSqgR/qBXOYPOqeK16FRGTR/ByqlKue5j Pnlz76yLdhHK4B0O2JxCwMfuKtS3jTft2UW7df3huTgbkPL3sOnF7GnmZMq6cmszL1uc ldc6DKg/vmJIYwpGrsNr+LCe0nDrvKW1PXQ/KH3oQgL79g8w5Nu4tEXnsKnXTTKb5Av2 CY3Dgorh7B7QcE6D4BdSiL/I/gUqwJot5sVsmCyG7q0dhD391cvfQWdv9r7ZJ+486abk Rz2SJqe/8oQulheTmks72vHMTDOkOG4P+RqRtc8mL95tFdERdHFsAP1oclM3VOS1hcVT TWQA== X-Received: by 10.50.73.135 with SMTP id l7mr465278igv.23.1398918547008; Wed, 30 Apr 2014 21:29:07 -0700 (PDT) Received: from localhost.localdomain.localdomain ([118.250.93.201]) by mx.google.com with ESMTPSA id ii7sm4626797igb.17.2014.04.30.21.29.03 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Apr 2014 21:29:06 -0700 (PDT) From: Wenchao Xia To: qemu-devel@nongnu.org Date: Wed, 30 Apr 2014 21:27:01 -0700 Message-Id: <1398918422-3019-28-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::22a Cc: mdroth@linux.vnet.ibm.com, armbru@redhat.com, Wenchao Xia , lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH V5 27/28] qapi event: convert QUORUM events 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/quorum.c | 25 ++++++++----------------- 1 files changed, 8 insertions(+), 17 deletions(-) diff --git a/block/quorum.c b/block/quorum.c index ecec3a5..5d1c3dc 100644 --- a/block/quorum.c +++ b/block/quorum.c @@ -17,6 +17,7 @@ #include #include "block/block_int.h" #include "qapi/qmp/qjson.h" +#include "qapi-event.h" #define HASH_LENGTH 32 @@ -198,32 +199,22 @@ static QuorumAIOCB *quorum_aio_get(BDRVQuorumState *s, static void quorum_report_bad(QuorumAIOCB *acb, char *node_name, int ret) { - QObject *data; - assert(node_name); - data = qobject_from_jsonf("{ 'node-name': %s" - ", 'sector-num': %" PRId64 - ", 'sectors-count': %d }", - node_name, acb->sector_num, acb->nb_sectors); + const char *msg = NULL; if (ret < 0) { - QDict *dict = qobject_to_qdict(data); - qdict_put(dict, "error", qstring_from_str(strerror(-ret))); + msg = strerror(-ret); } - monitor_protocol_event(QEVENT_QUORUM_REPORT_BAD, data); - qobject_decref(data); + qapi_event_send_quorum_report_bad(!!msg, msg, node_name, + acb->sector_num, acb->nb_sectors, NULL); } static void quorum_report_failure(QuorumAIOCB *acb) { - QObject *data; const char *reference = acb->common.bs->device_name[0] ? acb->common.bs->device_name : acb->common.bs->node_name; - data = qobject_from_jsonf("{ 'reference': %s" - ", 'sector-num': %" PRId64 - ", 'sectors-count': %d }", - reference, acb->sector_num, acb->nb_sectors); - monitor_protocol_event(QEVENT_QUORUM_FAILURE, data); - qobject_decref(data); + + qapi_event_send_quorum_failure(reference, acb->sector_num, + acb->nb_sectors, NULL); } static int quorum_vote_error(QuorumAIOCB *acb);