Skip to content

qapi: add #if pre-processor conditions to generated code (part 3)

Markus Armbruster qemu-devel 4 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v5 Latest18 patches 5 repliesIn review
  2. v418 patches 3 repliesSuperseded
  3. v317 patches 18 repliesSuperseded
Earlier versions · 1
VersionPostedPatchesRepliesStatus
v2 RFC15 patches11 repliesSuperseded

Changes in v5 from the cover letter

* PATCH 08,09: Computation of common-obj-y fixed [Marc-André]

Patches in v5 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/18qapi: Belatedly document modular code generationdocs/devel/qapi-code-gen.txt+38 -00 replies
2/18qapi: Fix up documentation for recent commit a95291007b2docs/devel/qapi-code-gen.txt+2 -00 replies
3/18qapi: Clean up modular built-in code generation a bitscripts/qapi/commands.py scripts/qapi/common.py scripts/qapi/events.py +13 more+33 -100 replies
4/18qapi: Prepare for system modules other than 'builtin'scripts/qapi/common.py scripts/qapi/types.py scripts/qapi/visit.py+27 -120 replies
5/18qapi: Generate QAPIEvent stuff into separate files.gitignore Makefile Makefile.objs +6 more+61 -300 replies
6/18build-sys: move qmp-introspect per targetMakefile.objs Makefile.target tests/test-qobject-input-visitor.c+2 -30 replies
7/18build: Deal with all of QAPI's .o in qapi/Makefile.objsMakefile Makefile.objs Makefile.target +1 more+21 -180 replies
8/18qapi: New module target.jsonqapi/Makefile.objs qapi/qapi-schema.json qapi/target.json+31 -110 replies
9/18qapi: make rtc-reset-reinjection and SEV depend on TARGET_I386hw/timer/mc146818rtc.c monitor.c qapi/misc.json +2 more+175 -2030 replies
10/18qapi: make s390 commands depend on TARGET_S390Xhw/s390x/s390-skeys.c include/sysemu/arch_init.h monitor.c +7 more+146 -2030 replies
11/18target.json: add a note about query-cpu* not being s390x-specificqapi/target.json+6 -00 replies
12/18qapi: make query-gic-capabilities depend on TARGET_ARMmonitor.c qapi/misc.json qapi/target.json +1 more+46 -550 replies
13/18qapi: make query-cpu-model-expansion depend on s390 or x86include/sysemu/arch_init.h monitor.c qapi/misc.json +6 more+57 -800 replies
14/18qapi: make query-cpu-definitions depend on specific targetsinclude/sysemu/arch_init.h monitor.c qapi/misc.json +8 more+70 -1020 replies
15/18qapi: remove qmp_unregister_command()include/qapi/qmp/dispatch.h qapi/qmp-registry.c+0 -90 replies
16/18Revert "qapi-events: add 'if' condition to implicit event enum"scripts/qapi/events.py+3 -10 replies
17/18qmp: Deprecate query-events in favor of query-qmp-schemamonitor.c qapi/misc.json qemu-deprecated.texi+15 -20 replies
18/18qapi: move RTC_CHANGE to the target schemahw/ppc/spapr_rtc.c hw/timer/mc146818rtc.c qapi/misc.json +1 more+25 -250 replies

Reviews trailers per patch

All 18 patches have a Reviewed-by or Acked-by.

PatchMarkus ArmbrusterCornelia HuckMarc-André LureauEduardo Habkost
1/18R-b
2/18R-b
3/18R-b
4/18R-b
5/18R-b
6/18R-b
7/18R-b
8/18R-b
9/18R-b
10/18R-b A-b
11/18R-b A-b
12/18R-b
13/18R-b A-b R-b
14/18R-b A-b R-b
15/18R-b
16/18R-b
17/18R-b
18/18R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 4 reviewers.

Read the v5 thread

Cover letter [Qemu-devel] [PATCH v5 00/18] qapi: add #if pre-processor conditions to generated code (part 3)

Marc-André posted a v1 that relies on a QAPI schema language extension 'top-unit' to permit splitting the generated code. Here is his cover letter:

The thrid and last part (of "[PATCH v2 00/54] qapi: add #if pre-processor conditions to generated code") is about adding schema conditions based on the target.

For now, the qapi code is compiled in common objects (common to all targets). This makes it impossible to add #if TARGET_ARM for example.

The patch "RFC: qapi: learn to split the schema by 'top-unit'" proposes to split the schema by "top-unit", so that generated code can be built either in common objects or per-target. That patch is a bit rough, I would like to get some feedback about the approach before trying to improve it. The following patches demonstrate usage of target-based #if conditions, and getting rid of the qmp_unregister_command() hack.

We already have a way to split generated code: QAPI modules. I took the liberty to rework Marc-André's series to use a target module instead. Less code, no change to the QAPI language.

v5:
* PATCH 08,09: Computation of common-obj-y fixed [Marc-André]

v4:
* PATCH 03,04,16,17: Commit message improvements
* PATCH 07: New
* PATCH 08: Rebased onto PATCH 07, R-by dropped

v3:
* PATCH v2 01+02 have been merged
* PATCH 01-04: New
* PATCH 05: Rebase of PATCH v2 03
* PATCH 06-17: Trivially rebased, R-by and such retained

Marc-André Lureau (9):
build-sys: move qmp-introspect per target
qapi: make rtc-reset-reinjection and SEV depend on TARGET_I386
qapi: make s390 commands depend on TARGET_S390X target.json: add a note about query-cpu* not being s390x-specific
qapi: make query-gic-capabilities depend on TARGET_ARM
qapi: make query-cpu-model-expansion depend on s390 or x86
qapi: make query-cpu-definitions depend on specific targets
qapi: remove qmp_unregister_command()
qapi: move RTC_CHANGE to the target schema

Markus Armbruster (9):
qapi: Belatedly document modular code generation
qapi: Fix up documentation for recent commit a95291007b2
qapi: Clean up modular built-in code generation a bit
qapi: Prepare for system modules other than 'builtin'
qapi: Generate QAPIEvent stuff into separate files
build: Deal with all of QAPI's .o in qapi/Makefile.objs
qapi: New module target.json
Revert "qapi-events: add 'if' condition to implicit event enum"
qmp: Deprecate query-events in favor of query-qmp-schema

 .gitignore                               |   1 +
 Makefile                                 |   2 +-
 Makefile.objs                            |  17 +-
 Makefile.target                          |   1 +
 docs/devel/qapi-code-gen.txt             |  82 +++-
 hw/ppc/spapr_rtc.c                       |   2 +-
 hw/s390x/s390-skeys.c                    |   2 +-
 hw/timer/mc146818rtc.c                   |   4 +-
 include/qapi/qmp/dispatch.h              |   1 -
 include/sysemu/arch_init.h               |  11 -
 monitor.c                                |  88 +---
 qapi/Makefile.objs                       |  25 ++
 qapi/misc.json                           | 485 +--------------------
 qapi/qapi-schema.json                    |   1 +
 qapi/qmp-registry.c                      |   8 -
 qapi/target.json                         | 514 +++++++++++++++++++++++
 qemu-deprecated.texi                     |   5 +
 qmp.c                                    |  26 --
 scripts/qapi/commands.py                 |   2 +-
 scripts/qapi/common.py                   |  55 ++-
 scripts/qapi/events.py                   |  38 +-
 scripts/qapi/types.py                    |   4 +-
 scripts/qapi/visit.py                    |   4 +-
 stubs/Makefile.objs                      |   4 -
 stubs/arch-query-cpu-def.c               |  11 -
 stubs/arch-query-cpu-model-baseline.c    |  13 -
 stubs/arch-query-cpu-model-comparison.c  |  13 -
 stubs/arch-query-cpu-model-expansion.c   |  13 -
 stubs/monitor.c                          |   2 +-
 target/arm/helper.c                      |   3 +-
 target/arm/monitor.c                     |   2 +-
 target/i386/cpu.c                        |   7 +-
 target/i386/sev_i386.h                   |   2 +-
 target/ppc/translate_init.inc.c          |   3 +-
 target/s390x/cpu_models.c                |   9 +-
 tests/qapi-schema/comments.out           |   1 +
 tests/qapi-schema/doc-bad-section.out    |   1 +
 tests/qapi-schema/doc-good.out           |   1 +
 tests/qapi-schema/empty.out              |   1 +
 tests/qapi-schema/event-case.out         |   1 +
 tests/qapi-schema/ident-with-escape.out  |   1 +
 tests/qapi-schema/include-relpath.out    |   1 +
 tests/qapi-schema/include-repetition.out |   1 +
 tests/qapi-schema/include-simple.out     |   1 +
 tests/qapi-schema/indented-expr.out      |   1 +
 tests/qapi-schema/qapi-schema-test.out   |   1 +
 tests/test-qmp-event.c                   |   1 +
 tests/test-qobject-input-visitor.c       |   1 -
 ui/vnc.c                                 |   3 +-
 49 files changed, 735 insertions(+), 741 deletions(-)
 create mode 100644 qapi/target.json
 delete mode 100644 stubs/arch-query-cpu-def.c
 delete mode 100644 stubs/arch-query-cpu-model-baseline.c
 delete mode 100644 stubs/arch-query-cpu-model-comparison.c
 delete mode 100644 stubs/arch-query-cpu-model-expansion.c
Signature · 1 line
2.17.2