Hi Peter,
could you merge the below please?
Thanks in advance!
On Sun, Jan 26, 2014 at 06:05:14PM +0200, Michael S. Tsirkin wrote:
> Hi Anthony,
> I forgot to Cc you on the previous version of this pull request.
> So here's v2 - it also includes some more changes that
> got merged since then.
> I also used this opportunity for smash in a compat bugfix.
> Please ignore the previous pull request.
>
> The following changes since commit 0169c511554cb0014a00290b0d3d26c31a49818f:
>
> Merge remote-tracking branch 'qemu-kvm/uq/master' into staging (2014-01-24
> 15:52:44 -0800)
>
> are available in the git repository at:
>
>
> git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_anthony
>
> for you to fetch changes up to a75143eda2ddf581b51e96c000974bcdfe2cbd10:
>
> MAINTAINERS: add self as virtio co-maintainer (2014-01-26 13:11:45 +0200)
>
> ----------------------------------------------------------------
> acpi,pci,pc,virtio fixes and enhancements
>
> This includes new unit-tests for acpi by Marcel,
> hotplug for pci bridges by myself (piix only so far)
> and cpu hotplug for q35.
> And a bunch of fixes all over the place as usual.
>
> I included the patch to fix memory alignment for q35
> as well - even though it limits 32 bit guests to 3G (they
> previously could address more memory with PAE).
> To remove the limit, this will have to be fixed in seabios.
>
> I also added self as virtio co-maintainer so I don't need
> to troll the list for patches to review.
>
> Signed-off-by: Michael S. Tsirkin <m...@redhat.com>
>
> ----------------------------------------------------------------
> Alexey Kardashevskiy (1):
> tests: fix acpi to work on bigendian host
>
> Eduardo Habkost (2):
> pc: Save size of RAM below 4GB
> acpi: Fix PCI hole handling on build_srat()
>
> Gabriel L. Somlo (2):
> Add DSDT node for AppleSMC
> ACPI: Fix AppleSMC _STA size
>
> Gerd Hoffmann (1):
> q35: gigabyte alignment for ram
>
> Igor Mammedov (9):
> pc: make: fix dependencies: rebuild when included file is changed
> acpi: factor out common cpu hotplug code for PIIX4/Q35
> acpi: ich9: add CPU hotplug handling to Q35 machine
> pc: set PRST base in DSDT depending on chipset
> pc: PIIX DSDT: exclude CPU/PCI hotplug & GPE0 IO range from PCI bus
> resources
> pc: Q35 DSDT: exclude CPU hotplug IO range from PCI bus resources
> pc: ACPI: expose PRST IO range via _CRS
> pc: ACPI: unify source of CPU hotplug IO base/len
> pc: ACPI: update acpi-dsdt.hex.generated q35-acpi-dsdt.hex.generated
>
> Laszlo Ersek (1):
> Python-lang gdb script to extract x86_64 guest vmcore from qemu coredump
>
> Marcel Apfelbaum (11):
> acpi unit-test: add test files
> configure: added acpi unit-test files
> acpi unit-test: compare DSDT and SSDT tables against expected values
> configure: add CONFIG_IASL to config-host.h
> acpi unit-test: extract iasl executable from configuration
> acpi unit-test: added script to rebuild the expected aml files
> acpi unit-test: hook to rebuild expected aml files
> acpi unit-test: renamed ssdt_tables to tables
> acpi unit-test: resolved iasl crash
> acpi unit-test: do not fail on asl mismatch
> hw/pci: fix error flow in pci multifunction init
>
> Michael S. Tsirkin (7):
> pci: add pci_for_each_bus_depth_first
> pcihp: generalization of piix4 acpi
> piix4: add acpi pci hotplug support
> acpi-build: enable hotplug for PCI bridges
> acpi-test: update expected AML since recent changes
> q35: document gigabyte_align
> MAINTAINERS: add self as virtio co-maintainer
>
> Stefan Weil (1):
> virtio: Fix return value for dummy function vhost_net_virtqueue_pending
>
> configure | 4 +
> include/hw/acpi/cpu_hotplug.h | 27 ++
> include/hw/acpi/cpu_hotplug_defs.h | 24 ++
> include/hw/acpi/ich9.h | 4 +
> include/hw/acpi/pcihp.h | 72 ++++++
> include/hw/i386/pc.h | 7 +-
> include/hw/isa/isa.h | 7 +
> include/hw/pci/pci.h | 14 ++
> hw/acpi/cpu_hotplug.c | 64 +++++
> hw/acpi/ich9.c | 14 ++
> hw/acpi/pcihp.c | 316 +++++++++++++++++++++++
> hw/acpi/piix4.c | 155 ++++++------
> hw/i386/acpi-build.c | 364
> +++++++++++++++++++++------
> hw/i386/pc.c | 1 +
> hw/i386/pc_q35.c | 20 +-
> hw/misc/applesmc.c | 1 -
> hw/net/vhost_net.c | 2 +-
> hw/pci/pci.c | 48 +++-
> tests/acpi-test.c | 305 +++++++++++++++++++---
> MAINTAINERS | 1 +
> docs/specs/acpi_cpu_hotplug.txt | 4 +-
> hw/acpi/Makefile.objs | 3 +-
> hw/i386/Makefile.objs | 2 +-
> hw/i386/acpi-dsdt-cpu-hotplug.dsl | 14 +-
> hw/i386/acpi-dsdt-isa.dsl | 11 +
> hw/i386/acpi-dsdt-pci-crs.dsl | 15 +-
> hw/i386/acpi-dsdt.dsl | 76 ++++--
> hw/i386/acpi-dsdt.hex.generated | 217 +++++++++++-----
> hw/i386/q35-acpi-dsdt.dsl | 19 ++
> hw/i386/q35-acpi-dsdt.hex.generated | 74 +++++-
> hw/i386/ssdt-pcihp.dsl | 11 +-
> hw/i386/ssdt-pcihp.hex.generated | 20 +-
> hw/i386/ssdt-proc.hex.generated | 6 +-
> scripts/create_config | 4 +
> scripts/dump-guest-memory.py | 339 +++++++++++++++++++++++++
> tests/acpi-test-data/pc/APIC | Bin 0 -> 120 bytes
> tests/acpi-test-data/pc/DSDT | Bin 0 -> 4582 bytes
> tests/acpi-test-data/pc/FACP | Bin 0 -> 116 bytes
> tests/acpi-test-data/pc/FACS | Bin 0 -> 64 bytes
> tests/acpi-test-data/pc/HPET | Bin 0 -> 56 bytes
> tests/acpi-test-data/pc/SSDT | Bin 0 -> 2200 bytes
> tests/acpi-test-data/q35/APIC | Bin 0 -> 120 bytes
> tests/acpi-test-data/q35/DSDT | Bin 0 -> 7438 bytes
> tests/acpi-test-data/q35/FACP | Bin 0 -> 116 bytes
> tests/acpi-test-data/q35/FACS | Bin 0 -> 64 bytes
> tests/acpi-test-data/q35/HPET | Bin 0 -> 56 bytes
> tests/acpi-test-data/q35/MCFG | Bin 0 -> 60 bytes
> tests/acpi-test-data/q35/SSDT | Bin 0 -> 475 bytes
> tests/acpi-test-data/rebuild-expected-aml.sh | 36 +++
> 49 files changed, 1963 insertions(+), 338 deletions(-)
> create mode 100644 include/hw/acpi/cpu_hotplug.h
> create mode 100644 include/hw/acpi/cpu_hotplug_defs.h
> create mode 100644 include/hw/acpi/pcihp.h
> create mode 100644 hw/acpi/cpu_hotplug.c
> create mode 100644 hw/acpi/pcihp.c
> create mode 100644 scripts/dump-guest-memory.py
> create mode 100644 tests/acpi-test-data/pc/APIC
> create mode 100644 tests/acpi-test-data/pc/DSDT
> create mode 100644 tests/acpi-test-data/pc/FACP
> create mode 100644 tests/acpi-test-data/pc/FACS
> create mode 100644 tests/acpi-test-data/pc/HPET
> create mode 100644 tests/acpi-test-data/pc/SSDT
> create mode 100644 tests/acpi-test-data/q35/APIC
> create mode 100644 tests/acpi-test-data/q35/DSDT
> create mode 100644 tests/acpi-test-data/q35/FACP
> create mode 100644 tests/acpi-test-data/q35/FACS
> create mode 100644 tests/acpi-test-data/q35/HPET
> create mode 100644 tests/acpi-test-data/q35/MCFG
> create mode 100644 tests/acpi-test-data/q35/SSDT
> create mode 100755 tests/acpi-test-data/rebuild-expected-aml.sh
>