Failed in applying to current master (
apply log)
hw/alpha/dp264.c | 13 +++----------
hw/hppa/hppa_sys.h | 1 -
hw/hppa/machine.c | 1 -
hw/i386/pc_piix.c | 18 +++++++++---------
hw/ide/ahci_internal.h | 1 +
hw/ide/pci.c | 11 +++++++----
hw/ide/piix.c | 31 +------------------------------
hw/isa/piix4.c | 14 +++++---------
hw/mips/mips_fulong2e.c | 5 +----
hw/mips/mips_malta.c | 2 +-
hw/ppc/mac_newworld.c | 1 -
hw/ppc/mac_oldworld.c | 1 -
hw/ppc/prep.c | 1 -
hw/sparc64/sun4u.c | 6 +-----
include/hw/ide.h | 6 ------
include/hw/ide/internal.h | 2 ++
include/hw/ide/pci.h | 3 ++-
include/hw/misc/macio/macio.h | 1 +
include/hw/southbridge/piix.h | 3 +--
19 files changed, 35 insertions(+), 86 deletions(-)