mbox

[PULL,v2,00/35] acpi, pci, pc, virtio fixes and enhancements

Message ID 1390735289-15563-1-git-send-email-mst@redhat.com
State New
Headers show

Pull-request

git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_anthony

Message

Michael S. Tsirkin Jan. 26, 2014, 4:05 p.m. UTC
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 <mst@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

Comments

Michael S. Tsirkin Jan. 26, 2014, 4:05 p.m. UTC | #1
From: Marcel Apfelbaum <marcel.a@redhat.com>

Added unit-test's expected aml files to be compared
with the actual ACPI tables.

Signed-off-by: Marcel Apfelbaum <marcel.a@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 tests/acpi-test-data/pc/APIC  | Bin 0 -> 120 bytes
 tests/acpi-test-data/pc/DSDT  | Bin 0 -> 4407 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 -> 2104 bytes
 tests/acpi-test-data/q35/APIC | Bin 0 -> 120 bytes
 tests/acpi-test-data/q35/DSDT | Bin 0 -> 7344 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 -> 2104 bytes
 13 files changed, 0 insertions(+), 0 deletions(-)
 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

diff --git a/tests/acpi-test-data/pc/APIC b/tests/acpi-test-data/pc/APIC
new file mode 100644
index 0000000000000000000000000000000000000000..84509e0ae4cabeb5ead3e42a4edfa50abddbc17d
GIT binary patch
literal 120
zcmZ<^@N}+VU|?W;>*Vk35v<@85#a0y6k`O6f!H9Lf#JbFFwFr}2jnsGfW!{`1CdNz
hKn!AlSgfo-nis_4<b<)ffC?aD+}vOm3)_F75db|X4FLcE

literal 0
HcmV?d00001

diff --git a/tests/acpi-test-data/pc/DSDT b/tests/acpi-test-data/pc/DSDT
new file mode 100644
index 0000000000000000000000000000000000000000..b12e5eb85bb22f27fe10ce0fcf1d9a71f38360eb
GIT binary patch
literal 4407
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
TLKSsYG*scK!dFF86`Sxs!<!O4

literal 0
HcmV?d00001

diff --git a/tests/acpi-test-data/pc/FACP b/tests/acpi-test-data/pc/FACP
new file mode 100644
index 0000000000000000000000000000000000000000..0639999ed1f748d44977f88e63d6a0ab49add040
GIT binary patch
literal 116
zcmZ>BbPgzCU|?Xp>E!S15v<@85#a0w6k`O6f!H9L;lclU2Owr-;AGeY<bM1BBsPE~
l7#LWfG>FXsWItFBVgbdO7+6?<^nd>U{9pknv9y7K0RZCI76AYN

literal 0
HcmV?d00001

diff --git a/tests/acpi-test-data/pc/FACS b/tests/acpi-test-data/pc/FACS
new file mode 100644
index 0000000000000000000000000000000000000000..fc67ecc40782bd7fe8921e430d7de67f0bfaad93
GIT binary patch
literal 64
PcmZ>BbPjf4ARhn#RKNjV

literal 0
HcmV?d00001

diff --git a/tests/acpi-test-data/pc/HPET b/tests/acpi-test-data/pc/HPET
new file mode 100644
index 0000000000000000000000000000000000000000..df689b8f99c1c43cfd7d63bdede3bcdfd23b7de1
GIT binary patch
literal 56
xcmeYWa1F6wU|?WmcJg=j2v%^42ypfQiZKGkKx`1rxTviGNCClxe-N610RT2D3IPBB

literal 0
HcmV?d00001

diff --git a/tests/acpi-test-data/pc/SSDT b/tests/acpi-test-data/pc/SSDT
new file mode 100644
index 0000000000000000000000000000000000000000..5ab1b96af004737738f3386e73e4dc1d425ab77e
GIT binary patch
literal 2104
zcmZvc%TC)s6o$vSVVs*23<>wHDs@$dJG(lzDW**_#D-D@X|kyVi%M*}qf}+Xk{6&-
z-lK0;dL}vlf_AdWcV<2v|DK#onnu}yErext2jOx0s(T^Bl-4XEgl7Hic8iz7mVT-#
zRNWHAs`C8&`;RR<=gOh2PO2JZhuX|Ov=INh@bSfh`-VEIbXzq`1&f|RyrY_S!O1zf
zX|=0&bT{{1<??M_rClY%#81*djqZAmjL$P$9Vb!sH13`GzTcq~ahjEd7~RTvFtl`K
zjlP$;keThZRhk9jM(>QDN{?eP5x)u(r|#8;k<9dl%*K<kSNSxQnRRoeYg>iGv{7}O
z_xdF0n7)Yzz2xMQL9ai<0^tR9Px{HMyWW~UMsK)3zX~0H^rKr0rSI!D^omKO^wCY<
zAqZtc@31ety6Od)n1r$yXn|@Snd&s-IzI8OP{t>^yz)Y;pB;V9J(VA?9C5GPU)!M^
z^qUbybsxS6eQ2Y**Qwu8bjD|W$Ffxr4e5up=xNkUSrZw?Cwgz{ZLybwmot0Y?B(I*
zb$XrdWxpNv3h)YMZ<oCyyrS9LW3L3SWcK#in}auJ_72#y;n`;IkiB_$^JXt#&w=Nd
zy)JuYcxAH}vR8puF?$hvRd`ji7qeG`S2KG@?A77bjb6uR&xPljJ<MMNUc>BR{+jTb
zW)JhX0B^zUVg5XLp4r3vEy7zgdzil^cuQsv^VfpcGJBZ6HoUgk!~8A7TQ+-`zZG~Z
zW)JhX3UAfyVgA<Ot(iT{-#WZ?vxoWHfVW}xFn^oyHvjXy4=ow?v)S!u-RnE<dU_M)
zh_{&Y#M{gT;vME9@h)?Tc#nCGc%RuOK46|FK4f-?1LiVum$^b5GFOQs<{EL#Tqiza
zcJEXA|I9Ksh>^cZjQk74$nOy&{~|H+FA*buix~Oa#K^x)jQlIa$iGUA{A<L>zfO$&
M8^p-JNlf|w0)H3)9{>OV

literal 0
HcmV?d00001

diff --git a/tests/acpi-test-data/q35/APIC b/tests/acpi-test-data/q35/APIC
new file mode 100644
index 0000000000000000000000000000000000000000..84509e0ae4cabeb5ead3e42a4edfa50abddbc17d
GIT binary patch
literal 120
zcmZ<^@N}+VU|?W;>*Vk35v<@85#a0y6k`O6f!H9Lf#JbFFwFr}2jnsGfW!{`1CdNz
hKn!AlSgfo-nis_4<b<)ffC?aD+}vOm3)_F75db|X4FLcE

literal 0
HcmV?d00001

diff --git a/tests/acpi-test-data/q35/DSDT b/tests/acpi-test-data/q35/DSDT
new file mode 100644
index 0000000000000000000000000000000000000000..59243b952d78c465298e0a2ec05a52f480dd92fb
GIT binary patch
literal 7344
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

literal 0
HcmV?d00001

diff --git a/tests/acpi-test-data/q35/FACP b/tests/acpi-test-data/q35/FACP
new file mode 100644
index 0000000000000000000000000000000000000000..19f3ac3ce6ab732caa750d835ce1261bc7343cf2
GIT binary patch
literal 116
zcmZ>BbPgzCU|?YEaPoKd2v%^42yk`-iZKGkKx`1raN&Qw0}wMZa58KHa+#Qc#0HQA
i0|N_`2C+GSYz3G&69bC?Q0zbde}0f03@mM6U;qFojS~R?

literal 0
HcmV?d00001

diff --git a/tests/acpi-test-data/q35/FACS b/tests/acpi-test-data/q35/FACS
new file mode 100644
index 0000000000000000000000000000000000000000..fc67ecc40782bd7fe8921e430d7de67f0bfaad93
GIT binary patch
literal 64
PcmZ>BbPjf4ARhn#RKNjV

literal 0
HcmV?d00001

diff --git a/tests/acpi-test-data/q35/HPET b/tests/acpi-test-data/q35/HPET
new file mode 100644
index 0000000000000000000000000000000000000000..df689b8f99c1c43cfd7d63bdede3bcdfd23b7de1
GIT binary patch
literal 56
xcmeYWa1F6wU|?WmcJg=j2v%^42ypfQiZKGkKx`1rxTviGNCClxe-N610RT2D3IPBB

literal 0
HcmV?d00001

diff --git a/tests/acpi-test-data/q35/MCFG b/tests/acpi-test-data/q35/MCFG
new file mode 100644
index 0000000000000000000000000000000000000000..79ceb27a038c6e29d098b98dda2e229495f96b7c
GIT binary patch
literal 60
rcmeZuc5}C3U|?W;@8s|75v<@85#a0#6k`O6f!H7#32cC}|AS}%SE304

literal 0
HcmV?d00001

diff --git a/tests/acpi-test-data/q35/SSDT b/tests/acpi-test-data/q35/SSDT
new file mode 100644
index 0000000000000000000000000000000000000000..186e748e6c16ffef80634be5eae9c3fa17210811
GIT binary patch
literal 2104
zcmZvc%Wl&^6o$vS)pc%8>Ne?}6%s3)-n+xGUFt%TY3!DwRGMs%+67X#?4XEly6g)S
zDenOrUW;-jIsXEfZ1SC%PshI}CzGa8c3=x({pt?F<MdhgLWU`=SwaZS`rGXmFNH1r
zR8^?@NffKf)6<XNw(OiMhqgMYYLp#nGyBj&{O`iszZTpV)KR6|s#z*n^bF!1)wBza
zaHs`UyLv}=b6-_1U*=WXRWeNcBn{N)w&%$BJhRnt5>-#*-kI<F9ZC_WSy_nDXBiKM
zmaeSPmogVJv%R)Tvq0SFo$+JoVJs%%dtu_#z1lF6nck4ucrx}X?}jq7Zmx7~t8kb$
zs*dwopM<ciPvTxLIk{xe>(8)2ctPEhelqK>x2BKL8}7G{LdPF{?G{7n`??LiViGBR
zbklbTLYdGz><h21dO;>8q3i`(pjt<!I?cF_Pkbws@rf?4ywK`rNAGiw<%cUr-0Ak$
zb|?q^W<*il`wv1N+UWLq>UR{K>RI2hY!yU9`XMcP8Z}eaM27K+-kW+`?B(F)%-%M8
zd3brVx5HimUcv0`vR8yxG<$pOmEe`k-adPC@aD|k0edz)+w2{(HxF;#>;>#O@Eo((
zWv>jcZ1zI-D)1_1FJi9>uWI&U_G<8IX77l-I=s5k>-g-s@LaQp`D?&ym_5v26JFEo
zVg452Etoybp9jw~dzimPc#CEa^S1<V$?ReNTJTzC5A)ZC*EV~Yzh!vKW)JhX0&m6a
zVg6R(t(rZ|-x|C%vxoUxhqrF_Fn=5HHq0L8Zxi0;f1dZICBuF;yZx*?eaBr-Z^9h$
z7IU6>o4G)|!(1fZWiAo#G0ze2Guy-m%=5&D%notDTqf=^SBOLADsjYIBaWHt#7E5T
zT}uC-S>^^Y@;8Z*e}NeJJ!0fvBu4%vV&rcTBY&G1`Im{2e}x$NSBa5-jTrgYiIIPU
K82LAeDgPgv$^jn$

literal 0
HcmV?d00001
Michael S. Tsirkin Jan. 26, 2014, 4:06 p.m. UTC | #2
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 tests/acpi-test-data/pc/DSDT  | Bin 4407 -> 4582 bytes
 tests/acpi-test-data/pc/SSDT  | Bin 2104 -> 2200 bytes
 tests/acpi-test-data/q35/DSDT | Bin 7344 -> 7438 bytes
 tests/acpi-test-data/q35/SSDT | Bin 2104 -> 475 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/tests/acpi-test-data/pc/DSDT b/tests/acpi-test-data/pc/DSDT
index b12e5eb85bb22f27fe10ce0fcf1d9a71f38360eb..fbf1c3e6e8f791f8e7bae95ad43ea11d0be64c72 100644
GIT binary patch
delta 402
zcmdn4^h}w{CD<k8nIHoL<Hm_xogxx?@xe~<0nVNV9L_<m!Gca)T=OO_H#S|%z`(Gu
zgO`Dkhnazaf8GCe3=AI`V0?x3_t!Hp9DwtmtpER?fk7r<;{96jo`7Iuqb`tHToVFZ
zVayquiy2=r+Ih+8GsEoj40eo<Zqf<%b&ltV_waP#VH03r<cJRrapYp)h<6SO78Ky(
zb!TK?W?*JiP;y|XWZ0a`yq1yCW3n`>qg!-?lb>%8Be%dhE|%y<ZV<=W$uHDbA)3+2
z$Jv`fL^Z(K)r%=w8N~blzaRr7Sy0KC$>3z*>J_aH5?;cvc_}L|7o*_h&HPV|qnq>s
zfUX9+h1bzJz|+9Mzy#_NUM?=6OV$ISLM2cL<VJ1*C!Wc(1*9!4<6R958KRYA5MG1W
Vi6ju<>=zQPjwAq5G5NGW4gkajYjFSo

delta 249
zcmaE+yj_XQCD<jzT#$i*(Q6`Cr--Ote6Uk|fU~CohjWl?u%Ht=SKh?s#;pGt7#KcJ
z=4Y%Gj|m7iHtGUNawP<~!k8JG7c;(M6!4MOXNDQz8SEIp`84xdMn><+m8_1QB7y<V
zu3n4<m5dn-P6n=COBh7V0-XKa7z!8?7U@h);F2#*SRhypv^%ttF@b>rC>N5zxIhRb
z;(`$2V&25Y%f-kynNQ%Uv49_EynBEvN4$rp3$LSdfTw|hff<7cTfC2f0fUHWysLpB
PLkz-6AnPVq3FZI*Bg{dn

diff --git a/tests/acpi-test-data/pc/SSDT b/tests/acpi-test-data/pc/SSDT
index 5ab1b96af004737738f3386e73e4dc1d425ab77e..a51c68e21b7f1556009331966c56eb7a563dd51e 100644
GIT binary patch
literal 2200
zcmZ{lNl)8A7>38$Fm^(mVD>FnPIbzDi#Li9ai$rEQUz&p4C)1`r;1BTRW3bp>5)qL
zAN^;g-{<%Xq3Yz4dHp_m#^YryM3DT{8Pkrvj(;W^-WB%+9Mc$MIL3d=D_%35J3^Kr
z=`adq`T6<xADuTZr2$n_$eL+@X7Ymr;lBqiULCM@!6?O^td|NJ%mL$lS=S3j&d8<d
z02{Pft@8DoycC|~e&j^LmHqp+!Nbc$muFE>c^|fWj^i}pEJBf(jP*x6>~u9uTK}t=
z1)k{ksuYRKZm}6Wl^zFd%zhQdM%7;E20X!nCxh|8E`R9qM7teg)}`MSwTfZ9!z;lw
z?F;*Xhm2g*X~&ac0ftv#kK$-z$10r$3+wx5hNs{E<`sSJIH-XoMuEgjm#)F}c?4@X
zVs=%w-Gq&O-gXgyjHe7)Bv}s69nI(AImV$~kCW4nxhL~+Xs`#g-{?N?#PtBq)VlbD
zmrVCWc)|MjyP|n4;X3zXBd<$0=)%p+GrKO)$o=pfIjj+V>ttww(1H>rYmv~R3f&`X
ziO`Y~CF>lab1HP7tU95(5+&<Aq4O&AfUE|gh7u*KNvNqp56N04w5&wQS|PNeLXXJ0
zK<I)JC2N(?stP?Ot3{}#M9Eqsw5CE&$XX|~u0+YYNa&&pb;)WIYAaE)E)lw<LOrrB
z6S}NK$+|-5iVF3~x=QG(5+&;zp=&BMAnQ7z>q?ZY8-#AC(2%T~gl;NPvThN&r9w~1
zx=rY|5+&;np*#OW?bb$c87H}?^4$==Ll3yu-K4>S0K3^FG%!%pf&e?xq#0qrrgAql
znFa~Al`Q2jO}hdl*c`GB=Q@~nI2pX+S%<S7PCJ|qUev6^`HrR?g9NWz)}`rH2QSS`
zcY<B@ZU`H=g)BV$lpAS&>06lLF{XZ$=9fNQDLjzWGhC}b)8lI4(VF(S-e9K36~jX^
n?Hib9`W9rk-P3-A8G3t%`!RfTnHTrkc<bO()zh*;VC4S-yyE{5

literal 2104
zcmZvc%TC)s6o$vSVVs*23<>wHDs@$dJG(lzDW**_#D-D@X|kyVi%M*}qf}+Xk{6&-
z-lK0;dL}vlf_AdWcV<2v|DK#onnu}yErext2jOx0s(T^Bl-4XEgl7Hic8iz7mVT-#
zRNWHAs`C8&`;RR<=gOh2PO2JZhuX|Ov=INh@bSfh`-VEIbXzq`1&f|RyrY_S!O1zf
zX|=0&bT{{1<??M_rClY%#81*djqZAmjL$P$9Vb!sH13`GzTcq~ahjEd7~RTvFtl`K
zjlP$;keThZRhk9jM(>QDN{?eP5x)u(r|#8;k<9dl%*K<kSNSxQnRRoeYg>iGv{7}O
z_xdF0n7)Yzz2xMQL9ai<0^tR9Px{HMyWW~UMsK)3zX~0H^rKr0rSI!D^omKO^wCY<
zAqZtc@31ety6Od)n1r$yXn|@Snd&s-IzI8OP{t>^yz)Y;pB;V9J(VA?9C5GPU)!M^
z^qUbybsxS6eQ2Y**Qwu8bjD|W$Ffxr4e5up=xNkUSrZw?Cwgz{ZLybwmot0Y?B(I*
zb$XrdWxpNv3h)YMZ<oCyyrS9LW3L3SWcK#in}auJ_72#y;n`;IkiB_$^JXt#&w=Nd
zy)JuYcxAH}vR8puF?$hvRd`ji7qeG`S2KG@?A77bjb6uR&xPljJ<MMNUc>BR{+jTb
zW)JhX0B^zUVg5XLp4r3vEy7zgdzil^cuQsv^VfpcGJBZ6HoUgk!~8A7TQ+-`zZG~Z
zW)JhX3UAfyVgA<Ot(iT{-#WZ?vxoWHfVW}xFn^oyHvjXy4=ow?v)S!u-RnE<dU_M)
zh_{&Y#M{gT;vME9@h)?Tc#nCGc%RuOK46|FK4f-?1LiVum$^b5GFOQs<{EL#Tqiza
zcJEXA|I9Ksh>^cZjQk74$nOy&{~|H+FA*buix~Oa#K^x)jQlIa$iGUA{A<L>zfO$&
M8^p-JNlf|w0)H3)9{>OV

diff --git a/tests/acpi-test-data/q35/DSDT b/tests/acpi-test-data/q35/DSDT
index 59243b952d78c465298e0a2ec05a52f480dd92fb..5086b839a6e11ee819af91e72f71efb3e8d97fe2 100644
GIT binary patch
delta 192
zcmdmB*=NP&66_MfC(FRV=)aL`8YAm<9tMURo0l@CGTC{_=`+U%JH-b$dm4BKJH|&h
z=>+>a$8*Gcc)IYg2{15n#0Q5saxrkkI|l^|3UKkdGcqtUFf%GBIWSZ*Y?fkC5N8ye
zY%QI^bc1K|Qt4`g=q9~@AlG290lbdR0iFg11}0GLyj)!Fj5m00@GvM;0);>Zb5B-~
fkrQW&_c1VJ5D|!XH85g`(E~duDA;*&s7y2f2gWRa

delta 97
zcmeCP+F;4$66_MPL56{Wv2Y{TG)C6%JPZs!HZNsNWfJg_)@P0nc8U*h_B8Mec8uTb
y!J;6}$TvAtI)jN}{p8Ei)syRF<irKyeGCj4V)VdDgMyt!*nk2?43js@L<0a*c^hW{

diff --git a/tests/acpi-test-data/q35/SSDT b/tests/acpi-test-data/q35/SSDT
index 186e748e6c16ffef80634be5eae9c3fa17210811..9c6cad8b0b7e009d88232166112ed8877cfe11c0 100644
GIT binary patch
delta 32
ocmdlXaGRMcIM^lRHX{QA<Lr%Gk&H|o?2}U&qZoxIA7qpU0Grwf;{X5v

literal 2104
zcmZvc%Wl&^6o$vS)pc%8>Ne?}6%s3)-n+xGUFt%TY3!DwRGMs%+67X#?4XEly6g)S
zDenOrUW;-jIsXEfZ1SC%PshI}CzGa8c3=x({pt?F<MdhgLWU`=SwaZS`rGXmFNH1r
zR8^?@NffKf)6<XNw(OiMhqgMYYLp#nGyBj&{O`iszZTpV)KR6|s#z*n^bF!1)wBza
zaHs`UyLv}=b6-_1U*=WXRWeNcBn{N)w&%$BJhRnt5>-#*-kI<F9ZC_WSy_nDXBiKM
zmaeSPmogVJv%R)Tvq0SFo$+JoVJs%%dtu_#z1lF6nck4ucrx}X?}jq7Zmx7~t8kb$
zs*dwopM<ciPvTxLIk{xe>(8)2ctPEhelqK>x2BKL8}7G{LdPF{?G{7n`??LiViGBR
zbklbTLYdGz><h21dO;>8q3i`(pjt<!I?cF_Pkbws@rf?4ywK`rNAGiw<%cUr-0Ak$
zb|?q^W<*il`wv1N+UWLq>UR{K>RI2hY!yU9`XMcP8Z}eaM27K+-kW+`?B(F)%-%M8
zd3brVx5HimUcv0`vR8yxG<$pOmEe`k-adPC@aD|k0edz)+w2{(HxF;#>;>#O@Eo((
zWv>jcZ1zI-D)1_1FJi9>uWI&U_G<8IX77l-I=s5k>-g-s@LaQp`D?&ym_5v26JFEo
zVg452Etoybp9jw~dzimPc#CEa^S1<V$?ReNTJTzC5A)ZC*EV~Yzh!vKW)JhX0&m6a
zVg6R(t(rZ|-x|C%vxoUxhqrF_Fn=5HHq0L8Zxi0;f1dZICBuF;yZx*?eaBr-Z^9h$
z7IU6>o4G)|!(1fZWiAo#G0ze2Guy-m%=5&D%notDTqf=^SBOLADsjYIBaWHt#7E5T
zT}uC-S>^^Y@;8Z*e}NeJJ!0fvBu4%vV&rcTBY&G1`Im{2e}x$NSBa5-jTrgYiIIPU
K82LAeDgPgv$^jn$
Michael S. Tsirkin Jan. 28, 2014, 11:21 a.m. UTC | #3
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 <mst@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
>
Peter Maydell Jan. 29, 2014, 4:38 p.m. UTC | #4
On 28 January 2014 11:21, Michael S. Tsirkin <mst@redhat.com> wrote:
> Hi Peter,
> could you merge the below please?
> Thanks in advance!

I'm still waiting for input from Anthony on how best to manage
pull request merging (workflow, command lines, etc). I've been
playing around with the 'patches' tool this afternoon and it hasn't
been being terribly cooperative...

thanks
-- PMM
Michael S. Tsirkin Jan. 29, 2014, 6:01 p.m. UTC | #5
On Wed, Jan 29, 2014 at 04:38:04PM +0000, Peter Maydell wrote:
> On 28 January 2014 11:21, Michael S. Tsirkin <mst@redhat.com> wrote:
> > Hi Peter,
> > could you merge the below please?
> > Thanks in advance!
> 
> I'm still waiting for input from Anthony on how best to manage
> pull request merging (workflow, command lines, etc). I've been
> playing around with the 'patches' tool this afternoon and it hasn't
> been being terribly cooperative...
> 
> thanks
> -- PMM

I think patches is for managing patches - isn't it?
For merging git pull should be enough should it not?
Peter Maydell Jan. 31, 2014, 11:12 a.m. UTC | #6
On 28 January 2014 11:21, Michael S. Tsirkin <mst@redhat.com> wrote:
> 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

Applied, thanks.

-- PMM