These are the patches that needed another review, had some conflicts, or were not quite ready for the previous posting.
Highlights include: - fixing the HMP prompt for -preconfig - enabling the qtest server with -object instead of -qtest - decoupling target machine code from QemuOpts Based-on: <20201202080849.4125477-1-pbonz...@redhat.com> Paolo Bonzini (15): remove preconfig state vl: remove separate preconfig main_loop vl: allow -incoming defer with -preconfig vl: extract softmmu/runstate.c vl: extract softmmu/globals.c vl: move all generic initialization out of vl.c chardev: do not use machine_init_done machine: introduce MachineInitPhase machine: record whether nvdimm= was set vl: make qemu_get_machine_opts static qtest: add a QOM object for qtest plugin: propagate errors memory: allow creating MemoryRegions before accelerators null-machine: do not create a default memdev monitor: allow quitting while in preconfig state accel/kvm/kvm-all.c | 11 +- chardev/char-mux.c | 38 +- chardev/chardev-sysemu.c | 69 --- chardev/meson.build | 2 +- hmp-commands.hx | 1 + hw/arm/boot.c | 2 +- hw/core/machine-qmp-cmds.c | 7 +- hw/core/machine.c | 56 +- hw/core/null-machine.c | 2 +- hw/core/qdev.c | 28 +- hw/microblaze/boot.c | 9 +- hw/nios2/boot.c | 9 +- hw/pci/pci.c | 2 +- hw/ppc/e500.c | 5 +- hw/ppc/spapr_nvdimm.c | 4 +- hw/ppc/virtex_ml507.c | 2 +- hw/riscv/sifive_u.c | 6 +- hw/riscv/virt.c | 6 +- hw/usb/core.c | 2 +- hw/virtio/virtio-iommu.c | 2 +- hw/xtensa/xtfpga.c | 9 +- include/chardev/char.h | 6 +- include/exec/cpu-common.h | 3 + include/exec/exec-all.h | 3 - include/hw/mem/nvdimm.h | 2 +- include/hw/qdev-core.h | 33 +- include/qapi/qmp/dispatch.h | 1 + include/qemu/plugin.h | 4 +- include/sysemu/runstate.h | 1 - include/sysemu/sysemu.h | 7 +- linux-user/main.c | 4 +- monitor/hmp.c | 7 +- monitor/qmp-cmds.c | 10 - plugins/loader.c | 34 +- qapi/control.json | 3 +- qapi/qmp-dispatch.c | 5 +- qapi/run-state.json | 5 +- softmmu/device_tree.c | 2 +- softmmu/globals.c | 74 +++ softmmu/memory.c | 12 +- softmmu/meson.build | 2 + softmmu/qdev-monitor.c | 34 +- softmmu/qtest.c | 144 ++++- softmmu/runstate.c | 800 ++++++++++++++++++++++++++++ softmmu/vl.c | 958 ++-------------------------------- stubs/machine-init-done.c | 8 - stubs/meson.build | 2 +- stubs/qmp-command-available.c | 7 + tests/qtest/qmp-test.c | 2 +- ui/console.c | 2 +- 50 files changed, 1312 insertions(+), 1135 deletions(-) delete mode 100644 chardev/chardev-sysemu.c create mode 100644 softmmu/globals.c create mode 100644 softmmu/runstate.c delete mode 100644 stubs/machine-init-done.c create mode 100644 stubs/qmp-command-available.c -- 2.26.2
