From patchwork Tue Aug 14 16:27:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 177391 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)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 855732C0088 for ; Wed, 15 Aug 2012 03:25:07 +1000 (EST) Received: from localhost ([::1]:37488 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1JzU-0001tu-Ac for incoming@patchwork.ozlabs.org; Tue, 14 Aug 2012 12:29:12 -0400 Received: from eggs.gnu.org ([208.118.235.92]:43757) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1Jyl-0000Ac-5g for qemu-devel@nongnu.org; Tue, 14 Aug 2012 12:28:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T1Jyj-0006Om-PC for qemu-devel@nongnu.org; Tue, 14 Aug 2012 12:28:27 -0400 Received: from mail-we0-f173.google.com ([74.125.82.173]:39849) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1Jyj-0006Oh-IJ for qemu-devel@nongnu.org; Tue, 14 Aug 2012 12:28:25 -0400 Received: by weyz53 with SMTP id z53so408313wey.4 for ; Tue, 14 Aug 2012 09:28:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=Dod2ftsQtxNygn5skgdcquQ+XyP351tXM3fgjl5eTSc=; b=puiGechrYnCvHXkMntn8uzNNpeiM3rOeG7PTDB3U9H6Yo2KgNQFxhfSL7mFy4HeB6P hDhkwlyIj0+5+UrcLz9vBcTiOGgVLtrcxnxt5h4TVGZM2im3Uwu+iAguQmqXfCabRaEf y05GabZJ086g/J8ARYLvpzU1Exn4CQ7YNd3bfH9gLbHpy+SG1FewJAmyqYe6aBFn3njw DXB+8eKb457mp21WHcaPr7acCu3DQdOOOyQs2PvvFv6t4fRTeI8CHIiYyzRG3Y+QxkQT e+BPPDCDDns3tzisTezwUWfABVCnrk8aDf7zuUmZHY8QvDs8vFkcXpaGtx2geki3MBsv iaKQ== Received: by 10.50.222.232 with SMTP id qp8mr12571096igc.66.1344961703959; Tue, 14 Aug 2012 09:28:23 -0700 (PDT) Received: from loki.morrigu.org (cpe-72-179-62-111.austin.res.rr.com. [72.179.62.111]) by mx.google.com with ESMTPS id ul4sm11903203igb.15.2012.08.14.09.28.22 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 14 Aug 2012 09:28:23 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Tue, 14 Aug 2012 11:27:09 -0500 Message-Id: <1344961646-21194-4-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1344961646-21194-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1344961646-21194-1-git-send-email-mdroth@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 74.125.82.173 Cc: blauwirbel@gmail.com, aliguori@us.ibm.com Subject: [Qemu-devel] [PATCH 03/20] qapi: qapi-commands.py -> qapi_commands.py 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 Python doesn't allow "-" in module names, so we need to rename the file so we can re-use bits of the codegen. Signed-off-by: Michael Roth --- Makefile | 8 ++++---- scripts/{qapi-commands.py => qapi_commands.py} | 0 tests/Makefile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) rename scripts/{qapi-commands.py => qapi_commands.py} (100%) diff --git a/Makefile b/Makefile index e92ea6b..7733e4c 100644 --- a/Makefile +++ b/Makefile @@ -190,8 +190,8 @@ qga/qapi-generated/qga-qapi-visit.c qga/qapi-generated/qga-qapi-visit.h :\ $(SRC_PATH)/qapi-schema-guest.json $(SRC_PATH)/scripts/qapi_visit.py $(qapi-py) $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi_visit.py $(gen-out-type) -o qga/qapi-generated -p "qga-" < $<, " GEN $@") qga/qapi-generated/qga-qmp-commands.h qga/qapi-generated/qga-qmp-marshal.c :\ -$(SRC_PATH)/qapi-schema-guest.json $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py) - $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py $(gen-out-type) -o qga/qapi-generated -p "qga-" < $<, " GEN $@") +$(SRC_PATH)/qapi-schema-guest.json $(SRC_PATH)/scripts/qapi_commands.py $(qapi-py) + $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi_commands.py $(gen-out-type) -o qga/qapi-generated -p "qga-" < $<, " GEN $@") qapi-types.c qapi-types.h :\ $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/scripts/qapi_types.py $(qapi-py) @@ -200,8 +200,8 @@ qapi-visit.c qapi-visit.h :\ $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/scripts/qapi_visit.py $(qapi-py) $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi_visit.py $(gen-out-type) -o "." < $<, " GEN $@") qmp-commands.h qmp-marshal.c :\ -$(SRC_PATH)/qapi-schema.json $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py) - $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py $(gen-out-type) -m -o "." < $<, " GEN $@") +$(SRC_PATH)/qapi-schema.json $(SRC_PATH)/scripts/qapi_commands.py $(qapi-py) + $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi_commands.py $(gen-out-type) -m -o "." < $<, " GEN $@") QGALIB_GEN=$(addprefix qga/qapi-generated/, qga-qapi-types.h qga-qapi-visit.h qga-qmp-commands.h) $(qga-obj-y) qemu-ga.o: $(QGALIB_GEN) diff --git a/scripts/qapi-commands.py b/scripts/qapi_commands.py similarity index 100% rename from scripts/qapi-commands.py rename to scripts/qapi_commands.py diff --git a/tests/Makefile b/tests/Makefile index 156105c..ec6a050 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -58,8 +58,8 @@ tests/test-qapi-visit.c tests/test-qapi-visit.h :\ $(SRC_PATH)/qapi-schema-test.json $(SRC_PATH)/scripts/qapi_visit.py $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi_visit.py $(gen-out-type) -o tests -p "test-" < $<, " GEN $@") tests/test-qmp-commands.h tests/test-qmp-marshal.c :\ -$(SRC_PATH)/qapi-schema-test.json $(SRC_PATH)/scripts/qapi-commands.py - $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py $(gen-out-type) -o tests -p "test-" < $<, " GEN $@") +$(SRC_PATH)/qapi-schema-test.json $(SRC_PATH)/scripts/qapi_commands.py + $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi_commands.py $(gen-out-type) -o tests -p "test-" < $<, " GEN $@") tests/test-string-output-visitor$(EXESUF): tests/test-string-output-visitor.o $(test-qapi-obj-y)