[PATCH 00/14] vl: compound properties for machines and accelerators

[Paolo Bonzini]

This series converts -M and -accel to keyval parsing, so that they
can use compound properties.  The series also converts -smp to a
compound property.

This is also a preparatory work for SGX support, which would like to use
an array-type machine property.

Patch 1 removes -writeconfig, which would not be able to cope with -M
and -accel after the conversion.  This is much earlier than the usual
deprecation schedule, as the option was deprecated in 6.0 only.  So,
if people prefer that, I will add the required support to -writeconfig.
For now this was the simplest way to get something that works.

Patches 2-5 introduce the infrastructure and the new functions that
let us support keyval-based options in -readconfig, without going
through QemuOpts.

Patches 6-8 do the actual switch of -M and -accel to keyval.

Patches 9-14 finally validate the concept by implementing -smp as a
compound property; that is "-smp X=Y" is converted to "-machine smp.X=Y"
automatically.  Really the only interesting patches are 12 and 14,
while the others are just cleanups.

The series only supports JSON syntax for -accel.  It is more complicated
for -M because we need to consider what happens if string-based
dictionaries (produced by -M key=val) have to be merged with
strongly-typed dictionaries (produced by -M {'key': 123}).

The plan is to only allow one -M option when JSON syntax is in use;
the problem is that this is a forwards-compatibility landmine.  As soon
as -smp is converted, for example, -smp becomes a shortcut for -M
and it is now forbidden to use -M '{....}' together with -smp.
It would be impossible to know which options in the future will
become incompatible with -M JSON syntax.  Therefore, support for JSON
syntax is delayed until after the main options are converted to QOM
compound properties.  These could be -boot, -acpitable, -smbios, -m,
-semihosting-config, -rtc and -fw_cfg.

Paolo

Paolo Bonzini (14):
  remove -writeconfig
  qemu-config: parse configuration files to a QDict
  vl: plumb keyval-based options into -set and -readconfig
  qom: export more functions for use with non-UserCreatable objects
  keyval: introduce keyval_parse_into
  vl: switch -M parsing to keyval
  qemu-option: remove now-dead code
  vl: switch -accel parsing to keyval
  machine: move dies from X86MachineState to CpuTopology
  machine: move common smp_parse code to caller
  machine: add error propagation to mc->smp_parse
  machine: pass QAPI struct to mc->smp_parse
  machine: reject -smp dies!=1 for non-PC machines
  machine: add smp compound property

 accel/accel-softmmu.c            |   6 +
 docs/system/deprecated.rst       |   7 -
 docs/system/removed-features.rst |   6 +
 hw/core/machine.c                | 184 +++++----
 hw/i386/pc.c                     | 108 +++--
 hw/i386/x86.c                    |  15 +-
 include/block/qdict.h            |   2 -
 include/hw/boards.h              |   3 +-
 include/hw/i386/pc.h             |   3 -
 include/hw/i386/x86.h            |   1 -
 include/qapi/qmp/qdict.h         |   3 +
 include/qemu/accel.h             |   1 +
 include/qemu/config-file.h       |   7 +-
 include/qemu/option.h            |   6 +-
 include/qom/object.h             |  23 ++
 qapi/machine.json                |  27 ++
 qemu-options.hx                  |   8 +-
 qom/object_interfaces.c          |  58 ++-
 softmmu/vl.c                     | 652 +++++++++++++++++--------------
 tests/qtest/numa-test.c          |  22 +-
 tests/unit/test-keyval.c         |  56 +++
 tests/unit/test-qemu-opts.c      |  35 --
 util/keyval.c                    |  90 ++++-
 util/qemu-config.c               | 133 +++----
 util/qemu-option.c               |  51 +--
 25 files changed, 871 insertions(+), 636 deletions(-)

-- 
2.26.2