[PULL 00/13] virtio,pc,acpi: features, fixes

Michael S. Tsirkin posted 13 patches 5 years, 3 months ago
Failed in applying to current master (apply log)
hw/virtio/virtio-pci.h             |   9 ++++++++
include/hw/acpi/pcihp.h            |   2 +-
include/hw/virtio/vhost-user-blk.h |   2 ++
include/hw/virtio/virtio-blk.h     |   2 ++
include/hw/virtio/virtio-scsi.h    |   5 +++++
hw/acpi/pcihp.c                    |  23 +++++++++++++++++++-
hw/acpi/piix4.c                    |   5 ++++-
hw/arm/virt-acpi-build.c           |   2 +-
hw/block/vhost-user-blk.c          |   6 +++++-
hw/block/virtio-blk.c              |   6 +++++-
hw/core/machine.c                  |   8 ++++++-
hw/i386/acpi-build.c               |   4 ++--
hw/scsi/vhost-scsi.c               |   3 ++-
hw/scsi/vhost-user-scsi.c          |   5 +++--
hw/scsi/virtio-scsi.c              |  13 ++++++++----
hw/smbios/smbios.c                 |  36 +++++++++++++++++++++++++++----
hw/virtio/vhost-scsi-pci.c         |   9 ++++++--
hw/virtio/vhost-user-blk-pci.c     |   4 ++++
hw/virtio/vhost-user-scsi-pci.c    |   9 ++++++--
hw/virtio/virtio-blk-pci.c         |   7 ++++++-
hw/virtio/virtio-pci.c             |  32 ++++++++++++++++++++++++++++
hw/virtio/virtio-scsi-pci.c        |   9 ++++++--
tests/qtest/bios-tables-test.c     |  42 +++++++++++++++++++++++++++++++++++++
qemu-options.hx                    |   2 +-
tests/data/acpi/disassemle-aml.sh  |  11 +++++++---
tests/data/acpi/pc/DSDT            | Bin 4934 -> 4934 bytes
tests/data/acpi/pc/DSDT.acpihmat   | Bin 6258 -> 6258 bytes
tests/data/acpi/pc/DSDT.bridge     | Bin 6793 -> 6793 bytes
tests/data/acpi/pc/DSDT.cphp       | Bin 5397 -> 5397 bytes
tests/data/acpi/pc/DSDT.dimmpxm    | Bin 6587 -> 6587 bytes
tests/data/acpi/pc/DSDT.ipmikcs    | Bin 5006 -> 5006 bytes
tests/data/acpi/pc/DSDT.memhp      | Bin 6293 -> 6293 bytes
tests/data/acpi/pc/DSDT.numamem    | Bin 4940 -> 4940 bytes
tests/data/acpi/q35/DSDT           | Bin 7678 -> 7678 bytes
tests/data/acpi/q35/DSDT.acpihmat  | Bin 9002 -> 9002 bytes
tests/data/acpi/q35/DSDT.bridge    | Bin 7695 -> 7695 bytes
tests/data/acpi/q35/DSDT.cphp      | Bin 8141 -> 8141 bytes
tests/data/acpi/q35/DSDT.dimmpxm   | Bin 9331 -> 9331 bytes
tests/data/acpi/q35/DSDT.ipmibt    | Bin 7753 -> 7753 bytes
tests/data/acpi/q35/DSDT.memhp     | Bin 9037 -> 9037 bytes
tests/data/acpi/q35/DSDT.mmio64    | Bin 8808 -> 8808 bytes
tests/data/acpi/q35/DSDT.numamem   | Bin 7684 -> 7684 bytes
tests/data/acpi/q35/DSDT.tis       | Bin 8283 -> 8283 bytes
tests/data/acpi/virt/DSDT          | Bin 5205 -> 5200 bytes
tests/data/acpi/virt/DSDT.memhp    | Bin 6566 -> 6561 bytes
tests/data/acpi/virt/DSDT.numamem  | Bin 5205 -> 5200 bytes
46 files changed, 225 insertions(+), 31 deletions(-)
[PULL 00/13] virtio,pc,acpi: features, fixes
Posted by Michael S. Tsirkin 5 years, 3 months ago
The following changes since commit 8e49197ca5e76fdb8928833b2649ef13fc5aab2f:

  Merge remote-tracking branch 'remotes/hdeller/tags/target-hppa-v3-pull-request' into staging (2020-08-26 22:23:53 +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 e1647539b1d04f121b70f1f6f438976477450f10:

  tests/bios-tables-test: add smbios cpu speed test (2020-08-27 08:29:13 -0400)

----------------------------------------------------------------
virtio,pc,acpi: features, fixes

better number of queues for vhost
smbios speed options
acpi fixes

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

----------------------------------------------------------------
Ani Sinha (1):
      Introduce a new flag for i440fx to disable PCI hotplug on the root bus

Michael S. Tsirkin (5):
      acpi: allow DSDT changes
      i386/acpi: fix inconsistent QEMU/OVMF device paths
      arm/acpi: fix an out of spec _UID for PCI root
      disassemble-aml: -o actually works
      acpi: update expected DSDT files with _UID changes

Stefan Hajnoczi (5):
      virtio-pci: add virtio_pci_optimal_num_queues() helper
      virtio-scsi: introduce a constant for fixed virtqueues
      virtio-scsi-pci: default num_queues to -smp N
      virtio-blk-pci: default num_queues to -smp N
      vhost-user-blk-pci: default num_queues to -smp N

Ying Fang (2):
      hw/smbios: add options for type 4 max-speed and current-speed
      tests/bios-tables-test: add smbios cpu speed test

 hw/virtio/virtio-pci.h             |   9 ++++++++
 include/hw/acpi/pcihp.h            |   2 +-
 include/hw/virtio/vhost-user-blk.h |   2 ++
 include/hw/virtio/virtio-blk.h     |   2 ++
 include/hw/virtio/virtio-scsi.h    |   5 +++++
 hw/acpi/pcihp.c                    |  23 +++++++++++++++++++-
 hw/acpi/piix4.c                    |   5 ++++-
 hw/arm/virt-acpi-build.c           |   2 +-
 hw/block/vhost-user-blk.c          |   6 +++++-
 hw/block/virtio-blk.c              |   6 +++++-
 hw/core/machine.c                  |   8 ++++++-
 hw/i386/acpi-build.c               |   4 ++--
 hw/scsi/vhost-scsi.c               |   3 ++-
 hw/scsi/vhost-user-scsi.c          |   5 +++--
 hw/scsi/virtio-scsi.c              |  13 ++++++++----
 hw/smbios/smbios.c                 |  36 +++++++++++++++++++++++++++----
 hw/virtio/vhost-scsi-pci.c         |   9 ++++++--
 hw/virtio/vhost-user-blk-pci.c     |   4 ++++
 hw/virtio/vhost-user-scsi-pci.c    |   9 ++++++--
 hw/virtio/virtio-blk-pci.c         |   7 ++++++-
 hw/virtio/virtio-pci.c             |  32 ++++++++++++++++++++++++++++
 hw/virtio/virtio-scsi-pci.c        |   9 ++++++--
 tests/qtest/bios-tables-test.c     |  42 +++++++++++++++++++++++++++++++++++++
 qemu-options.hx                    |   2 +-
 tests/data/acpi/disassemle-aml.sh  |  11 +++++++---
 tests/data/acpi/pc/DSDT            | Bin 4934 -> 4934 bytes
 tests/data/acpi/pc/DSDT.acpihmat   | Bin 6258 -> 6258 bytes
 tests/data/acpi/pc/DSDT.bridge     | Bin 6793 -> 6793 bytes
 tests/data/acpi/pc/DSDT.cphp       | Bin 5397 -> 5397 bytes
 tests/data/acpi/pc/DSDT.dimmpxm    | Bin 6587 -> 6587 bytes
 tests/data/acpi/pc/DSDT.ipmikcs    | Bin 5006 -> 5006 bytes
 tests/data/acpi/pc/DSDT.memhp      | Bin 6293 -> 6293 bytes
 tests/data/acpi/pc/DSDT.numamem    | Bin 4940 -> 4940 bytes
 tests/data/acpi/q35/DSDT           | Bin 7678 -> 7678 bytes
 tests/data/acpi/q35/DSDT.acpihmat  | Bin 9002 -> 9002 bytes
 tests/data/acpi/q35/DSDT.bridge    | Bin 7695 -> 7695 bytes
 tests/data/acpi/q35/DSDT.cphp      | Bin 8141 -> 8141 bytes
 tests/data/acpi/q35/DSDT.dimmpxm   | Bin 9331 -> 9331 bytes
 tests/data/acpi/q35/DSDT.ipmibt    | Bin 7753 -> 7753 bytes
 tests/data/acpi/q35/DSDT.memhp     | Bin 9037 -> 9037 bytes
 tests/data/acpi/q35/DSDT.mmio64    | Bin 8808 -> 8808 bytes
 tests/data/acpi/q35/DSDT.numamem   | Bin 7684 -> 7684 bytes
 tests/data/acpi/q35/DSDT.tis       | Bin 8283 -> 8283 bytes
 tests/data/acpi/virt/DSDT          | Bin 5205 -> 5200 bytes
 tests/data/acpi/virt/DSDT.memhp    | Bin 6566 -> 6561 bytes
 tests/data/acpi/virt/DSDT.numamem  | Bin 5205 -> 5200 bytes
 46 files changed, 225 insertions(+), 31 deletions(-)


Re: [PULL 00/13] virtio,pc,acpi: features, fixes
Posted by Peter Maydell 5 years, 3 months ago
On Thu, 27 Aug 2020 at 14:40, Michael S. Tsirkin <mst@redhat.com> wrote:
>
> The following changes since commit 8e49197ca5e76fdb8928833b2649ef13fc5aab2f:
>
>   Merge remote-tracking branch 'remotes/hdeller/tags/target-hppa-v3-pull-request' into staging (2020-08-26 22:23:53 +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 e1647539b1d04f121b70f1f6f438976477450f10:
>
>   tests/bios-tables-test: add smbios cpu speed test (2020-08-27 08:29:13 -0400)
>
> ----------------------------------------------------------------
> virtio,pc,acpi: features, fixes
>
> better number of queues for vhost
> smbios speed options
> acpi fixes
>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

Applied, thanks.

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

-- PMM