qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 9b02e1: virtio-net: enable configurable tx qu


From: GitHub
Subject: [Qemu-commits] [qemu/qemu] 9b02e1: virtio-net: enable configurable tx queue size
Date: Tue, 04 Jul 2017 04:44:34 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 9b02e1618cf26aa52cf786f215d757506dda14f8
      
https://github.com/qemu/qemu/commit/9b02e1618cf26aa52cf786f215d757506dda14f8
  Author: Wei Wang <address@hidden>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M hw/net/virtio-net.c
    M include/hw/virtio/virtio-net.h

  Log Message:
  -----------
  virtio-net: enable configurable tx queue size

This patch enables the virtio-net tx queue size to be configurable
between 256 (the default queue size) and 1024 by the user when the
vhost-user backend is used.

Currently, the maximum tx queue size for other backends is 512 due
to the following limitations:
- QEMU backend: the QEMU backend implementation in some cases may
send 1024+1 iovs to writev.
- Vhost_net backend: there are possibilities that the guest sends
a vring_desc of memory which crosses a MemoryRegion thereby
generating more than 1024 iovs after translation from guest-physical
address in the backend.

Signed-off-by: Wei Wang <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: ba94971354376876b7a4c243831bd4032045eacc
      
https://github.com/qemu/qemu/commit/ba94971354376876b7a4c243831bd4032045eacc
  Author: Thomas Huth <address@hidden>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M hw/pci-bridge/dec.c

  Log Message:
  -----------
  hw/pci-bridge/dec: Classify the DEC PCI bridge as bridge device

This way the bridge shows up in the correct section of the
"-device help" text.

Signed-off-by: Thomas Huth <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: David Gibson <address@hidden>
Reviewed-by: Marcel Apfelbaum <address@hidden>


  Commit: 8991c460be5a0811194fd4d2b49ba7146a23526b
      
https://github.com/qemu/qemu/commit/8991c460be5a0811194fd4d2b49ba7146a23526b
  Author: Ladi Prosek <address@hidden>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M hw/i386/intel_iommu.c
    M hw/i386/trace-events

  Log Message:
  -----------
  intel_iommu: relax iq tail check on VTD_GCMD_QIE enable

The VT-d spec (section 6.5.2) prescribes software to zero the
Invalidation Queue Tail Register before enabling the VTD_GCMD_QIE
Global Command Register bit. Windows Server 2012 R2 and possibly
other older Windows versions violate the protocol and set a
non-zero queue tail first, which in effect makes them crash early
on boot with -device intel-iommu,intremap=on.

This commit relaxes the check and instead of failing to enable
VTD_GCMD_QIE with vtd_err_qi_enable, it behaves as if the tail
register was set just after enabling VTD_GCMD_QIE
(see vtd_handle_iqt_write).

Signed-off-by: Ladi Prosek <address@hidden>
Reviewed-by: Peter Xu <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 673b0d7ccc34e9617d99ed4c29caa964f19a4c5a
      
https://github.com/qemu/qemu/commit/673b0d7ccc34e9617d99ed4c29caa964f19a4c5a
  Author: Mao Zhongyi <address@hidden>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M hw/pci/pci.c

  Log Message:
  -----------
  pci: Clean up error checking in pci_add_capability()

On success, pci_add_capability2() returns a positive value. On
failure, it sets an error and return a negative value.

pci_add_capability() laboriously checks this behavior. No other
caller does. Drop the checks from pci_add_capability().

Cc: address@hidden
Cc: address@hidden
Signed-off-by: Mao Zhongyi <address@hidden>
Reviewed-by: Marcel Apfelbaum <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: eacbc63211c18ad56eb5a3835683663462b131b2
      
https://github.com/qemu/qemu/commit/eacbc63211c18ad56eb5a3835683663462b131b2
  Author: Mao Zhongyi <address@hidden>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M hw/pci/pci.c

  Log Message:
  -----------
  pci: Add comment for pci_add_capability2()

Comments for pci_add_capability2() to explain the return
value. This may help to make a correct return value check
for its callers.

Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Signed-off-by: Mao Zhongyi <address@hidden>
Reviewed-by: Marcel Apfelbaum <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 9a815774bb37d7290d2fa45a8cc313e9e9fdaa23
      
https://github.com/qemu/qemu/commit/9a815774bb37d7290d2fa45a8cc313e9e9fdaa23
  Author: Mao Zhongyi <address@hidden>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M hw/net/e1000e.c
    M hw/net/eepro100.c
    M hw/usb/hcd-xhci.c
    M hw/vfio/pci.c

  Log Message:
  -----------
  pci: Fix the wrong assertion.

pci_add_capability returns a strictly positive value on success,
correct asserts.

Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Signed-off-by: Mao Zhongyi <address@hidden>
Reviewed-by: Marcel Apfelbaum <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 9a7c2a59708f0d691569463b161e1b516948a41e
      
https://github.com/qemu/qemu/commit/9a7c2a59708f0d691569463b161e1b516948a41e
  Author: Mao Zhongyi <address@hidden>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M hw/i386/amd_iommu.c
    M hw/net/e1000e.c
    M hw/net/eepro100.c
    M hw/pci-bridge/i82801b11.c
    M hw/pci/pci.c
    M hw/pci/pci_bridge.c
    M hw/pci/pcie.c
    M hw/pci/shpc.c
    M hw/pci/slotid_cap.c
    M hw/vfio/pci.c
    M hw/virtio/virtio-pci.c
    M include/hw/pci/pci.h

  Log Message:
  -----------
  pci: Make errp the last parameter of pci_add_capability()

Add Error argument for pci_add_capability() to leverage the errp
to pass info on errors. This way is helpful for its callers to
make a better error handling when moving to 'realize'.

Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Signed-off-by: Mao Zhongyi <address@hidden>
Reviewed-by: Marcel Apfelbaum <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 27841278574a8687d3852dc51b0eeade218339cc
      
https://github.com/qemu/qemu/commit/27841278574a8687d3852dc51b0eeade218339cc
  Author: Mao Zhongyi <address@hidden>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M hw/i386/kvm/pci-assign.c
    M hw/ide/ich.c
    M hw/pci/msi.c
    M hw/pci/msix.c
    M hw/pci/pci.c
    M hw/vfio/pci.c
    M include/hw/pci/pci.h

  Log Message:
  -----------
  pci: Replace pci_add_capability2() with pci_add_capability()

After the patch 'Make errp the last parameter of pci_add_capability()',
pci_add_capability() and pci_add_capability2() now do exactly the same.
So drop the wrapper pci_add_capability() of pci_add_capability2(), then
replace the pci_add_capability2() with pci_add_capability() everywhere.

Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Suggested-by: Eduardo Habkost <address@hidden>
Signed-off-by: Mao Zhongyi <address@hidden>
Reviewed-by: Marcel Apfelbaum <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: f8cd1b0201c41d88bb97dcafb80348a0e88d8805
      
https://github.com/qemu/qemu/commit/f8cd1b0201c41d88bb97dcafb80348a0e88d8805
  Author: Mao Zhongyi <address@hidden>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M hw/pci-bridge/i82801b11.c
    M hw/pci-bridge/pcie_root_port.c
    M hw/pci-bridge/xio3130_downstream.c
    M hw/pci-bridge/xio3130_upstream.c
    M hw/pci/pci_bridge.c
    M hw/pci/pcie.c
    M include/hw/pci/pci_bridge.h
    M include/hw/pci/pcie.h

  Log Message:
  -----------
  pci: Convert to realize

Convert i82801b11, io3130_upstream, io3130_downstream and
pcie_root_port devices to realize.

Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Signed-off-by: Mao Zhongyi <address@hidden>
Reviewed-by: Marcel Apfelbaum <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 344475e77d9acb981df958304f0631163dff7d65
      
https://github.com/qemu/qemu/commit/344475e77d9acb981df958304f0631163dff7d65
  Author: Mao Zhongyi <address@hidden>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M hw/pci-bridge/pci_bridge_dev.c
    M hw/pci/shpc.c
    M hw/pci/slotid_cap.c
    M include/hw/pci/shpc.h
    M include/hw/pci/slotid_cap.h

  Log Message:
  -----------
  pci: Convert shpc_init() to Error

In order to propagate error message better, convert shpc_init() to
Error also convert the pci_bridge_dev_initfn() to realize.

Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Signed-off-by: Mao Zhongyi <address@hidden>
Reviewed-by: Marcel Apfelbaum <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 6b728b31163bbd0788fe7d537931c4624cd24215
      
https://github.com/qemu/qemu/commit/6b728b31163bbd0788fe7d537931c4624cd24215
  Author: Mao Zhongyi <address@hidden>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M hw/i386/kvm/pci-assign.c

  Log Message:
  -----------
  i386/kvm/pci-assign: Fix return type of verify_irqchip_kernel()

When the function no success value to transmit, it usually make the
function return void. It has turned out not to be a success, because
it means that the extra local_err variable and error_propagate() will
be needed. It leads to cumbersome code, therefore, transmit success/
failure in the return value is worth. So fix the return type to avoid
it.

Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Signed-off-by: Mao Zhongyi <address@hidden>
Reviewed-by: Marcel Apfelbaum <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: c0e9067902a35f4b5cc24b0bc84dbc5872e9cf86
      
https://github.com/qemu/qemu/commit/c0e9067902a35f4b5cc24b0bc84dbc5872e9cf86
  Author: Mao Zhongyi <address@hidden>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M hw/i386/kvm/pci-assign.c

  Log Message:
  -----------
  i386/kvm/pci-assign: Use errp directly rather than local_err

In assigned_device_pci_cap_init(), first, error messages are filled
to a local_err variable, then through error_propagate() pass to
the parameter of errp. It leads to cumbersome code. In order to
avoid the extra local_err and error_propagate(), drop it and use
errp instead.

Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Signed-off-by: Mao Zhongyi <address@hidden>
Reviewed-by: Marcel Apfelbaum <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 91685323b142a655378b673bfcc5b424c77dfe1a
      
https://github.com/qemu/qemu/commit/91685323b142a655378b673bfcc5b424c77dfe1a
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M hw/nvram/fw_cfg.c

  Log Message:
  -----------
  fw_cfg: don't map the fw_cfg IO ports in fw_cfg_io_realize()

As indicated by Laszlo it is a QOM bug for the realize() method to actually
map the device. Set up the IO regions within fw_cfg_io_realize() and defer
the mapping with sysbus_add_io() to the caller, as already done in
fw_cfg_init_mem_wide().

This makes the iobase and dma_iobase properties now obsolete so they can be
removed.

Signed-off-by: Mark Cave-Ayland <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Tested-by: Gabriel Somlo <address@hidden>


  Commit: 3c1aa733d914c1f69f678b4e40ac9b5afc1ea174
      
https://github.com/qemu/qemu/commit/3c1aa733d914c1f69f678b4e40ac9b5afc1ea174
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M hw/nvram/fw_cfg.c

  Log Message:
  -----------
  fw_cfg: move setting of FW_CFG_VERSION_DMA bit to fw_cfg_init1()

The setting of the FW_CFG_VERSION_DMA bit is the same across both the
TYPE_FW_CFG_MEM and TYPE_FW_CFG_IO devices, so unify the logic in
fw_cfg_init1().

Signed-off-by: Mark Cave-Ayland <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Tested-by: Gabriel Somlo <address@hidden>


  Commit: 4d7e7f2702912f1abd81162342df547436810a5f
      
https://github.com/qemu/qemu/commit/4d7e7f2702912f1abd81162342df547436810a5f
  Author: Aleksandr Bezzubikov <address@hidden>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M hw/i386/acpi-build.c

  Log Message:
  -----------
  hw/acpi: remove dead acpi code

Signed-off-by: Aleksandr Bezzubikov <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 552a1e01a41d7c24397a83947cca94d8d66e5f49
      
https://github.com/qemu/qemu/commit/552a1e01a41d7c24397a83947cca94d8d66e5f49
  Author: Peter Xu <address@hidden>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M hw/i386/intel_iommu.c

  Log Message:
  -----------
  intel_iommu: fix migration breakage on mr switch

Migration is broken after the vfio integration work:

qemu-kvm: AHCI: Failed to start FIS receive engine: bad FIS receive buffer 
address
qemu-kvm: Failed to load ich9_ahci:ahci
qemu-kvm: error while loading state for instance 0x0 of device 
'0000:00:1f.2/ich9_ahci'
qemu-kvm: load of migration failed: Operation not permitted

The problem is that vfio work introduced dynamic memory region
switching (actually it is also used for future PT mode), and this memory
region layout is not properly delivered to destination when migration
happens. Solution is to rebuild the layout in post_load.

Bug: https://bugzilla.redhat.com/show_bug.cgi?id=1459906
Fixes: 558e0024 ("intel_iommu: allow dynamic switch of IOMMU region")
Reviewed-by: Jason Wang <address@hidden>
Signed-off-by: Peter Xu <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 384b557da1a44ce260cd0328c06a250507348f73
      
https://github.com/qemu/qemu/commit/384b557da1a44ce260cd0328c06a250507348f73
  Author: Maxime Coquelin <address@hidden>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M hw/virtio/vhost-backend.c

  Log Message:
  -----------
  vhost: ensure vhost_ops are set before calling iotlb callback

This patch fixes a crash that happens when vhost-user iommu
support is enabled and vhost-user socket is closed.

When it happens, if an IOTLB invalidation notification is sent
by the IOMMU, vhost_ops's NULL pointer is dereferenced.

Signed-off-by: Maxime Coquelin <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: b9ec9bd468b2c5b218d16642e8f8ea4df60418bb
      
https://github.com/qemu/qemu/commit/b9ec9bd468b2c5b218d16642e8f8ea4df60418bb
  Author: Maxime Coquelin <address@hidden>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M hw/virtio/vhost-user.c

  Log Message:
  -----------
  vhost-user: unregister slave req handler at cleanup time

If the backend sends a request just before closing the socket,
the aio dispatcher might schedule its reading after the vhost
device has been cleaned, leading to a NULL pointer dereference
in slave_read();

vhost_user_cleanup() already closes the socket but it is not
enough, the handler has to be unregistered.

Signed-off-by: Maxime Coquelin <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 83f3c7091968979ed07869dce9e0df62170f33b4
      
https://github.com/qemu/qemu/commit/83f3c7091968979ed07869dce9e0df62170f33b4
  Author: Ben Warren <address@hidden>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M tests/Makefile.include
    A tests/vmgenid-test.c

  Log Message:
  -----------
  tests: Add unit tests for the VM Generation ID feature

The following tests are implemented:
* test that a GUID passed in by command line is propagated to the guest.
  Read the GUID from guest memory
* test that the "auto" argument to the GUID generates a valid GUID, as
  seen by the guest.
* test that a GUID passed in can be queried from the monitor

  This patch is loosely based on a previous patch from:
  Gal Hammer <address@hidden>  and Igor Mammedov <address@hidden>

Signed-off-by: Ben Warren <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 2eef278b9e6326707410eed23be40e57f6c331b7
      
https://github.com/qemu/qemu/commit/2eef278b9e6326707410eed23be40e57f6c331b7
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M hw/net/virtio-net.c

  Log Message:
  -----------
  virtio-net: fix tx queue size for !vhost-user

Current code segfaults when no nic peer is specified.
Fix it up - fall back to default queue size.

Fixes: 9b02e1618cf26a ("virtio-net: enable configurable tx queue size")
Cc: Wei Wang <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: d2f9ca94165b10c51d6d6cae5fe1cadf1ca42076
      
https://github.com/qemu/qemu/commit/d2f9ca94165b10c51d6d6cae5fe1cadf1ca42076
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M tests/acpi-test-data/q35/DSDT
    M tests/acpi-test-data/q35/DSDT.bridge
    M tests/acpi-test-data/q35/DSDT.cphp
    M tests/acpi-test-data/q35/DSDT.ipmibt
    M tests/acpi-test-data/q35/DSDT.memhp

  Log Message:
  -----------
  i386/acpi: update expected acpi files

We dropped some dead code, update extected table binaries.

Fixes: 4d7e7f2702912 ("hw/acpi: remove dead acpi code")
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 0c7a8b9baa744ae4323bb46cb4fe942355beaa85
      
https://github.com/qemu/qemu/commit/0c7a8b9baa744ae4323bb46cb4fe942355beaa85
  Author: Peter Maydell <address@hidden>
  Date:   2017-07-04 (Tue, 04 Jul 2017)

  Changed paths:
    M hw/i386/acpi-build.c
    M hw/i386/amd_iommu.c
    M hw/i386/intel_iommu.c
    M hw/i386/kvm/pci-assign.c
    M hw/i386/trace-events
    M hw/ide/ich.c
    M hw/net/e1000e.c
    M hw/net/eepro100.c
    M hw/net/virtio-net.c
    M hw/nvram/fw_cfg.c
    M hw/pci-bridge/dec.c
    M hw/pci-bridge/i82801b11.c
    M hw/pci-bridge/pci_bridge_dev.c
    M hw/pci-bridge/pcie_root_port.c
    M hw/pci-bridge/xio3130_downstream.c
    M hw/pci-bridge/xio3130_upstream.c
    M hw/pci/msi.c
    M hw/pci/msix.c
    M hw/pci/pci.c
    M hw/pci/pci_bridge.c
    M hw/pci/pcie.c
    M hw/pci/shpc.c
    M hw/pci/slotid_cap.c
    M hw/usb/hcd-xhci.c
    M hw/vfio/pci.c
    M hw/virtio/vhost-backend.c
    M hw/virtio/vhost-user.c
    M hw/virtio/virtio-pci.c
    M include/hw/pci/pci.h
    M include/hw/pci/pci_bridge.h
    M include/hw/pci/pcie.h
    M include/hw/pci/shpc.h
    M include/hw/pci/slotid_cap.h
    M include/hw/virtio/virtio-net.h
    M tests/Makefile.include
    M tests/acpi-test-data/q35/DSDT
    M tests/acpi-test-data/q35/DSDT.bridge
    M tests/acpi-test-data/q35/DSDT.cphp
    M tests/acpi-test-data/q35/DSDT.ipmibt
    M tests/acpi-test-data/q35/DSDT.memhp
    A tests/vmgenid-test.c

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

pc, acpi, pci, virtio: fixes, cleanups, features, tests

Some fixes and cleanups. New tests.
Configurable tx queue size for virtio-net.

Signed-off-by: Michael S. Tsirkin <address@hidden>

# gpg: Signature made Mon 03 Jul 2017 20:43:17 BST
# gpg:                using RSA key 0x281F0DB8D28D5469
# gpg: Good signature from "Michael S. Tsirkin <address@hidden>"
# gpg:                 aka "Michael S. Tsirkin <address@hidden>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# 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: (21 commits)
  i386/acpi: update expected acpi files
  virtio-net: fix tx queue size for !vhost-user
  tests: Add unit tests for the VM Generation ID feature
  vhost-user: unregister slave req handler at cleanup time
  vhost: ensure vhost_ops are set before calling iotlb callback
  intel_iommu: fix migration breakage on mr switch
  hw/acpi: remove dead acpi code
  fw_cfg: move setting of FW_CFG_VERSION_DMA bit to fw_cfg_init1()
  fw_cfg: don't map the fw_cfg IO ports in fw_cfg_io_realize()
  i386/kvm/pci-assign: Use errp directly rather than local_err
  i386/kvm/pci-assign: Fix return type of verify_irqchip_kernel()
  pci: Convert shpc_init() to Error
  pci: Convert to realize
  pci: Replace pci_add_capability2() with pci_add_capability()
  pci: Make errp the last parameter of pci_add_capability()
  pci: Fix the wrong assertion.
  pci: Add comment for pci_add_capability2()
  pci: Clean up error checking in pci_add_capability()
  intel_iommu: relax iq tail check on VTD_GCMD_QIE enable
  hw/pci-bridge/dec: Classify the DEC PCI bridge as bridge device
  ...

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/fd479c60f576...0c7a8b9baa74

reply via email to

[Prev in Thread] Current Thread [Next in Thread]