Failed in applying to current master (
apply log)
Maintainers: "Michael S. Tsirkin" <mst@redhat.com>, Igor Mammedov <imammedo@redhat.com>, Ani Sinha <ani@anisinha.ca>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, Paolo Bonzini <pbonzini@redhat.com>, Richard Henderson <richard.henderson@linaro.org>, Eduardo Habkost <eduardo@habkost.net>, Sunil Muthuswamy <sunilmut@microsoft.com>, Thomas Huth <thuth@redhat.com>, Laurent Vivier <lvivier@redhat.com>
MAINTAINERS | 2 ++
include/hw/acpi/ich9.h | 6 ++--
include/hw/i386/x86.h | 3 +-
include/hw/{i386 => intc}/ioapic.h | 6 ++--
include/hw/{i386 => intc}/ioapic_internal.h | 8 ++---
include/hw/{i386 => southbridge}/ich9.h | 35 ++++++++----------
hw/acpi/ich9.c | 10 ++----
hw/acpi/ich9_tco.c | 2 +-
hw/i2c/smbus_ich9.c | 39 +++++++++------------
hw/i386/acpi-build.c | 3 +-
hw/i386/kvm/ioapic.c | 3 +-
hw/i386/pc.c | 6 ++--
hw/i386/pc_q35.c | 34 +++++++++---------
hw/intc/apic.c | 2 +-
hw/intc/ioapic.c | 4 +--
hw/intc/ioapic_common.c | 4 +--
hw/isa/lpc_ich9.c | 34 +++++++++---------
hw/pci-bridge/i82801b11.c | 2 +-
target/i386/whpx/whpx-all.c | 2 +-
tests/qtest/tco-test.c | 2 +-
20 files changed, 94 insertions(+), 113 deletions(-)
rename include/hw/{i386 => intc}/ioapic.h (93%)
rename include/hw/{i386 => intc}/ioapic_internal.h (96%)
rename include/hw/{i386 => southbridge}/ich9.h (91%)