Failed in applying to current master (
apply log)
docs/about/deprecated.rst | 6 +
.../devices/microblaze-softmmu/default.mak | 2 -
.../devices/microblazeel-softmmu/default.mak | 5 +-
qapi/machine-common.json | 94 ++++++++++-
include/hw/boards.h | 16 ++
include/hw/i386/topology.h | 22 +--
target/i386/cpu.h | 4 +-
hw/block/pflash_cfi01.c | 21 +--
hw/core/machine-smp.c | 126 +++++++++++++++
hw/core/machine.c | 46 ++++++
hw/gpio/mpc8xxx.c | 22 ++-
hw/i2c/mpc_i2c.c | 29 ++--
hw/i2c/smbus_eeprom.c | 19 +--
hw/i386/x86-common.c | 4 +-
hw/microblaze/petalogix_ml605_mmu.c | 9 +-
hw/microblaze/petalogix_s3adsp1800_mmu.c | 21 ++-
hw/microblaze/xlnx-zynqmp-pmu.c | 10 +-
hw/net/fsl_etsec/etsec.c | 22 ++-
hw/net/fsl_etsec/miim.c | 19 +--
hw/pci-host/ppce500.c | 44 +++--
hw/ppc/e500.c | 10 +-
hw/ppc/mpc8544_guts.c | 32 ++--
hw/riscv/riscv-iommu.c | 23 ++-
hw/rtc/ds1338.c | 20 +--
hw/sd/sdhci.c | 62 +++----
hw/usb/hcd-ehci-sysbus.c | 118 ++++++--------
target/i386/cpu.c | 151 +++++++++---------
target/microblaze/cpu.c | 2 +-
hw/i2c/trace-events | 5 +
29 files changed, 616 insertions(+), 348 deletions(-)