[Qemu-commits] [qemu/qemu] 90a66f: x86: rename oem-id and oem-table-id properties

[Peter Maydell]

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: 90a66f48471975fd46f1caab1574679f0a0ef74b
      
https://github.com/qemu/qemu/commit/90a66f48471975fd46f1caab1574679f0a0ef74b
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2021-04-04 (Sun, 04 Apr 2021)

  Changed paths:
    M hw/arm/virt.c
    M include/hw/i386/x86.h
    M tests/qtest/bios-tables-test.c

  Log Message:
  -----------
  x86: rename oem-id and oem-table-id properties

After introducing non-scalar machine properties, it would be preferrable
to have a single acpitable property which includes both generic
information (such as the OEM ids) and custom tables currently
passed via -acpitable.

Do not saddle ourselves with legacy oem-id and oem-table-id
properties, instead mark them as experimental.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20210402082128.13854-1-pbonzini@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>


  Commit: d83f46d189a26fa32434139954d264326f199a45
      
https://github.com/qemu/qemu/commit/d83f46d189a26fa32434139954d264326f199a45
  Author: Jason Wang <jasowang@redhat.com>
  Date:   2021-04-06 (Tue, 06 Apr 2021)

  Changed paths:
    M hw/core/machine.c
    M hw/pci/pcie.c
    M hw/virtio/virtio-pci.c
    M hw/virtio/virtio-pci.h
    M include/hw/pci/pcie.h

  Log Message:
  -----------
  virtio-pci: compat page aligned ATS

Commit 4c70875372b8 ("pci: advertise a page aligned ATS") advertises
the page aligned via ATS capability (RO) to unbrek recent Linux IOMMU
drivers since 5.2. But it forgot the compat the capability which
breaks the migration from old machine type:

(qemu) qemu-kvm: get_pci_config_device: Bad config data: i=0x104 read:
0 device: 20 cmask: ff wmask: 0 w1cmask:0

This patch introduces a new parameter "x-ats-page-aligned" for
virtio-pci device and turns it on for machine type which is newer than
5.1.

Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Peter Xu <peterx@redhat.com>
Cc: Dr. David Alan Gilbert <dgilbert@redhat.com>
Cc: qemu-stable@nongnu.org
Fixes: 4c70875372b8 ("pci: advertise a page aligned ATS")
Signed-off-by: Jason Wang <jasowang@redhat.com>
Message-Id: <20210406040330.11306-1-jasowang@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>


  Commit: 259e909790c83995436938a2b7af464b5d63d4c3
      
https://github.com/qemu/qemu/commit/259e909790c83995436938a2b7af464b5d63d4c3
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-04-06 (Tue, 06 Apr 2021)

  Changed paths:
    M hw/arm/virt.c
    M hw/core/machine.c
    M hw/pci/pcie.c
    M hw/virtio/virtio-pci.c
    M hw/virtio/virtio-pci.h
    M include/hw/i386/x86.h
    M include/hw/pci/pcie.h
    M tests/qtest/bios-tables-test.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging

pc,virtio: last minute bugfixes

Two last minute bugfixes. They are both designed to prevent
compatibility headaches down the road.

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

# gpg: Signature made Tue 06 Apr 2021 12:13:07 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:
  virtio-pci: compat page aligned ATS
  x86: rename oem-id and oem-table-id properties

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/109918d24a3b...259e909790c8