The following changes since commit d4b78317b7cf8c0c635b70086503813f79ff21ec:

  Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20200623' into staging (2020-06-23 18:57:05 +0100)

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 f6f746db6bae1ba74967fd7bea2bb5e169502948:

  tests: disassemble-asm.sh: generate AML in readable format (2020-06-24 19:03:57 -0400)

----------------------------------------------------------------
virtio,acpi,pci: fixes, cleanups, tools.

Fixes, cleanups in ACPI, PCI, virtio.
A handy script for testing ACPI.

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

----------------------------------------------------------------
Ani Sinha (1):
      Rename use_acpi_pci_hotplug to more appropriate use_acpi_hotplug_bridge

Eric Auger (3):
      acpi: Some build_tpm2() code reshape
      arm/acpi: Add the TPM2.0 device under the DSDT
      docs/specs/tpm: ACPI boot now supported for TPM/ARM

Gerd Hoffmann (12):
      qtest: allow DSDT acpi table changes
      acpi: bios-tables-test: show more context on asl diffs
      acpi: move aml builder code for floppy device
      floppy: make isa_fdc_get_drive_max_chs static
      floppy: move cmos_get_fd_drive_type() from pc
      acpi: move aml builder code for i8042 (kbd+mouse) device
      acpi: factor out fw_cfg_add_acpi_dsdt()
      acpi: simplify build_isa_devices_aml()
      acpi: drop serial/parallel enable bits from dsdt
      acpi: drop build_piix4_pm()
      acpi: q35: drop _SB.PCI0.ISA.LPCD opregion.
      tests/acpi: update expected data files

Michael S. Tsirkin (1):
      tests: disassemble-asm.sh: generate AML in readable format

Raphael Norwitz (1):
      Stop vhost-user sending uninitialized mmap_offsets

Thomas Huth (1):
      tests/qtest/bios-tables: Only run the TPM test with CONFIG_TPM enabled

 hw/i386/fw_cfg.h                            |   1 +
 include/hw/acpi/acpi-defs.h                 |  18 ---
 include/hw/block/fdc.h                      |   3 +-
 include/hw/i386/pc.h                        |   1 -
 tests/qtest/bios-tables-test-allowed-diff.h |  18 +++
 hw/acpi/aml-build.c                         |  51 ++++---
 hw/acpi/piix4.c                             |  21 +--
 hw/arm/virt-acpi-build.c                    |  34 +++++
 hw/block/fdc.c                              | 111 ++++++++++++++-
 hw/i386/acpi-build.c                        | 210 +---------------------------
 hw/i386/fw_cfg.c                            |  28 ++++
 hw/i386/pc.c                                |  25 ----
 hw/input/pckbd.c                            |  31 ++++
 hw/virtio/vhost-user.c                      |  12 +-
 stubs/cmos.c                                |   7 +
 tests/qtest/bios-tables-test.c              |   8 +-
 docs/specs/tpm.rst                          |   2 -
 stubs/Makefile.objs                         |   1 +
 tests/data/acpi/disassemle-aml.sh           |  52 +++++++
 tests/data/acpi/pc/DSDT                     | Bin 5014 -> 4934 bytes
 tests/data/acpi/pc/DSDT.acpihmat            | Bin 6338 -> 6258 bytes
 tests/data/acpi/pc/DSDT.bridge              | Bin 6873 -> 6793 bytes
 tests/data/acpi/pc/DSDT.cphp                | Bin 5477 -> 5397 bytes
 tests/data/acpi/pc/DSDT.dimmpxm             | Bin 6667 -> 6587 bytes
 tests/data/acpi/pc/DSDT.ipmikcs             | Bin 5086 -> 5006 bytes
 tests/data/acpi/pc/DSDT.memhp               | Bin 6373 -> 6293 bytes
 tests/data/acpi/pc/DSDT.numamem             | Bin 5020 -> 4940 bytes
 tests/data/acpi/q35/DSDT                    | Bin 7752 -> 7678 bytes
 tests/data/acpi/q35/DSDT.acpihmat           | Bin 9076 -> 9002 bytes
 tests/data/acpi/q35/DSDT.bridge             | Bin 7769 -> 7695 bytes
 tests/data/acpi/q35/DSDT.cphp               | Bin 8215 -> 8141 bytes
 tests/data/acpi/q35/DSDT.dimmpxm            | Bin 9405 -> 9331 bytes
 tests/data/acpi/q35/DSDT.ipmibt             | Bin 7827 -> 7753 bytes
 tests/data/acpi/q35/DSDT.memhp              | Bin 9111 -> 9037 bytes
 tests/data/acpi/q35/DSDT.mmio64             | Bin 8882 -> 8808 bytes
 tests/data/acpi/q35/DSDT.numamem            | Bin 7758 -> 7684 bytes
 tests/data/acpi/q35/DSDT.tis                | Bin 8357 -> 8283 bytes
 37 files changed, 344 insertions(+), 290 deletions(-)
 create mode 100644 stubs/cmos.c
 create mode 100755 tests/data/acpi/disassemle-aml.sh

On 25/06/2020 01.06, Michael S. Tsirkin wrote:
> The following changes since commit d4b78317b7cf8c0c635b70086503813f79ff21ec:
> 
>    Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20200623' into staging (2020-06-23 18:57:05 +0100)
> 
> 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 f6f746db6bae1ba74967fd7bea2bb5e169502948:
> 
>    tests: disassemble-asm.sh: generate AML in readable format (2020-06-24 19:03:57 -0400)
> 
> ----------------------------------------------------------------
> virtio,acpi,pci: fixes, cleanups, tools.
> 
> Fixes, cleanups in ACPI, PCI, virtio.
> A handy script for testing ACPI.
> 
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> 
> ----------------------------------------------------------------
> Ani Sinha (1):
>        Rename use_acpi_pci_hotplug to more appropriate use_acpi_hotplug_bridge
> 
> Eric Auger (3):
>        acpi: Some build_tpm2() code reshape
>        arm/acpi: Add the TPM2.0 device under the DSDT
>        docs/specs/tpm: ACPI boot now supported for TPM/ARM
> 
> Gerd Hoffmann (12):
>        qtest: allow DSDT acpi table changes
>        acpi: bios-tables-test: show more context on asl diffs
>        acpi: move aml builder code for floppy device
>        floppy: make isa_fdc_get_drive_max_chs static
>        floppy: move cmos_get_fd_drive_type() from pc
>        acpi: move aml builder code for i8042 (kbd+mouse) device
>        acpi: factor out fw_cfg_add_acpi_dsdt()
>        acpi: simplify build_isa_devices_aml()
>        acpi: drop serial/parallel enable bits from dsdt
>        acpi: drop build_piix4_pm()
>        acpi: q35: drop _SB.PCI0.ISA.LPCD opregion.
>        tests/acpi: update expected data files
> 
> Michael S. Tsirkin (1):
>        tests: disassemble-asm.sh: generate AML in readable format
> 
> Raphael Norwitz (1):
>        Stop vhost-user sending uninitialized mmap_offsets
> 
> Thomas Huth (1):
>        tests/qtest/bios-tables: Only run the TPM test with CONFIG_TPM enabled

  Hi Michael!

Please drop my patch from your pull request - the issue has already been 
solved by Eric's patch that already got merged:

https://git.qemu.org/?p=qemu.git;a=commitdiff;h=55b9757c7e58092

  Thanks,
   Thomas

On Thu, Jun 25, 2020 at 07:47:41AM +0200, Thomas Huth wrote:
> On 25/06/2020 01.06, Michael S. Tsirkin wrote:
> > The following changes since commit d4b78317b7cf8c0c635b70086503813f79ff21ec:
> > 
> >    Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20200623' into staging (2020-06-23 18:57:05 +0100)
> > 
> > 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 f6f746db6bae1ba74967fd7bea2bb5e169502948:
> > 
> >    tests: disassemble-asm.sh: generate AML in readable format (2020-06-24 19:03:57 -0400)
> > 
> > ----------------------------------------------------------------
> > virtio,acpi,pci: fixes, cleanups, tools.
> > 
> > Fixes, cleanups in ACPI, PCI, virtio.
> > A handy script for testing ACPI.
> > 
> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> > 
> > ----------------------------------------------------------------
> > Ani Sinha (1):
> >        Rename use_acpi_pci_hotplug to more appropriate use_acpi_hotplug_bridge
> > 
> > Eric Auger (3):
> >        acpi: Some build_tpm2() code reshape
> >        arm/acpi: Add the TPM2.0 device under the DSDT
> >        docs/specs/tpm: ACPI boot now supported for TPM/ARM
> > 
> > Gerd Hoffmann (12):
> >        qtest: allow DSDT acpi table changes
> >        acpi: bios-tables-test: show more context on asl diffs
> >        acpi: move aml builder code for floppy device
> >        floppy: make isa_fdc_get_drive_max_chs static
> >        floppy: move cmos_get_fd_drive_type() from pc
> >        acpi: move aml builder code for i8042 (kbd+mouse) device
> >        acpi: factor out fw_cfg_add_acpi_dsdt()
> >        acpi: simplify build_isa_devices_aml()
> >        acpi: drop serial/parallel enable bits from dsdt
> >        acpi: drop build_piix4_pm()
> >        acpi: q35: drop _SB.PCI0.ISA.LPCD opregion.
> >        tests/acpi: update expected data files
> > 
> > Michael S. Tsirkin (1):
> >        tests: disassemble-asm.sh: generate AML in readable format
> > 
> > Raphael Norwitz (1):
> >        Stop vhost-user sending uninitialized mmap_offsets
> > 
> > Thomas Huth (1):
> >        tests/qtest/bios-tables: Only run the TPM test with CONFIG_TPM enabled
> 
>  Hi Michael!
> 
> Please drop my patch from your pull request - the issue has already been
> solved by Eric's patch that already got merged:
> 
> https://git.qemu.org/?p=qemu.git;a=commitdiff;h=55b9757c7e58092
> 
>  Thanks,
>   Thomas


OK done. Peter I pushed a new tag dropping a couple of patches
accordingly. Same name.

On Thu, 25 Jun 2020 at 00:06, Michael S. Tsirkin <mst@redhat.com> wrote:
>
> The following changes since commit d4b78317b7cf8c0c635b70086503813f79ff21ec:
>
>   Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20200623' into staging (2020-06-23 18:57:05 +0100)
>
> 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 f6f746db6bae1ba74967fd7bea2bb5e169502948:
>
>   tests: disassemble-asm.sh: generate AML in readable format (2020-06-24 19:03:57 -0400)
>
> ----------------------------------------------------------------
> virtio,acpi,pci: fixes, cleanups, tools.
>
> Fixes, cleanups in ACPI, PCI, virtio.
> A handy script for testing ACPI.
>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
>



Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/5.1
for any user-visible changes.

-- PMM