mbox

[PULL,v3,00/26] pci, pc, virtio fixes and cleanups

Message ID 1425293287-4426-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_upstream

Message

Michael S. Tsirkin March 2, 2015, 10:58 a.m. UTC
Hello, Peter!

This should be the last big pull as we are entering hard freeze.

This is an update of my previous pull request from
http://mid.gmane.org/20150226165911.GA20287@redhat.com
  git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream_rebased
as the tree was not rebased since, you can either do both pulls or
only this latest pull, result will be exactly the same.

Note: I only included here the extra 26 patches, on top of what was previously posted
http://mid.gmane.org/1424295164-4774-1-git-send-email-mst@redhat.com
if you merge PULL v2 first, you will see just these 26 patches.

I hope all this helps reduce the amount of noise rather
than increase it.

Note: these patches remove some generated files that we previously
compiled. Our build system doesn't handle this well for incremental
builds, resulting in build errors. This is not new, incremental
builds aren't 100% reliable. You can find and remove the
stale .d files from the removed sources, this will fix it -
for example, if you get an error about a missing ssdt-misc.dsl,
find and remove ssdt-misc.d in output directory.

The following changes since commit 11d39a131020cc5c54ff9bc86d3259f7d32bf849:

  Merge remote-tracking branch 'remotes/borntraeger/tags/s390x-20150218' into staging (2015-02-26 09:08:54 +0000)

are available in the git repository at:

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

for you to fetch changes up to e32dccddb0b1fa335bf251c155e907f9d47accfd:

  acpi-test-data: update after pci rewrite (2015-03-01 19:41:50 +0100)

----------------------------------------------------------------
pci, pc, virtio fixes and cleanups

Last pull for hard freeze.

A bunch of fixes all over the place.
All of ACPI refactoring has been merged.
Legacy pci commands have been dropped.

Additionally, this includes patches from soft-freeze
(which apparently haven't been merged yet):

a bunch of fixes all over the place
virtio header cleanup
initial patches from virtio-1.0 branch

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

----------------------------------------------------------------
Cornelia Huck (3):
      virtio: cull virtio_bus_set_vdev_features
      virtio: feature bit manipulation helpers
      virtio: add feature checking helpers

Denis V. Lunev (1):
      balloon: call qdev_alias_all_properties for proxy dev in balloon class init

Igor Mammedov (59):
      acpi: move generic aml building helpers into dedictated file
      acpi: add build_append_namestring() helper
      acpi: drop min-bytes in build_package()
      pc: acpi-build: update linker on guest access
      pc: acpi-build: migrate RSDP table
      pc: acpi: use local var for accessing ACPI tables blob in acpi_build()
      acpi: introduce AML composer aml_append()
      acpi: add aml_scope() term
      pc: acpi-build: use aml_scope() for \_SB scope
      acpi: add aml_device() term
      acpi: add aml_method() term
      acpi: add aml_if() term
      acpi: add aml_name() & aml_name_decl() term
      acpi: add aml_int() term
      acpi: add aml_return() term
      acpi: add aml_arg() term
      acpi: add aml_store() term
      acpi: add aml_and() term
      acpi: add aml_notify() term
      acpi: add aml_call1(), aml_call2(), aml_call3(), aml_call4() helpers
      acpi: add aml_package() term
      pc: acpi-build: generate _S[345] packages dynamically
      acpi: add aml_buffer() term
      acpi: add aml_resource_template() helper
      acpi: add aml_io() helper
      acpi: include PkgLength size only when requested
      acpi: add aml_operation_region() term
      acpi: add aml_field() & aml_named_field() terms
      acpi: add aml_local() term
      acpi: add aml_string() term
      pc: acpi-build: generate pvpanic device description dynamically
      acpi: add aml_varpackage() term
      acpi: add aml_equal() term
      acpi: add aml_processor() term
      acpi: add aml_eisaid() term
      pc: acpi-build: drop template patching and CPU hotplug objects dynamically
      pc: acpi-build: create CPU hotplug IO region dynamically
      acpi: add aml_reserved_field() term
      pc: acpi-build: drop template patching and memory hotplug objects dynamically
      pc: acpi-build: create memory hotplug IO region dynamically
      acpi: add aml_word_bus_number(), aml_word_io(), aml_dword_memory(), aml_qword_memory() terms
      pc: pcihp: expose MMIO base and len as properties
      pc: acpi-build: reserve PCIHP MMIO resources
      pc: acpi-build: create PCI0._CRS dynamically
      pc: acpi: drop manual hole punching for PCI hotplug resources
      pc: acpi: drop manual hole punching for CPU hotplug resources
      pc: acpi: drop manual hole punching for GPE0 resources
      pc: acpi-build: drop remaining ssdt_misc template
      acpi: add acpi_irq_no_flags() term
      pc: export applesmc IO port/len
      pc: acpi-build: drop template patching and create Device(SMC) dynamically
      tests: ACPI test blobs update due to PCI0._CRS changes
      tests: bios-tables-test: add support for testing bridges
      tests: add ACPI blobs for qemu with bridge cases
      pc: acpi-build: simplify PCI bus tree generation
      tests: ACPI: update pc/SSDT.bridge due to new alg of PCI tree creation
      pc: acpi-build: drop template patching and create PCI bus tree dynamically
      pc: acpi: remove not used anymore ssdt-[misc|pcihp].hex.generated blobs
      acpi: make build_*() routines static to aml-build.c

Markus Armbruster (13):
      pci: Convert core to realize
      pci: Permit incremental conversion of device models to realize
      pci: Trivial device model conversions to realize
      pcnet: pcnet_common_init() always returns 0, change to void
      pcnet: Convert to realize
      serial-pci: Convert to realize
      ide/ich: Convert to realize
      cirrus-vga: Convert to realize
      qxl: Convert to realize
      pci-assign: Convert to realize
      qdev: Don't exit when running into bad -global
      pci: Give a few helpers internal linkage
      pci-hotplug-old: Has been dead for five major releases, bury

Michael S. Tsirkin (33):
      acpi-build: fix memory leak with bridge hp off
      bios linker: validate pointer within table
      acpi: update RSDP on guest access
      exec: round up size on MR resize
      acpi-build: fix ACPI RAM management
      acpi: has_immutable_rsdp->!rsdp_in_ram
      acpi-build: simplify rsdp management for legacy
      scripts/update-linux-headers.sh: pull virtio hdrs
      include: import virtio headers from linux 4.0
      virtio: use standard virtio_ring.h
      virtio: use standard-headers
      virtio-balloon: use standard headers
      virtio-9p: use standard headers
      virtio-blk: switch to standard-headers
      virtio-net,tap: use standard-headers
      virtio-rng: use standard-headers
      virtio-scsi: use standard-headers
      virtio-serial: switch to standard-headers
      update-linux-headers: use standard-headers
      linux-headers: use standard-headers
      virtio-pci: use standard headers
      scripts: add arch specific standard-headers
      standard-headers: add s390 virtio headers
      s390: use standard headers
      acpi-build: skip hotplugged bridges
      update-linux-headers.sh: s/__inline__/inline/
      virtio-serial-bus.c: drop virtio_ids.h
      standard-headers: include stdint.h
      virtio_ring.h: s/__inline__/inline/
      acpi: update generated hex files
      acpi: drop unused generated files
      acpi-test: update expected files
      acpi-test-data: update after pci rewrite

Peter Krempa (2):
      vl.c: Fix error messages when parsing maxmem parameters
      pc: memory: Validate alignment of maxram_size to page size

Stefan Berger (5):
      tpm: Extend sts register to 32 bit
      tpm: Allow 32 & 16 bit accesses to the registers
      tpm: Support for XFIFO register
      tpm: Support for TIS selftest done flag
      tpm: Support for capability flags of TIS 1.3

Tang Chen (6):
      acpi, pc: Add hotunplug request cb for pc machine.
      acpi, ich9: Add hotunplug request cb for ich9.
      acpi, pc: Add unplug cb for pc machine.
      acpi, ich9: Add unplug cb for ich9.
      acpi, piix4: Add unplug cb for piix4.
      acpi, mem-hotplug: use PC_DIMM_SLOT_PROP in acpi_memory_plug_cb().

 hw/9pfs/virtio-9p.h                                |   18 +-
 hw/net/pcnet.h                                     |    2 +-
 hw/s390x/s390-virtio-bus.h                         |   36 +-
 hw/s390x/s390-virtio.h                             |    7 +-
 hw/tpm/tpm_int.h                                   |    1 +
 hw/tpm/tpm_tis.h                                   |    2 +-
 include/hw/acpi/aml-build.h                        |  191 ++++
 include/hw/acpi/ich9.h                             |    4 +
 include/hw/acpi/pc-hotplug.h                       |    1 +
 include/hw/acpi/pcihp.h                            |    7 +-
 include/hw/i386/pc.h                               |    1 +
 include/hw/isa/isa.h                               |   11 +-
 include/hw/pci/pci.h                               |   10 +-
 include/hw/qdev-properties.h                       |    4 +-
 include/hw/virtio/dataplane/vring-accessors.h      |    2 +-
 include/hw/virtio/dataplane/vring.h                |    2 +-
 include/hw/virtio/virtio-balloon.h                 |   35 +-
 include/hw/virtio/virtio-blk.h                     |   77 +-
 include/hw/virtio/virtio-bus.h                     |    3 -
 include/hw/virtio/virtio-net.h                     |  151 +--
 include/hw/virtio/virtio-rng.h                     |    4 +-
 include/hw/virtio/virtio-scsi.h                    |  120 +-
 include/hw/virtio/virtio-serial.h                  |   40 +-
 include/hw/virtio/virtio.h                         |   71 +-
 include/net/tap.h                                  |   24 +-
 include/standard-headers/asm-s390/kvm_virtio.h     |   64 ++
 include/standard-headers/asm-s390/virtio-ccw.h     |   21 +
 include/standard-headers/linux/if_ether.h          |    1 +
 include/standard-headers/linux/types.h             |    2 +
 include/standard-headers/linux/virtio_9p.h         |   44 +
 include/standard-headers/linux/virtio_balloon.h    |   59 +
 include/standard-headers/linux/virtio_blk.h        |  143 +++
 include/standard-headers/linux/virtio_config.h     |   64 ++
 include/standard-headers/linux/virtio_console.h    |   78 ++
 include/standard-headers/linux/virtio_ids.h        |   43 +
 include/standard-headers/linux/virtio_net.h        |  233 ++++
 include/standard-headers/linux/virtio_pci.h        |  193 ++++
 .../linux}/virtio_ring.h                           |  132 +--
 include/standard-headers/linux/virtio_rng.h        |    8 +
 include/standard-headers/linux/virtio_scsi.h       |  164 +++
 include/standard-headers/linux/virtio_types.h      |   46 +
 include/sysemu/blockdev.h                          |    2 -
 include/sysemu/sysemu.h                            |    5 -
 include/sysemu/tpm_backend.h                       |    2 +-
 linux-headers/linux/virtio_config.h                |   58 +-
 linux-headers/linux/virtio_ring.h                  |  164 +--
 device-hotplug.c                                   |    7 +-
 exec.c                                             |    2 +
 hw/9pfs/virtio-9p-device.c                         |    2 +-
 hw/acpi/aml-build.c                                |  888 +++++++++++++++
 hw/acpi/bios-linker-loader.c                       |    4 +-
 hw/acpi/ich9.c                                     |   14 +
 hw/acpi/memory_hotplug.c                           |    3 +-
 hw/acpi/pcihp.c                                    |   18 +-
 hw/acpi/piix4.c                                    |   15 +-
 hw/audio/ac97.c                                    |    5 +-
 hw/audio/es1370.c                                  |    5 +-
 hw/audio/intel-hda.c                               |    6 +-
 hw/block/virtio-blk.c                              |   31 +-
 hw/char/serial-pci.c                               |   22 +-
 hw/char/virtio-serial-bus.c                        |    4 +-
 hw/core/qdev-properties.c                          |   21 +-
 hw/core/qdev.c                                     |    8 +-
 hw/display/cirrus_vga.c                            |   11 +-
 hw/display/qxl.c                                   |   36 +-
 hw/display/vga-pci.c                               |   11 +-
 hw/display/vmware_vga.c                            |    6 +-
 hw/i2c/smbus_ich9.c                                |    5 +-
 hw/i386/acpi-build.c                               | 1179 +++++++++-----------
 hw/i386/kvm/pci-assign.c                           |   10 +-
 hw/i386/pc.c                                       |   23 +
 hw/i386/pc_piix.c                                  |    3 +
 hw/i386/pc_q35.c                                   |    3 +
 hw/ide/cmd646.c                                    |    5 +-
 hw/ide/ich.c                                       |   13 +-
 hw/ide/piix.c                                      |   10 +-
 hw/ide/via.c                                       |    6 +-
 hw/ipack/tpci200.c                                 |    6 +-
 hw/isa/i82378.c                                    |    6 +-
 hw/isa/lpc_ich9.c                                  |   14 +-
 hw/isa/piix4.c                                     |    5 +-
 hw/isa/vt82c686.c                                  |   24 +-
 hw/misc/applesmc.c                                 |    5 +-
 hw/misc/pci-testdev.c                              |    6 +-
 hw/net/e1000.c                                     |    6 +-
 hw/net/eepro100.c                                  |    6 +-
 hw/net/lance.c                                     |    3 +-
 hw/net/ne2000.c                                    |    6 +-
 hw/net/pcnet-pci.c                                 |    6 +-
 hw/net/pcnet.c                                     |    4 +-
 hw/net/rtl8139.c                                   |    6 +-
 hw/net/vhost_net.c                                 |    2 +-
 hw/net/virtio-net.c                                |   57 +-
 hw/net/vmxnet3.c                                   |    6 +-
 hw/pci-bridge/dec.c                                |    5 +-
 hw/pci-host/apb.c                                  |    5 +-
 hw/pci-host/bonito.c                               |    6 +-
 hw/pci-host/grackle.c                              |    5 +-
 hw/pci-host/piix.c                                 |   12 +-
 hw/pci-host/ppce500.c                              |    6 +-
 hw/pci-host/prep.c                                 |    6 +-
 hw/pci-host/q35.c                                  |    5 +-
 hw/pci-host/uninorth.c                             |   20 +-
 hw/pci-host/versatile.c                            |    5 +-
 hw/pci/pci-hotplug-old.c                           |  342 ------
 hw/pci/pci.c                                       |  127 ++-
 hw/s390x/virtio-ccw.c                              |   12 +-
 hw/scsi/virtio-scsi.c                              |    9 +-
 hw/sd/sdhci.c                                      |    5 +-
 hw/tpm/tpm_passthrough.c                           |   37 +-
 hw/tpm/tpm_tis.c                                   |  131 ++-
 hw/usb/hcd-ehci-pci.c                              |    6 +-
 hw/usb/hcd-xhci.c                                  |    6 +-
 hw/virtio/dataplane/vring.c                        |   10 +-
 hw/virtio/virtio-balloon.c                         |    2 +-
 hw/virtio/virtio-bus.c                             |   14 -
 hw/virtio/virtio-mmio.c                            |    2 +-
 hw/virtio/virtio-pci.c                             |   63 +-
 hw/virtio/virtio.c                                 |   33 +-
 hw/watchdog/wdt_i6300esb.c                         |    6 +-
 stubs/pci-drive-hot-add.c                          |   10 -
 tests/bios-tables-test.c                           |   45 +-
 vl.c                                               |   34 +-
 default-configs/i386-softmmu.mak                   |    1 -
 default-configs/x86_64-softmmu.mak                 |    1 -
 hmp-commands.hx                                    |   32 -
 hw/acpi/Makefile.objs                              |    1 +
 hw/i386/Makefile.objs                              |    4 +-
 hw/i386/acpi-dsdt-cpu-hotplug.dsl                  |   17 +-
 hw/i386/acpi-dsdt-isa.dsl                          |   11 -
 hw/i386/acpi-dsdt-mem-hotplug.dsl                  |   36 +-
 hw/i386/acpi-dsdt-pci-crs.dsl                      |   92 --
 hw/i386/acpi-dsdt.dsl                              |   46 -
 hw/i386/acpi-dsdt.hex.generated                    |  224 +---
 hw/i386/q35-acpi-dsdt.dsl                          |   19 -
 hw/i386/q35-acpi-dsdt.hex.generated                |  224 +---
 hw/i386/ssdt-mem.dsl                               |   77 --
 hw/i386/ssdt-mem.hex.generated                     |  213 ----
 hw/i386/ssdt-misc.dsl                              |  122 --
 hw/i386/ssdt-misc.hex.generated                    |  399 -------
 hw/i386/ssdt-pcihp.dsl                             |  100 --
 hw/i386/ssdt-pcihp.hex.generated                   |  251 -----
 hw/i386/ssdt-proc.dsl                              |   63 --
 hw/i386/ssdt-proc.hex.generated                    |  134 ---
 hw/pci/Makefile.objs                               |    2 -
 scripts/update-linux-headers.sh                    |   52 +-
 stubs/Makefile.objs                                |    1 -
 tests/acpi-test-data/pc/DSDT                       |  Bin 3621 -> 2970 bytes
 tests/acpi-test-data/pc/SSDT                       |  Bin 2279 -> 2476 bytes
 tests/acpi-test-data/pc/SSDT.bridge                |  Bin 0 -> 4335 bytes
 tests/acpi-test-data/q35/DSDT                      |  Bin 8211 -> 7608 bytes
 tests/acpi-test-data/q35/SSDT                      |  Bin 560 -> 681 bytes
 tests/acpi-test-data/q35/SSDT.bridge               |  Bin 0 -> 698 bytes
 153 files changed, 3576 insertions(+), 4409 deletions(-)
 create mode 100644 include/hw/acpi/aml-build.h
 create mode 100644 include/standard-headers/asm-s390/kvm_virtio.h
 create mode 100644 include/standard-headers/asm-s390/virtio-ccw.h
 create mode 100644 include/standard-headers/linux/if_ether.h
 create mode 100644 include/standard-headers/linux/types.h
 create mode 100644 include/standard-headers/linux/virtio_9p.h
 create mode 100644 include/standard-headers/linux/virtio_balloon.h
 create mode 100644 include/standard-headers/linux/virtio_blk.h
 create mode 100644 include/standard-headers/linux/virtio_config.h
 create mode 100644 include/standard-headers/linux/virtio_console.h
 create mode 100644 include/standard-headers/linux/virtio_ids.h
 create mode 100644 include/standard-headers/linux/virtio_net.h
 create mode 100644 include/standard-headers/linux/virtio_pci.h
 rename include/{hw/virtio => standard-headers/linux}/virtio_ring.h (61%)
 create mode 100644 include/standard-headers/linux/virtio_rng.h
 create mode 100644 include/standard-headers/linux/virtio_scsi.h
 create mode 100644 include/standard-headers/linux/virtio_types.h
 create mode 100644 hw/acpi/aml-build.c
 delete mode 100644 hw/pci/pci-hotplug-old.c
 delete mode 100644 stubs/pci-drive-hot-add.c
 delete mode 100644 hw/i386/acpi-dsdt-pci-crs.dsl
 delete mode 100644 hw/i386/ssdt-mem.dsl
 delete mode 100644 hw/i386/ssdt-mem.hex.generated
 delete mode 100644 hw/i386/ssdt-misc.dsl
 delete mode 100644 hw/i386/ssdt-misc.hex.generated
 delete mode 100644 hw/i386/ssdt-pcihp.dsl
 delete mode 100644 hw/i386/ssdt-pcihp.hex.generated
 delete mode 100644 hw/i386/ssdt-proc.dsl
 delete mode 100644 hw/i386/ssdt-proc.hex.generated
 create mode 100644 tests/acpi-test-data/pc/SSDT.bridge
 create mode 100644 tests/acpi-test-data/q35/SSDT.bridge

Comments

Michael S. Tsirkin March 2, 2015, 10:59 a.m. UTC | #1
From: Igor Mammedov <imammedo@redhat.com>

PCI0._CRS was moved into SSDT and became the same for
PIIX4/Q35 machines.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 tests/acpi-test-data/pc/DSDT  | Bin 3415 -> 2970 bytes
 tests/acpi-test-data/pc/SSDT  | Bin 2374 -> 2480 bytes
 tests/acpi-test-data/q35/DSDT | Bin 8005 -> 7608 bytes
 tests/acpi-test-data/q35/SSDT | Bin 578 -> 685 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 ad12cb35d9dafc4d50002873f5c4ca04552b36df..1693c3783b34cfb5473e7ef65ba6f8deee390898 100644
GIT binary patch
delta 45
zcmcaEHA|e!CD<io7B>R}W5h(Rj?Icp+>8P~()!Ht!A|i3&YlLI!H)5pvzXs<0ss&x
B3^@P*

delta 471
zcmX|;PfG$p7{=dmA=YWu6e24^q(i4D|FOqtT^BPf21n}9Vf+XZ5qMG}P$DSt5*?zz
zt4j0%@>_JQL)Q+S^3*i1+xi}6e$Vp^54_BM{B4yMM4@_Y0g&@9?KBUUx1`8R?v_%f
zTk%9JPw7L)f)E27g$F5;37artYM(Fztsfmv*i2h$pv|X1FAUWX;2Q#+9KDYK#xwmn
zQo4AJx8pW|UkE@!sd?<y6M}YJC&X9qq15ZI&*MY`Ot%*auQXfQQ8@pvf(!iyEIL%W
z6#-Yc6}{#noAL3Mdja0@ayC=vDIqb|;7JVYr)N{tJ`lh+kF3YjM-uv2cH>s;9E~_!
z*g2n<xEJ6CFWb2~Ph;g2uyP7ziP0rCU_q^4d+su_v!B>Df*&XeN1j}4iUU`ga<5ci
gb5S6s6jg_UiQB}Y)G87%z#z%>UA^VYfP97j0NTcIKL7v#

diff --git a/tests/acpi-test-data/pc/SSDT b/tests/acpi-test-data/pc/SSDT
index d0103368a0b9e3d5410372f1f589df4eeeebaf03..dc5be2497b6c2015d7cbabb1ff0cd13e02b3e0e4 100644
GIT binary patch
delta 200
zcmX>mv_Y6FIM^j*11AFm<DZFK()F%_F?#XAPVoWGo(3H8&OyO~PV8KH9lQ)oJPaW4
zA4D*^GydTD!NbS_6ldgN1_^x!O8?-2^LhV+6n<_OXJCNHGca&5{Qu7lQVIl23}6{X
z2#<l||Ns5}z-(291K%ncqMMvq+yh*J4)E}F;SKN$FmN<5W8jDn1@b`R6IaV}JXrr=
NJtIpc!^W0F901$MEt&uT

delta 118
zcmdlWd`yTdIM^k`jgx_a(Pko-bi5O53<F1iL2x_|0|NsGkmVZB^Z)<;e;fgZVewo*
pDZ}7+L2fP%pez^w1zgbud{6`gJXmA&;)9*y1Drh#HoiN=0RVk=7KQ)-

diff --git a/tests/acpi-test-data/q35/DSDT b/tests/acpi-test-data/q35/DSDT
index de430e2a68e203518384b1db75baaefc02f2aa33..e9ac11c38ff98c36ba0c06abfd6b01fcb94b4452 100644
GIT binary patch
delta 46
zcmX?Vx5JvtCD<iohb#jF<Ft)j@r;{KFmW>q_(<zB#|Jyb2RM5gcm_MhZx&=Rkp=)i
CoD7=)

delta 425
zcmX|-Jxc>Y5Qb-R5RY{u3HX5oqF7jo=Ho~s1TU8(Mxrd)V52Z8Q%Mk;R1pa%HWv8<
z7OCtcjh#0B1}*&$HmO{9?mVa1edc|Kmz{mtf3Jy#Zgj&90DO8Dgrk#{UD9<@L96Hn
zolxiM3*zD~11Skyh7WAwT+SuBR!8Zu^kMB!`QK*@4}RaS0mMFl0Am(;)K&^22jdRD
zjCuWuIsH}`f*VXIzdpLQlHvLrOD@)ju<Q#8IvVczmEv6KN;$@!3KQ(BcBMQ}MNMp5
z2#L+X<yC}M2LzsZloM4tC75#9L(r*uV#!y!>czaO!UVTfyXp;8i6bN6$OziR)|eAG
zpf~N!`Y5q>RM>NpFKua`&Te+}aX>B|wi+^>1$0SweE}}7lgo-s6TtxoH@6P#nzM1r
G%l`r~K4Uik

diff --git a/tests/acpi-test-data/q35/SSDT b/tests/acpi-test-data/q35/SSDT
index f86643da45ad89a97a652233cb090516afde7b31..749f368e3034bfb491dcd8ced37936e0dcbba02a 100644
GIT binary patch
delta 200
zcmX@avX+%AIM^j*EfWI+<D!XN()FG^F?#XAPVoWGo(3H8&OyO~PV8KH9lQ)oJPaW4
zA4D*^GydTD!NbS_6ldgN1_^x!O8?-2^LhV+6n<_OXJCNHGca&5{Qu7lQVIl23}6{X
z2#?{w|Nr~{f!V4I2ka^tqMMvq+yh*J4)E}F;SKN$FmN<5W8jDn1@b`R6Yt1!D6lE8
NF$z>NY;4}o2modBDslh-

delta 117
zcmZ3>dWeN9IM^k`iHU)MaoI#J={P6W7zU02gWz}`1_p)$K$dGf&;S4X|8WEuhQ)IM
or3{1P1-ZF6fU;l!6mUfs@Ies};EvIY4|a+VaP~CV_-;QV0J~ckEdT%j
Michael S. Tsirkin March 2, 2015, 10:59 a.m. UTC | #2
From: Igor Mammedov <imammedo@redhat.com>

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 tests/acpi-test-data/pc/SSDT.bridge  | Bin 0 -> 4352 bytes
 tests/acpi-test-data/q35/SSDT.bridge | Bin 0 -> 702 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 tests/acpi-test-data/pc/SSDT.bridge
 create mode 100644 tests/acpi-test-data/q35/SSDT.bridge

diff --git a/tests/acpi-test-data/pc/SSDT.bridge b/tests/acpi-test-data/pc/SSDT.bridge
new file mode 100644
index 0000000000000000000000000000000000000000..b807ac92dde72719fe3861c710b555fe3dd62583
GIT binary patch
literal 4352
zcmeH}&2HO96ov0ljLlF~Ov!ZYIC0FayGZCbaon9GlCk_ln$S=|3K`*|2&w=@6C@3a
zz#H2I)b6`4vdB7mg!U2o2-)-r3bgK~>b<0{<b|f_vIV3CHHY`pnHkP-j-(7yr~-%|
zn@4_2y3HqvFY%rL0BX~>9afL;WU`qh{+?%Kep^<X^X6CIS3t9{3^1gN*cBJng(VEU
zFRT*X`UA@s)>v1D1pfBjGC)xWFkv_>6N(=V@(T4xA7eQD>93;s^Y3q=d+zJINr?To
z_JT?hCtkzb1|#dBqWkWvXRlwpdG-0T*LYK=4YOQ~v|^gO;^W}sK<H$$uP3dfJ<S9s
z=eAya{qoB<U;LvNe1H$ac?<T&G4-^S)#h}8gU0s#tY+w@W@@>5Koy#Reefqez3%ye
zeuo}m(hg-l0;}<hIaf@<Pdfju_W=xqi!(V*+A<Yo7?^JN%*q8`vbx><cFRvZuXu8f
zl|_vd-up?^02KIONXQhNN*3;W0!6qFJ*O6@k3Q4hm4D~~^y&A{4L>=GYb7CU-#ETo
z;`NVONnk`l+{OvhPRO4xuA>PnG^$n-wQ*FYxzasbCsB&p%|jP2Exa63>kwPXlMIKw
znA1=<qflld+KZ*=o-Gx>k|DB3;bXi=-*x698lT<xHQ$3xtm0xWNYBfRtP!;Heb_z!
zL~c%QXyD+QYzFW?Z`|X?7B#x(8}c5pvJ;y+d+6ZQ^2d_+;XZXj<s97^p;s8aqC&UW
z6<4+x*_;w(*Lg<gRp@<oH5fIND7#)|^r{Mdz^*2vrV?dWe6NaWl~w3AyIPD|N|aqI
zj8;_WLw3E!=rtwEt_zGVsL&mDwHdXQD7#h}t*X#Z*|o-KO^LGWBBP5cw85^puZtyc
zlqkC{F}kEeo9ud>(d$Z-U6&bMR-rz-t}wcyMA`KQqc>D&z^<!|t}0P>y~*fJ6&kYZ
zEk<uCQFdKpbWMdmV%OV@-d3XQy3XkOG}Jj*4Iam-_Rc!#nKtz40DGPbm&DFU)KTCe
zR8&q$P^EIxD}z9VC&@@@q{cNJ6`lv9nn7w@qt5WH9@VI~?QxB|!*_F3qy8RJZQ-Pc
zhcf13U*bE)8j}(Aq>lO6m-x1D-N^N%Zj;7+&viG~lX{&r?qIH;=6X`kXN-H1>-Z<5
zFa1k(nl<jKah>KJT&mN|aes{KF6m44I%-_$as8Au)}4*Sk5hOF&A1cMs$p(*#HbON
zrKk8$AWr4x4*o4T{D!`ZC@S#|D1ku%Bq)9Il%t@+%;m6C1eM1|f>AMTE0Jp+mE@{1
ziitTr{-zC2fzCp87OJyQorUWECRF3KB2>#KJ&H#>Ym4Nhq`=d(5EK)5UKWBf0#C$3
T%yO7={=b{U>qQO=MGpTBc|!Xx

literal 0
HcmV?d00001

diff --git a/tests/acpi-test-data/q35/SSDT.bridge b/tests/acpi-test-data/q35/SSDT.bridge
new file mode 100644
index 0000000000000000000000000000000000000000..c552782f5bcc57094a7d1375b67979b2efa48f1c
GIT binary patch
literal 702
zcmaJ<&2G~`5T12{vDO=5f)N!Le1$`C2}PVx?X`*1#?H#?q9RAy1F9%eMNvx+y^$aR
zcV2))p96RVj(HCb<b;`VXt}Y6+3%YleKWJGby9t`09YJPWTu07Pf3kF1^|TV_C{j5
zZggyv9EFaNrM@0t<*z^Wz!De+XvnZ3TZ*M%4*Hqskn0zQm*SH58cO{6@fN@;4#1&l
zTuQ}bK^q}OI^Ub-+wZ^d$r;ph*&V7B^|MjZQ-unn@DVs>7a943<NcGP)8iNWC+O5w
z#NAb=J<f+LumhWUXW-qPQgmSYc9)?L;)ka1bh*WG2go)lLZV)Jn<lR3JKc2}Ta~G9
zrA73E+bdbAc7yEb?VH2Xm;Y5?h=pJQj_^*Ex?=7^@SvWFmY^|PUj2R`RT!?O^@Yi!
z3eKg<BS3<~5YZL*J(F&S3`x2T2Y$b(o<6s}xStOIK2ZHDN2*ED?=a>`XL`SL@n(6Z
z5+_fJ5=W%hYj=XX=deayWhyV33!JajvpYmOc^QubG#Q#Pp)n%0XRz%XZ8mK2Jk^Hf
zqe8QKc5_vwQ_P*D&(LTY_;ybHc{^8Vf%W{F4nyOZC@I@tQ_t_|@bRUCfsgy&NZ`B$
U4=%uf02OciE4IM5l`Jaw0}NP~0RR91

literal 0
HcmV?d00001
Michael S. Tsirkin March 2, 2015, 10:59 a.m. UTC | #3
From: Igor Mammedov <imammedo@redhat.com>

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 tests/acpi-test-data/pc/SSDT.bridge | Bin 4352 -> 4351 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/tests/acpi-test-data/pc/SSDT.bridge b/tests/acpi-test-data/pc/SSDT.bridge
index b807ac92dde72719fe3861c710b555fe3dd62583..ca7f63cb4e48bd95418f68daf1b7e254d5bcf8c2 100644
GIT binary patch
delta 79
zcmZor`me|p9PASEUx0yu@ybT7Xhue_&1sCDjEoMGH!yjL@dq1P#B;<ux&-ksFfcO+
fc$a|$HqYivW#8<}wUuS_TK2Py93Zg(XTJ~taxE4S

delta 76
zcmeyb*r3D}9PARpAjrVLIBz3YG$W(;<}^l6Mn=cU8<@N{mvc3+DF!(Eg#;T~#78&z
dl!IuF_~1}KE@qB+N0%TT1_ow^%>vA+>;M#S6CwZr
Michael S. Tsirkin March 2, 2015, 11 a.m. UTC | #4
more trivial changes as more code has been rewritten in C.
we also got rid of extra Scope operators.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 tests/acpi-test-data/pc/SSDT         | Bin 2480 -> 2476 bytes
 tests/acpi-test-data/pc/SSDT.bridge  | Bin 4351 -> 4335 bytes
 tests/acpi-test-data/q35/SSDT        | Bin 685 -> 681 bytes
 tests/acpi-test-data/q35/SSDT.bridge | Bin 702 -> 698 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/tests/acpi-test-data/pc/SSDT b/tests/acpi-test-data/pc/SSDT
index dc5be2497b6c2015d7cbabb1ff0cd13e02b3e0e4..87c3e9fc0271f2b5826877a9f931c2428838f8a7 100644
GIT binary patch
delta 56
zcmdlWyhfNSIM^j*4JQKwBj-l0Xhuf&&1sCDj1s>20nVNV98STmJ`B-K+`$G0@f`7v
ME<u}5Gd*Pk0F%WI{r~^~

delta 60
zcmZ1@yg`^NIM^j*11AFm<DZRO(Tt4Vo6{IQ8D$&`0-QY!IGloAeHfyf_=61$;yL0S
QU4nQR7#KDmXL`y80P^Dx{r~^~

diff --git a/tests/acpi-test-data/pc/SSDT.bridge b/tests/acpi-test-data/pc/SSDT.bridge
index ca7f63cb4e48bd95418f68daf1b7e254d5bcf8c2..325899a757221b732ec94101301d782b577b28a3 100644
GIT binary patch
delta 115
zcmeyb_+F7KIM^lRy#NCPW6(yf7)Hh)o6{LR8O5IjIC~m!I0d`<Fhn<T2OAi~bHqEk
z1Wi88q_5#$7Hnt%;qx#sFf)LaF-AA3K$HcC`Y}Kh8?uUVX#^X9)B*)J`!R3i1pr(r
B9=QMj

delta 129
zcmaE__+ODLIM^lRzW@UR<CTqEF^r5qH>WdtGD<%UaP~Cda0+(yVTf+x4>mA}=ZJT7
z3F2X3V3>TIN#B@1*w6wl#LOVzT?Q5aX<&?Q(u8OT4)x<=K<HCsmEbf0=>mywwqxGN
F3jplmASnO<

diff --git a/tests/acpi-test-data/q35/SSDT b/tests/acpi-test-data/q35/SSDT
index 749f368e3034bfb491dcd8ced37936e0dcbba02a..6a5c0423b93dd9eda038dc4fd4af283f6bba9745 100644
GIT binary patch
delta 49
zcmZ3>x{{SEIM^j*B@+V!<Gzht{EUnao23{%8HL<f0-QY!qMNvb4GiKr;vHRrCRZ|<
F001vN3>g3b

delta 53
zcmZ3<x|WqIIM^j*EfWI+<D!jR{EUn)o23{%8O6L<0-QY!qMP`G4GiKr;vHRrco-NM
JCYLgq003C=3>g3b

diff --git a/tests/acpi-test-data/q35/SSDT.bridge b/tests/acpi-test-data/q35/SSDT.bridge
index c552782f5bcc57094a7d1375b67979b2efa48f1c..5fc83a034002df64500970fa64f07b58bc15f3ea 100644
GIT binary patch
delta 49
zcmdnTx{H-7IM^j*7ZU>mW86kAenv*e%~Fh>j6&|L0nVNV(M{aJ1_tpQ@s2J*lPj5A
E0V{qC00000

delta 53
zcmdnRx{sABIM^j*9}@!uqtiw%env*u%~Fh>jAGub0nVNV(M|lp1_tpQ@s2J*JPZsB
IlS`Rg0aS_%00000
Michael S. Tsirkin March 2, 2015, 2:32 p.m. UTC | #5
Igor noticed a problem on hosts without iasl.
I will redo this later.

On Mon, Mar 02, 2015 at 11:58:09AM +0100, Michael S. Tsirkin wrote:
> Hello, Peter!
> 
> This should be the last big pull as we are entering hard freeze.
> 
> This is an update of my previous pull request from
> http://mid.gmane.org/20150226165911.GA20287@redhat.com
>   git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream_rebased
> as the tree was not rebased since, you can either do both pulls or
> only this latest pull, result will be exactly the same.
> 
> Note: I only included here the extra 26 patches, on top of what was previously posted
> http://mid.gmane.org/1424295164-4774-1-git-send-email-mst@redhat.com
> if you merge PULL v2 first, you will see just these 26 patches.
> 
> I hope all this helps reduce the amount of noise rather
> than increase it.
> 
> Note: these patches remove some generated files that we previously
> compiled. Our build system doesn't handle this well for incremental
> builds, resulting in build errors. This is not new, incremental
> builds aren't 100% reliable. You can find and remove the
> stale .d files from the removed sources, this will fix it -
> for example, if you get an error about a missing ssdt-misc.dsl,
> find and remove ssdt-misc.d in output directory.
> 
> The following changes since commit 11d39a131020cc5c54ff9bc86d3259f7d32bf849:
> 
>   Merge remote-tracking branch 'remotes/borntraeger/tags/s390x-20150218' into staging (2015-02-26 09:08:54 +0000)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream
> 
> for you to fetch changes up to e32dccddb0b1fa335bf251c155e907f9d47accfd:
> 
>   acpi-test-data: update after pci rewrite (2015-03-01 19:41:50 +0100)
> 
> ----------------------------------------------------------------
> pci, pc, virtio fixes and cleanups
> 
> Last pull for hard freeze.
> 
> A bunch of fixes all over the place.
> All of ACPI refactoring has been merged.
> Legacy pci commands have been dropped.
> 
> Additionally, this includes patches from soft-freeze
> (which apparently haven't been merged yet):
> 
> a bunch of fixes all over the place
> virtio header cleanup
> initial patches from virtio-1.0 branch
> 
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> 
> ----------------------------------------------------------------
> Cornelia Huck (3):
>       virtio: cull virtio_bus_set_vdev_features
>       virtio: feature bit manipulation helpers
>       virtio: add feature checking helpers
> 
> Denis V. Lunev (1):
>       balloon: call qdev_alias_all_properties for proxy dev in balloon class init
> 
> Igor Mammedov (59):
>       acpi: move generic aml building helpers into dedictated file
>       acpi: add build_append_namestring() helper
>       acpi: drop min-bytes in build_package()
>       pc: acpi-build: update linker on guest access
>       pc: acpi-build: migrate RSDP table
>       pc: acpi: use local var for accessing ACPI tables blob in acpi_build()
>       acpi: introduce AML composer aml_append()
>       acpi: add aml_scope() term
>       pc: acpi-build: use aml_scope() for \_SB scope
>       acpi: add aml_device() term
>       acpi: add aml_method() term
>       acpi: add aml_if() term
>       acpi: add aml_name() & aml_name_decl() term
>       acpi: add aml_int() term
>       acpi: add aml_return() term
>       acpi: add aml_arg() term
>       acpi: add aml_store() term
>       acpi: add aml_and() term
>       acpi: add aml_notify() term
>       acpi: add aml_call1(), aml_call2(), aml_call3(), aml_call4() helpers
>       acpi: add aml_package() term
>       pc: acpi-build: generate _S[345] packages dynamically
>       acpi: add aml_buffer() term
>       acpi: add aml_resource_template() helper
>       acpi: add aml_io() helper
>       acpi: include PkgLength size only when requested
>       acpi: add aml_operation_region() term
>       acpi: add aml_field() & aml_named_field() terms
>       acpi: add aml_local() term
>       acpi: add aml_string() term
>       pc: acpi-build: generate pvpanic device description dynamically
>       acpi: add aml_varpackage() term
>       acpi: add aml_equal() term
>       acpi: add aml_processor() term
>       acpi: add aml_eisaid() term
>       pc: acpi-build: drop template patching and CPU hotplug objects dynamically
>       pc: acpi-build: create CPU hotplug IO region dynamically
>       acpi: add aml_reserved_field() term
>       pc: acpi-build: drop template patching and memory hotplug objects dynamically
>       pc: acpi-build: create memory hotplug IO region dynamically
>       acpi: add aml_word_bus_number(), aml_word_io(), aml_dword_memory(), aml_qword_memory() terms
>       pc: pcihp: expose MMIO base and len as properties
>       pc: acpi-build: reserve PCIHP MMIO resources
>       pc: acpi-build: create PCI0._CRS dynamically
>       pc: acpi: drop manual hole punching for PCI hotplug resources
>       pc: acpi: drop manual hole punching for CPU hotplug resources
>       pc: acpi: drop manual hole punching for GPE0 resources
>       pc: acpi-build: drop remaining ssdt_misc template
>       acpi: add acpi_irq_no_flags() term
>       pc: export applesmc IO port/len
>       pc: acpi-build: drop template patching and create Device(SMC) dynamically
>       tests: ACPI test blobs update due to PCI0._CRS changes
>       tests: bios-tables-test: add support for testing bridges
>       tests: add ACPI blobs for qemu with bridge cases
>       pc: acpi-build: simplify PCI bus tree generation
>       tests: ACPI: update pc/SSDT.bridge due to new alg of PCI tree creation
>       pc: acpi-build: drop template patching and create PCI bus tree dynamically
>       pc: acpi: remove not used anymore ssdt-[misc|pcihp].hex.generated blobs
>       acpi: make build_*() routines static to aml-build.c
> 
> Markus Armbruster (13):
>       pci: Convert core to realize
>       pci: Permit incremental conversion of device models to realize
>       pci: Trivial device model conversions to realize
>       pcnet: pcnet_common_init() always returns 0, change to void
>       pcnet: Convert to realize
>       serial-pci: Convert to realize
>       ide/ich: Convert to realize
>       cirrus-vga: Convert to realize
>       qxl: Convert to realize
>       pci-assign: Convert to realize
>       qdev: Don't exit when running into bad -global
>       pci: Give a few helpers internal linkage
>       pci-hotplug-old: Has been dead for five major releases, bury
> 
> Michael S. Tsirkin (33):
>       acpi-build: fix memory leak with bridge hp off
>       bios linker: validate pointer within table
>       acpi: update RSDP on guest access
>       exec: round up size on MR resize
>       acpi-build: fix ACPI RAM management
>       acpi: has_immutable_rsdp->!rsdp_in_ram
>       acpi-build: simplify rsdp management for legacy
>       scripts/update-linux-headers.sh: pull virtio hdrs
>       include: import virtio headers from linux 4.0
>       virtio: use standard virtio_ring.h
>       virtio: use standard-headers
>       virtio-balloon: use standard headers
>       virtio-9p: use standard headers
>       virtio-blk: switch to standard-headers
>       virtio-net,tap: use standard-headers
>       virtio-rng: use standard-headers
>       virtio-scsi: use standard-headers
>       virtio-serial: switch to standard-headers
>       update-linux-headers: use standard-headers
>       linux-headers: use standard-headers
>       virtio-pci: use standard headers
>       scripts: add arch specific standard-headers
>       standard-headers: add s390 virtio headers
>       s390: use standard headers
>       acpi-build: skip hotplugged bridges
>       update-linux-headers.sh: s/__inline__/inline/
>       virtio-serial-bus.c: drop virtio_ids.h
>       standard-headers: include stdint.h
>       virtio_ring.h: s/__inline__/inline/
>       acpi: update generated hex files
>       acpi: drop unused generated files
>       acpi-test: update expected files
>       acpi-test-data: update after pci rewrite
> 
> Peter Krempa (2):
>       vl.c: Fix error messages when parsing maxmem parameters
>       pc: memory: Validate alignment of maxram_size to page size
> 
> Stefan Berger (5):
>       tpm: Extend sts register to 32 bit
>       tpm: Allow 32 & 16 bit accesses to the registers
>       tpm: Support for XFIFO register
>       tpm: Support for TIS selftest done flag
>       tpm: Support for capability flags of TIS 1.3
> 
> Tang Chen (6):
>       acpi, pc: Add hotunplug request cb for pc machine.
>       acpi, ich9: Add hotunplug request cb for ich9.
>       acpi, pc: Add unplug cb for pc machine.
>       acpi, ich9: Add unplug cb for ich9.
>       acpi, piix4: Add unplug cb for piix4.
>       acpi, mem-hotplug: use PC_DIMM_SLOT_PROP in acpi_memory_plug_cb().
> 
>  hw/9pfs/virtio-9p.h                                |   18 +-
>  hw/net/pcnet.h                                     |    2 +-
>  hw/s390x/s390-virtio-bus.h                         |   36 +-
>  hw/s390x/s390-virtio.h                             |    7 +-
>  hw/tpm/tpm_int.h                                   |    1 +
>  hw/tpm/tpm_tis.h                                   |    2 +-
>  include/hw/acpi/aml-build.h                        |  191 ++++
>  include/hw/acpi/ich9.h                             |    4 +
>  include/hw/acpi/pc-hotplug.h                       |    1 +
>  include/hw/acpi/pcihp.h                            |    7 +-
>  include/hw/i386/pc.h                               |    1 +
>  include/hw/isa/isa.h                               |   11 +-
>  include/hw/pci/pci.h                               |   10 +-
>  include/hw/qdev-properties.h                       |    4 +-
>  include/hw/virtio/dataplane/vring-accessors.h      |    2 +-
>  include/hw/virtio/dataplane/vring.h                |    2 +-
>  include/hw/virtio/virtio-balloon.h                 |   35 +-
>  include/hw/virtio/virtio-blk.h                     |   77 +-
>  include/hw/virtio/virtio-bus.h                     |    3 -
>  include/hw/virtio/virtio-net.h                     |  151 +--
>  include/hw/virtio/virtio-rng.h                     |    4 +-
>  include/hw/virtio/virtio-scsi.h                    |  120 +-
>  include/hw/virtio/virtio-serial.h                  |   40 +-
>  include/hw/virtio/virtio.h                         |   71 +-
>  include/net/tap.h                                  |   24 +-
>  include/standard-headers/asm-s390/kvm_virtio.h     |   64 ++
>  include/standard-headers/asm-s390/virtio-ccw.h     |   21 +
>  include/standard-headers/linux/if_ether.h          |    1 +
>  include/standard-headers/linux/types.h             |    2 +
>  include/standard-headers/linux/virtio_9p.h         |   44 +
>  include/standard-headers/linux/virtio_balloon.h    |   59 +
>  include/standard-headers/linux/virtio_blk.h        |  143 +++
>  include/standard-headers/linux/virtio_config.h     |   64 ++
>  include/standard-headers/linux/virtio_console.h    |   78 ++
>  include/standard-headers/linux/virtio_ids.h        |   43 +
>  include/standard-headers/linux/virtio_net.h        |  233 ++++
>  include/standard-headers/linux/virtio_pci.h        |  193 ++++
>  .../linux}/virtio_ring.h                           |  132 +--
>  include/standard-headers/linux/virtio_rng.h        |    8 +
>  include/standard-headers/linux/virtio_scsi.h       |  164 +++
>  include/standard-headers/linux/virtio_types.h      |   46 +
>  include/sysemu/blockdev.h                          |    2 -
>  include/sysemu/sysemu.h                            |    5 -
>  include/sysemu/tpm_backend.h                       |    2 +-
>  linux-headers/linux/virtio_config.h                |   58 +-
>  linux-headers/linux/virtio_ring.h                  |  164 +--
>  device-hotplug.c                                   |    7 +-
>  exec.c                                             |    2 +
>  hw/9pfs/virtio-9p-device.c                         |    2 +-
>  hw/acpi/aml-build.c                                |  888 +++++++++++++++
>  hw/acpi/bios-linker-loader.c                       |    4 +-
>  hw/acpi/ich9.c                                     |   14 +
>  hw/acpi/memory_hotplug.c                           |    3 +-
>  hw/acpi/pcihp.c                                    |   18 +-
>  hw/acpi/piix4.c                                    |   15 +-
>  hw/audio/ac97.c                                    |    5 +-
>  hw/audio/es1370.c                                  |    5 +-
>  hw/audio/intel-hda.c                               |    6 +-
>  hw/block/virtio-blk.c                              |   31 +-
>  hw/char/serial-pci.c                               |   22 +-
>  hw/char/virtio-serial-bus.c                        |    4 +-
>  hw/core/qdev-properties.c                          |   21 +-
>  hw/core/qdev.c                                     |    8 +-
>  hw/display/cirrus_vga.c                            |   11 +-
>  hw/display/qxl.c                                   |   36 +-
>  hw/display/vga-pci.c                               |   11 +-
>  hw/display/vmware_vga.c                            |    6 +-
>  hw/i2c/smbus_ich9.c                                |    5 +-
>  hw/i386/acpi-build.c                               | 1179 +++++++++-----------
>  hw/i386/kvm/pci-assign.c                           |   10 +-
>  hw/i386/pc.c                                       |   23 +
>  hw/i386/pc_piix.c                                  |    3 +
>  hw/i386/pc_q35.c                                   |    3 +
>  hw/ide/cmd646.c                                    |    5 +-
>  hw/ide/ich.c                                       |   13 +-
>  hw/ide/piix.c                                      |   10 +-
>  hw/ide/via.c                                       |    6 +-
>  hw/ipack/tpci200.c                                 |    6 +-
>  hw/isa/i82378.c                                    |    6 +-
>  hw/isa/lpc_ich9.c                                  |   14 +-
>  hw/isa/piix4.c                                     |    5 +-
>  hw/isa/vt82c686.c                                  |   24 +-
>  hw/misc/applesmc.c                                 |    5 +-
>  hw/misc/pci-testdev.c                              |    6 +-
>  hw/net/e1000.c                                     |    6 +-
>  hw/net/eepro100.c                                  |    6 +-
>  hw/net/lance.c                                     |    3 +-
>  hw/net/ne2000.c                                    |    6 +-
>  hw/net/pcnet-pci.c                                 |    6 +-
>  hw/net/pcnet.c                                     |    4 +-
>  hw/net/rtl8139.c                                   |    6 +-
>  hw/net/vhost_net.c                                 |    2 +-
>  hw/net/virtio-net.c                                |   57 +-
>  hw/net/vmxnet3.c                                   |    6 +-
>  hw/pci-bridge/dec.c                                |    5 +-
>  hw/pci-host/apb.c                                  |    5 +-
>  hw/pci-host/bonito.c                               |    6 +-
>  hw/pci-host/grackle.c                              |    5 +-
>  hw/pci-host/piix.c                                 |   12 +-
>  hw/pci-host/ppce500.c                              |    6 +-
>  hw/pci-host/prep.c                                 |    6 +-
>  hw/pci-host/q35.c                                  |    5 +-
>  hw/pci-host/uninorth.c                             |   20 +-
>  hw/pci-host/versatile.c                            |    5 +-
>  hw/pci/pci-hotplug-old.c                           |  342 ------
>  hw/pci/pci.c                                       |  127 ++-
>  hw/s390x/virtio-ccw.c                              |   12 +-
>  hw/scsi/virtio-scsi.c                              |    9 +-
>  hw/sd/sdhci.c                                      |    5 +-
>  hw/tpm/tpm_passthrough.c                           |   37 +-
>  hw/tpm/tpm_tis.c                                   |  131 ++-
>  hw/usb/hcd-ehci-pci.c                              |    6 +-
>  hw/usb/hcd-xhci.c                                  |    6 +-
>  hw/virtio/dataplane/vring.c                        |   10 +-
>  hw/virtio/virtio-balloon.c                         |    2 +-
>  hw/virtio/virtio-bus.c                             |   14 -
>  hw/virtio/virtio-mmio.c                            |    2 +-
>  hw/virtio/virtio-pci.c                             |   63 +-
>  hw/virtio/virtio.c                                 |   33 +-
>  hw/watchdog/wdt_i6300esb.c                         |    6 +-
>  stubs/pci-drive-hot-add.c                          |   10 -
>  tests/bios-tables-test.c                           |   45 +-
>  vl.c                                               |   34 +-
>  default-configs/i386-softmmu.mak                   |    1 -
>  default-configs/x86_64-softmmu.mak                 |    1 -
>  hmp-commands.hx                                    |   32 -
>  hw/acpi/Makefile.objs                              |    1 +
>  hw/i386/Makefile.objs                              |    4 +-
>  hw/i386/acpi-dsdt-cpu-hotplug.dsl                  |   17 +-
>  hw/i386/acpi-dsdt-isa.dsl                          |   11 -
>  hw/i386/acpi-dsdt-mem-hotplug.dsl                  |   36 +-
>  hw/i386/acpi-dsdt-pci-crs.dsl                      |   92 --
>  hw/i386/acpi-dsdt.dsl                              |   46 -
>  hw/i386/acpi-dsdt.hex.generated                    |  224 +---
>  hw/i386/q35-acpi-dsdt.dsl                          |   19 -
>  hw/i386/q35-acpi-dsdt.hex.generated                |  224 +---
>  hw/i386/ssdt-mem.dsl                               |   77 --
>  hw/i386/ssdt-mem.hex.generated                     |  213 ----
>  hw/i386/ssdt-misc.dsl                              |  122 --
>  hw/i386/ssdt-misc.hex.generated                    |  399 -------
>  hw/i386/ssdt-pcihp.dsl                             |  100 --
>  hw/i386/ssdt-pcihp.hex.generated                   |  251 -----
>  hw/i386/ssdt-proc.dsl                              |   63 --
>  hw/i386/ssdt-proc.hex.generated                    |  134 ---
>  hw/pci/Makefile.objs                               |    2 -
>  scripts/update-linux-headers.sh                    |   52 +-
>  stubs/Makefile.objs                                |    1 -
>  tests/acpi-test-data/pc/DSDT                       |  Bin 3621 -> 2970 bytes
>  tests/acpi-test-data/pc/SSDT                       |  Bin 2279 -> 2476 bytes
>  tests/acpi-test-data/pc/SSDT.bridge                |  Bin 0 -> 4335 bytes
>  tests/acpi-test-data/q35/DSDT                      |  Bin 8211 -> 7608 bytes
>  tests/acpi-test-data/q35/SSDT                      |  Bin 560 -> 681 bytes
>  tests/acpi-test-data/q35/SSDT.bridge               |  Bin 0 -> 698 bytes
>  153 files changed, 3576 insertions(+), 4409 deletions(-)
>  create mode 100644 include/hw/acpi/aml-build.h
>  create mode 100644 include/standard-headers/asm-s390/kvm_virtio.h
>  create mode 100644 include/standard-headers/asm-s390/virtio-ccw.h
>  create mode 100644 include/standard-headers/linux/if_ether.h
>  create mode 100644 include/standard-headers/linux/types.h
>  create mode 100644 include/standard-headers/linux/virtio_9p.h
>  create mode 100644 include/standard-headers/linux/virtio_balloon.h
>  create mode 100644 include/standard-headers/linux/virtio_blk.h
>  create mode 100644 include/standard-headers/linux/virtio_config.h
>  create mode 100644 include/standard-headers/linux/virtio_console.h
>  create mode 100644 include/standard-headers/linux/virtio_ids.h
>  create mode 100644 include/standard-headers/linux/virtio_net.h
>  create mode 100644 include/standard-headers/linux/virtio_pci.h
>  rename include/{hw/virtio => standard-headers/linux}/virtio_ring.h (61%)
>  create mode 100644 include/standard-headers/linux/virtio_rng.h
>  create mode 100644 include/standard-headers/linux/virtio_scsi.h
>  create mode 100644 include/standard-headers/linux/virtio_types.h
>  create mode 100644 hw/acpi/aml-build.c
>  delete mode 100644 hw/pci/pci-hotplug-old.c
>  delete mode 100644 stubs/pci-drive-hot-add.c
>  delete mode 100644 hw/i386/acpi-dsdt-pci-crs.dsl
>  delete mode 100644 hw/i386/ssdt-mem.dsl
>  delete mode 100644 hw/i386/ssdt-mem.hex.generated
>  delete mode 100644 hw/i386/ssdt-misc.dsl
>  delete mode 100644 hw/i386/ssdt-misc.hex.generated
>  delete mode 100644 hw/i386/ssdt-pcihp.dsl
>  delete mode 100644 hw/i386/ssdt-pcihp.hex.generated
>  delete mode 100644 hw/i386/ssdt-proc.dsl
>  delete mode 100644 hw/i386/ssdt-proc.hex.generated
>  create mode 100644 tests/acpi-test-data/pc/SSDT.bridge
>  create mode 100644 tests/acpi-test-data/q35/SSDT.bridge
>