Commit 19bf7c87 authored by Avi Kivity's avatar Avi Kivity Committed by Anthony Liguori
Browse files

Fix qapi code generation fix 



The fixes to qapi code generation had multiple bugs:
- the Null class used to drop output was missing some methods
- in some scripts it was never instantiated, leading to a None return,
  which is missing even more methods
- the --source and --header options were swapped

Luckily, all those bugs were hidden by a makefile bug which caused the
old behaviour (with the race) to be invoked.

Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 73a511de

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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

scripts/qapi-commands.py

+4 −8
Original line number Diff line number Diff line
@@ -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)

scripts/qapi-types.py

+5 −7
Original line number Diff line number Diff line
@@ -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')

scripts/qapi-visit.py

+5 −7
Original line number Diff line number Diff line
@@ -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')