From patchwork Thu Oct 4 17:33:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 189309 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 8BCD52C039E for ; Fri, 5 Oct 2012 06:34:53 +1000 (EST) Received: from localhost ([::1]:54562 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJpK0-0007sd-Ik for incoming@patchwork.ozlabs.org; Thu, 04 Oct 2012 13:34:52 -0400 Received: from eggs.gnu.org ([208.118.235.92]:48931) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJpJ8-0006M8-I4 for qemu-devel@nongnu.org; Thu, 04 Oct 2012 13:34:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TJpJ7-0000je-1A for qemu-devel@nongnu.org; Thu, 04 Oct 2012 13:33:58 -0400 Received: from mail-ob0-f173.google.com ([209.85.214.173]:43670) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJpJ6-0000gj-Pd for qemu-devel@nongnu.org; Thu, 04 Oct 2012 13:33:56 -0400 Received: by mail-ob0-f173.google.com with SMTP id wc18so694637obb.4 for ; Thu, 04 Oct 2012 10:33:56 -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=dcVZCCpnVYkvf91I15/fMedi/cs/4/n5cq1+xLe8OAI=; b=nUGnGD2rhWazgIOre4H/gjgY9hQv9uvLrFVLlNi1kdag/fvQAOsPmhxTdyjQoOzaPX L9CiF99ZYsd5P96Ji9xi0f+XM3eQ1s0nfhhjH2mn78fqBXQjkhE+7sMGMn2wxWJvs/Wl cOIaNp4Ckpyt/lyK/0cNVaKwzwznmQtBx7GPUhAraBcspyyPZVFAJPaiZKW9/HyzJ3YW Cvmv5jDjzX6J3GDyBCUZ8tC0f7S4NxH4jciOpALCscodWat1l+e8HgoPplZXXdPUvNlJ nPtb6bHMOFmoyKqZ0elTWI7+JYgwVeBz/bubtIc8uvEXaxpzXFSMjmA///XssbVsB1ms rdbQ== Received: by 10.60.172.236 with SMTP id bf12mr4947735oec.23.1349372036306; Thu, 04 Oct 2012 10:33:56 -0700 (PDT) Received: from loki.austin.ibm.com ([32.97.110.59]) by mx.google.com with ESMTPS id h2sm7131923obn.11.2012.10.04.10.33.54 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 04 Oct 2012 10:33:55 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Thu, 4 Oct 2012 12:33:22 -0500 Message-Id: <1349372021-31212-4-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1349372021-31212-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1349372021-31212-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: 209.85.214.173 Cc: kwolf@redhat.com, peter.maydell@linaro.org, aliguori@us.ibm.com, blauwirbel@gmail.com, pbonzini@redhat.com, eblake@redhat.com Subject: [Qemu-devel] [PATCH v3 03/22] 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 5b6c56c..b82fc49 100644 --- a/Makefile +++ b/Makefile @@ -196,8 +196,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) @@ -206,8 +206,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 23a71f5..e10aaed 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)