From patchwork Fri Jun 27 19:41:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 365166 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 1C5C414008B for ; Sat, 28 Jun 2014 06:10:58 +1000 (EST) Received: from localhost ([::1]:52230 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X0c36-0003s0-Bm for incoming@patchwork.ozlabs.org; Fri, 27 Jun 2014 15:43:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42094) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X0c2R-0002rF-0h for qemu-devel@nongnu.org; Fri, 27 Jun 2014 15:42:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X0c2F-0001Ya-LN for qemu-devel@nongnu.org; Fri, 27 Jun 2014 15:42:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:6727) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X0c2F-0001YN-Dv for qemu-devel@nongnu.org; Fri, 27 Jun 2014 15:42:11 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s5RJg7j3019787 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 27 Jun 2014 15:42:07 -0400 Received: from localhost (ovpn-113-142.phx2.redhat.com [10.3.113.142]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s5RJg6YN013851; Fri, 27 Jun 2014 15:42:06 -0400 From: Luiz Capitulino To: peter.maydell@linaro.org Date: Fri, 27 Jun 2014 15:41:56 -0400 Message-Id: <1403898123-22963-2-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1403898123-22963-1-git-send-email-lcapitulino@redhat.com> References: <1403898123-22963-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: qemu-devel@nongnu.org, anthony@codemonkey.ws Subject: [Qemu-devel] [PULL 1/8] qapi: move event defines 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 From: Wenchao Xia Signed-off-by: Wenchao Xia Reviewed-by: Eric Blake Signed-off-by: Luiz Capitulino --- Makefile | 2 +- qapi-schema.json | 5 +++-- qapi-event.json => qapi/event.json | 0 3 files changed, 4 insertions(+), 3 deletions(-) rename qapi-event.json => qapi/event.json (100%) diff --git a/Makefile b/Makefile index 145adb6..1eea0c4 100644 --- a/Makefile +++ b/Makefile @@ -248,7 +248,7 @@ $(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py) qapi-modules = $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/qapi/common.json \ $(SRC_PATH)/qapi/block.json $(SRC_PATH)/qapi/block-core.json \ - $(SRC_PATH)/qapi-event.json + $(SRC_PATH)/qapi/event.json qapi-types.c qapi-types.h :\ $(qapi-modules) $(SRC_PATH)/scripts/qapi-types.py $(qapi-py) diff --git a/qapi-schema.json b/qapi-schema.json index e7727a1..37c2189 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -8,6 +8,9 @@ # QAPI block definitions { 'include': 'qapi/block.json' } +# QAPI event definitions +{ 'include': 'qapi/event.json' } + ## # LostTickPolicy: # @@ -3398,5 +3401,3 @@ ## { 'enum': 'GuestPanicAction', 'data': [ 'pause' ] } - -{ 'include': 'qapi-event.json' } diff --git a/qapi-event.json b/qapi/event.json similarity index 100% rename from qapi-event.json rename to qapi/event.json