On Mon, Feb 03, 2014 at 11:44:56AM +0100, Igor Mammedov wrote: > changes since v3: > - keep "acpi-pci-hotplug-with-bridge-support" property > and pass its value to acpi_pcihp_init() to init internal > .legacy_piix field. > changes since v2: > - rename 'use_acpi_pci_hotplug' field to 'legacy_piix' > and corresponding properties > - drop excessive checks for legacy mode > - rework legacy vmstate handling to use AcpiPciHpPciStatus[0] structure > which reduced acpi/piix4.c by another 50 LOC > - move legacy initialization to pcihp.c > changes since v1: > - add BSEL property to root bus when in compatibility mode > as result dropped "hw:acpi:pcihp: assume root PCI bus if bus has no > ACPI_PCIHP_PROP_BSEL property" > - rebasing on top of "pcihp: reduce number of device check events" > added patch 3/4.
Looks good to me. Applied, thanks a lot. > Reuses new pcihp code for handling legacy PCI hotplug in > acpi/piix4_pm, which significantly reduces code duplication > between piix4_pm and pcihp reducing codebase by ~200 LOC. > > It also allows cleaner rebase of generic hotplug refactoring, > by not increasing code duplication since it will need to be > done only for pcihp. > > Git tree for testing based on mst's PCI tree: > https://github.com/imammedo/qemu/commits/pcihp_cleanup_v4 > > > > Igor Mammedov (5): > pcihp: replace enable|disable_device() with oneliners > pcihp: make PCI hotplug mmio handlers indifferent to PCI_HOTPLUG_ADDR > pcihp: make pci_read() mmio calback compatible with legacy ACPI > hotplug > pcihp: remove unused AcpiPciHpPciStatus.device_present field > hw:piix4:acpi: reuse pcihp code for legacy PCI hotplug > > hw/acpi/pcihp.c | 68 ++++++++------- > hw/acpi/piix4.c | 210 > ++++------------------------------------------- > include/hw/acpi/pcihp.h | 5 +- > 3 files changed, 55 insertions(+), 228 deletions(-)
