Commit 709395f8 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

qapi: Fix code generation for sub-modules in other directories 



The #include directives to pull in sub-modules use file names relative
to the main module.  Works only when all modules are in the same
directory, or the main module's output directory is in the compiler's
include path.  Use relative file names instead.

The dummy variable we generate to avoid empty .o files has an invalid
name for sub-modules in other directories.  Fix that.

Both messed up in commit 252dc310 "qapi: Generate separate .h, .c
for each module".  Escaped testing because tests/qapi-schema-test.json
doesn't cover sub-modules in other directories, only
tests/qapi-schema/include-relpath.json does, and we generate and
compile C code only for the former, not the latter.  Fold the latter
into the former.  This would have caught the mistakes fixed in this
commit.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-Id: <20190301154051.23317-5-armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
parent dddee4d7

scripts/qapi/common.py

+21 −12
Original line number Diff line number Diff line
@@ -2017,8 +2017,8 @@ def mcgen(code, **kwds): 
    return cgen(code, **kwds)





def guardname(filename):

    return re.sub(r'[^A-Za-z0-9_]', '_', filename).upper()

def c_fname(filename):

    return re.sub(r'[^A-Za-z0-9_]', '_', filename)





def guardstart(name):
@@ -2027,7 +2027,7 @@ def guardstart(name): 
#define %(name)s



''',

                 name=guardname(name))

                 name=c_fname(name).upper())





def guardend(name):
@@ -2035,7 +2035,7 @@ def guardend(name): 


#endif /* %(name)s */

''',

                 name=guardname(name))

                 name=c_fname(name).upper())





def gen_if(ifcond):
@@ -2281,9 +2281,9 @@ class QAPIGenC(QAPIGenCCode): 
        return mcgen('''



/* Dummy declaration to prevent empty .o file */

char dummy_%(name)s;

char qapi_dummy_%(name)s;

''',

                     name=c_name(self.fname))

                     name=c_fname(self.fname))





class QAPIGenH(QAPIGenC):
@@ -2337,21 +2337,29 @@ class QAPISchemaModularCVisitor(QAPISchemaVisitor): 
    def _is_builtin_module(name):

        return not name



    def _module_dirname(self, what, name):

        if self._is_user_module(name):

            return os.path.dirname(name)

        return ''



    def _module_basename(self, what, name):

        ret = '' if self._is_builtin_module(name) else self._prefix

        if self._is_user_module(name):

            dirname, basename = os.path.split(name)

            basename = os.path.basename(name)

            ret += what

            if name != self._main_module:

                ret += '-' + os.path.splitext(basename)[0]

            ret = os.path.join(dirname, ret)

        else:

            name = name[2:] if name else 'builtin'

            ret += re.sub(r'-', '-' + name + '-', what)

        return ret



    def _module_filename(self, what, name):

        return os.path.join(self._module_dirname(what, name),

                            self._module_basename(what, name))



    def _add_module(self, name, blurb):

        basename = self._module_basename(self._what, name)

        basename = self._module_filename(self._what, name)

        genc = QAPIGenC(basename + '.c', blurb, self._pydoc)

        genh = QAPIGenH(basename + '.h', blurb, self._pydoc)

        self._module[name] = (genc, genh)
@@ -2393,8 +2401,9 @@ class QAPISchemaModularCVisitor(QAPISchemaVisitor): 
            self._begin_user_module(name)



    def visit_include(self, name, info):

        basename = self._module_basename(self._what, name)

        relname = os.path.relpath(self._module_filename(self._what, name),

                                  os.path.dirname(self._genh.fname))

        self._genh.preamble_add(mcgen('''

#include "%(basename)s.h"

#include "%(relname)s.h"

''',

                                      basename=basename))
 
                                      relname=relname))

tests/.gitignore

+8 −0
Original line number Diff line number Diff line
@@ -12,9 +12,17 @@ test-* 
!test-*.c

!docker/test-*

test-qapi-commands.[ch]

include/test-qapi-commands-sub-module.[ch]

test-qapi-commands-sub-sub-module.[ch]

test-qapi-events.[ch]

include/test-qapi-events-sub-module.[ch]

test-qapi-events-sub-sub-module.[ch]

test-qapi-types.[ch]

include/test-qapi-types-sub-module.[ch]

test-qapi-types-sub-sub-module.[ch]

test-qapi-visit.[ch]

include/test-qapi-visit-sub-module.[ch]

test-qapi-visit-sub-sub-module.[ch]

test-qapi-introspect.[ch]

*-test

qapi-schema/*.test.*

tests/Makefile.include

+39 −5
Original line number Diff line number Diff line
@@ -441,7 +441,6 @@ qapi-schema += include-format-err.json 
qapi-schema += include-nested-err.json

qapi-schema += include-no-file.json

qapi-schema += include-non-file.json

qapi-schema += include-relpath.json

qapi-schema += include-repetition.json

qapi-schema += include-self-cycle.json

qapi-schema += include-simple.json
@@ -508,8 +507,18 @@ qapi-schema += unknown-expr-key.json 


check-qapi-schema-y := $(addprefix tests/qapi-schema/, $(qapi-schema))



GENERATED_FILES += tests/test-qapi-types.h tests/test-qapi-visit.h \

	tests/test-qapi-commands.h tests/test-qapi-events.h \

GENERATED_FILES += tests/test-qapi-types.h \

	tests/include/test-qapi-types-sub-module.h \

	tests/test-qapi-types-sub-sub-module.h \

	tests/test-qapi-visit.h \

	tests/include/test-qapi-visit-sub-module.h \

	tests/test-qapi-visit-sub-sub-module.h \

	tests/test-qapi-commands.h \

	tests/include/test-qapi-commands-sub-module.h \

	tests/test-qapi-commands-sub-sub-module.h \

	tests/test-qapi-events.h \

	tests/include/test-qapi-events-sub-module.h \

	tests/test-qapi-events-sub-sub-module.h \

	tests/test-qapi-introspect.h



test-obj-y = tests/check-qnum.o tests/check-qstring.o tests/check-qdict.o \
@@ -537,7 +546,12 @@ QEMU_CFLAGS += -I$(SRC_PATH)/tests 
# Deps that are common to various different sets of tests below

test-util-obj-y = libqemuutil.a

test-qom-obj-y = $(qom-obj-y) $(test-util-obj-y)

test-qapi-obj-y = tests/test-qapi-visit.o tests/test-qapi-types.o \

test-qapi-obj-y = tests/test-qapi-types.o \

	tests/include/test-qapi-types-sub-module.o \

	tests/test-qapi-types-sub-sub-module.o \

	tests/test-qapi-visit.o \

	tests/include/test-qapi-visit-sub-module.o \

	tests/test-qapi-visit-sub-sub-module.o \

	tests/test-qapi-introspect.o \

	$(test-qom-obj-y)

benchmark-crypto-obj-y = $(authz-obj-y) $(crypto-obj-y) $(test-qom-obj-y)
@@ -613,12 +627,32 @@ tests/test-replication$(EXESUF): tests/test-replication.o $(test-util-obj-y) \ 
	$(test-block-obj-y)



tests/test-qapi-types.c tests/test-qapi-types.h \

tests/include/test-qapi-types-sub-module.c \

tests/include/test-qapi-types-sub-module.h \

tests/test-qapi-types-sub-sub-module.c \

tests/test-qapi-types-sub-sub-module.h \

tests/test-qapi-visit.c tests/test-qapi-visit.h \

tests/include/test-qapi-visit-sub-module.c \

tests/include/test-qapi-visit-sub-module.h \

tests/test-qapi-visit-sub-sub-module.c \

tests/test-qapi-visit-sub-sub-module.h \

tests/test-qapi-commands.h tests/test-qapi-commands.c \

tests/include/test-qapi-commands-sub-module.h \

tests/include/test-qapi-commands-sub-module.c \

tests/test-qapi-commands-sub-sub-module.h \

tests/test-qapi-commands-sub-sub-module.c \

tests/test-qapi-events.c tests/test-qapi-events.h \

tests/include/test-qapi-events-sub-module.c \

tests/include/test-qapi-events-sub-module.h \

tests/test-qapi-events-sub-sub-module.c \

tests/test-qapi-events-sub-sub-module.h \

tests/test-qapi-introspect.c tests/test-qapi-introspect.h: \

tests/test-qapi-gen-timestamp ;

tests/test-qapi-gen-timestamp: $(SRC_PATH)/tests/qapi-schema/qapi-schema-test.json $(qapi-py)

tests/test-qapi-gen-timestamp: \

		$(SRC_PATH)/tests/qapi-schema/qapi-schema-test.json \

		$(SRC_PATH)/tests/qapi-schema/include/sub-module.json \

		$(SRC_PATH)/tests/qapi-schema/sub-sub-module.json \

		$(qapi-py)

	$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-gen.py \

		-o tests -p "test-" $<, \

		"GEN","$(@:%-timestamp=%)")

tests/qapi-schema/include-relpath.err

deleted100644 → 0
+0 −0

Empty file deleted.

tests/qapi-schema/include-relpath.exit

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
0