1. 26 6月, 2020 38 次提交
  2. 25 6月, 2020 2 次提交
    • P
      Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging · 63d21199
      Peter Maydell 提交于
      virtio,acpi,pci: fixes, cleanups.
      
      Fixes, cleanups in ACPI, PCI, virtio.
      Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
      
      # gpg: Signature made Thu 25 Jun 2020 07:48:47 BST
      # gpg:                using RSA key 5D09FD0871C8F85B94CA8A0D281F0DB8D28D5469
      # gpg:                issuer "mst@redhat.com"
      # gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" [full]
      # gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>" [full]
      # Primary key fingerprint: 0270 606B 6F3C DF3D 0B17  0970 C350 3912 AFBE 8E67
      #      Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA  8A0D 281F 0DB8 D28D 5469
      
      * remotes/mst/tags/for_upstream:
        Rename use_acpi_pci_hotplug to more appropriate use_acpi_hotplug_bridge
        Stop vhost-user sending uninitialized mmap_offsets
        docs/specs/tpm: ACPI boot now supported for TPM/ARM
        arm/acpi: Add the TPM2.0 device under the DSDT
        acpi: Some build_tpm2() code reshape
        tests/acpi: update expected data files
        acpi: q35: drop _SB.PCI0.ISA.LPCD opregion.
        acpi: drop build_piix4_pm()
        acpi: drop serial/parallel enable bits from dsdt
        acpi: simplify build_isa_devices_aml()
        acpi: factor out fw_cfg_add_acpi_dsdt()
        acpi: move aml builder code for i8042 (kbd+mouse) device
        floppy: move cmos_get_fd_drive_type() from pc
        floppy: make isa_fdc_get_drive_max_chs static
        acpi: move aml builder code for floppy device
        acpi: bios-tables-test: show more context on asl diffs
        qtest: allow DSDT acpi table changes
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      63d21199
    • P
      Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging · beafab86
      Peter Maydell 提交于
      Pull request
      
      # gpg: Signature made Wed 24 Jun 2020 11:25:27 BST
      # gpg:                using RSA key 8695A8BFD3F97CDAAC35775A9CA4ABB381AB73C8
      # gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" [full]
      # gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>" [full]
      # Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8
      
      * remotes/stefanha/tags/tracing-pull-request:
        trace/simple: Fix unauthorized enable
        scripts/tracetool: Update maintainer email address
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      beafab86