The following changes since commit e0175b71638cf4398903c0d25f93fe62e0606389:
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20200228' into staging (2020-02-28 16:39:27 +0000) are available in the Git repository at: git://github.com/ehabkost/qemu.git tags/machine-next-pull-request for you to fetch changes up to 6db1857ec9960c63024f4ce6329d947f727bad39: vl: Abort if multiple machines are registered as default (2020-02-28 14:57:19 -0500) ---------------------------------------------------------------- Machine queue, 2020-02-28 Cleanups: * Fix NMI() macro (Philippe Mathieu-Daudé) * Make MachineClass::is_default boolean, refuse multiple default machines (Philippe Mathieu-Daudé) ---------------------------------------------------------------- Philippe Mathieu-Daudé (4): hw/nmi: Fix the NMI() macro, based on INTERFACE_CHECK() hw: Do not initialize MachineClass::is_default to 0 hw: Make MachineClass::is_default a boolean type vl: Abort if multiple machines are registered as default hw/alpha/dp264.c | 2 +- hw/cris/axis_dev88.c | 2 +- hw/hppa/machine.c | 2 +- hw/i386/pc_piix.c | 10 +++++----- hw/lm32/lm32_boards.c | 3 +-- hw/lm32/milkymist.c | 1 - hw/m68k/mcf5208.c | 2 +- hw/m68k/q800.c | 1 - hw/microblaze/petalogix_ml605_mmu.c | 1 - hw/microblaze/petalogix_s3adsp1800_mmu.c | 2 +- hw/mips/mips_malta.c | 2 +- hw/moxie/moxiesim.c | 2 +- hw/nios2/10m50_devboard.c | 2 +- hw/openrisc/openrisc_sim.c | 2 +- hw/ppc/mac_oldworld.c | 2 +- hw/ppc/spapr.c | 2 +- hw/riscv/spike.c | 2 +- hw/s390x/s390-virtio-ccw.c | 2 +- hw/sh4/shix.c | 2 +- hw/sparc/sun4m.c | 2 +- hw/sparc64/sun4u.c | 2 +- hw/tricore/tricore_testboard.c | 1 - hw/unicore32/puv3.c | 2 +- include/hw/boards.h | 4 +++- include/hw/nmi.h | 2 +- softmmu/vl.c | 6 ++++-- 26 files changed, 31 insertions(+), 32 deletions(-) -- 2.24.1
