diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | scripts/qapi-commands.py | 12 | ||||
| -rw-r--r-- | scripts/qapi-types.py | 12 | ||||
| -rw-r--r-- | scripts/qapi-visit.py | 12 |
4 files changed, 15 insertions, 23 deletions
@@ -177,7 +177,7 @@ qapi-dir := $(BUILD_DIR)/qapi-generated test-qmp-input-visitor.o test-qmp-output-visitor.o test-qmp-commands.o qemu-ga$(EXESUF): QEMU_CFLAGS += -I $(qapi-dir) qemu-ga$(EXESUF): LIBS = $(LIBS_QGA) -gen-out-type = $(subst .,-,$@) +gen-out-type = $(subst .,-,$(suffix $@)) $(qapi-dir)/test-qapi-types.c $(qapi-dir)/test-qapi-types.h :\ $(SRC_PATH)/qapi-schema-test.json $(SRC_PATH)/scripts/qapi-types.py diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py index bd7b207122..3aabf61491 100644 --- a/scripts/qapi-commands.py +++ b/scripts/qapi-commands.py @@ -399,9 +399,9 @@ for o, a in opts: elif o in ("-m", "--middle"): middle_mode = True elif o in ("-c", "--source"): - do_h = True - elif o in ("-h", "--header"): do_c = True + elif o in ("-h", "--header"): + do_h = True if not do_c and not do_h: do_c = True @@ -411,15 +411,11 @@ c_file = output_dir + prefix + c_file h_file = output_dir + prefix + h_file def maybe_open(really, name, opt): - class Null(object): - def write(self, str): - pass - def read(self): - return '' if really: return open(name, opt) else: - return Null() + import StringIO + return StringIO.StringIO() try: os.makedirs(output_dir) diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py index ae644bc06f..b56225bdaa 100644 --- a/scripts/qapi-types.py +++ b/scripts/qapi-types.py @@ -183,9 +183,9 @@ for o, a in opts: elif o in ("-o", "--output-dir"): output_dir = a + "/" elif o in ("-c", "--source"): - do_h = True - elif o in ("-h", "--header"): do_c = True + elif o in ("-h", "--header"): + do_h = True if not do_c and not do_h: do_c = True @@ -201,13 +201,11 @@ except os.error, e: raise def maybe_open(really, name, opt): - class Null(object): - def write(self, str): - pass - def read(self): - return '' if really: return open(name, opt) + else: + import StringIO + return StringIO.StringIO() fdef = maybe_open(do_c, c_file, 'w') fdecl = maybe_open(do_h, h_file, 'w') diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py index e9d0584c78..5160d83c4f 100644 --- a/scripts/qapi-visit.py +++ b/scripts/qapi-visit.py @@ -159,9 +159,9 @@ for o, a in opts: elif o in ("-o", "--output-dir"): output_dir = a + "/" elif o in ("-c", "--source"): - do_h = True - elif o in ("-h", "--header"): do_c = True + elif o in ("-h", "--header"): + do_h = True if not do_c and not do_h: do_c = True @@ -177,13 +177,11 @@ except os.error, e: raise def maybe_open(really, name, opt): - class Null(object): - def write(self, str): - pass - def read(self): - return '' if really: return open(name, opt) + else: + import StringIO + return StringIO.StringIO() fdef = maybe_open(do_c, c_file, 'w') fdecl = maybe_open(do_h, h_file, 'w') |