Commit 247ba27c authored by Peter Maydell's avatar Peter Maydell
Browse files

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



pci, pc, virtio: features, fixes

reconnect for vhost blk
tests for UEFI
misc other stuff

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

# gpg: Signature made Tue 21 May 2019 14:41:32 BST
# gpg:                using RSA key 281F0DB8D28D5469
# 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: (34 commits)
  tests: acpi: print error unable to dump ACPI table during rebuild
  tests: acpi: refactor rebuild-expected-aml.sh to dump ACPI tables for a specified list of targets
  tests: acpi: allow to override default accelerator
  tests: acpi: ignore SMBIOS tests when UEFI firmware is used
  tests: acpi: add a way to start tests with UEFI firmware
  tests: acpi: add acpi_find_rsdp_address_uefi() helper
  tests: acpi: move boot_sector_init() into x86 tests branch
  tests: acpi: skip FACS table if board uses hw reduced ACPI profile
  tests: acpi: fetch X_DSDT if pointer to DSDT is 0
  tests: acpi: make pointer to RSDP 64bit
  tests: acpi: make RSDT test routine handle XSDT
  tests: acpi: make acpi_fetch_table() take size of fetched table pointer
  tests: acpi: rename acpi_parse_rsdp_table() into acpi_fetch_rsdp_table()
  pci: Simplify pci_bus_is_root()
  pcie: Remove redundant test in pcie_mmcfg_data_{read,write}()
  libvhost-user: fix bad vu_log_write
  hw/arm/virt-acpi-build: pass AcpiMcfgInfo to build_mcfg()
  i386, acpi: remove mcfg_ prefix in AcpiMcfgInfo members
  hw/arm/virt-acpi-build: remove unnecessary variable mcfg_start
  do not call vhost_net_cleanup() on running net from char user event
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 62516a0a ba02ff90

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -1484,7 +1484,7 @@ M: Michael S. Tsirkin <mst@redhat.com> 
S: Supported

F: hw/*/*vhost*

F: docs/interop/vhost-user.json

F: docs/interop/vhost-user.txt

F: docs/interop/vhost-user.rst

F: contrib/vhost-user-*/

F: backends/vhost-user.c

F: include/sysemu/vhost-user-backend.h

contrib/libvhost-user/libvhost-user.c

+1 −1
Original line number Diff line number Diff line
@@ -433,7 +433,7 @@ vu_log_write(VuDev *dev, uint64_t address, uint64_t length) 
    page = address / VHOST_LOG_PAGE;

    while (page * VHOST_LOG_PAGE < address + length) {

        vu_log_page(dev->log_table, page);

        page += VHOST_LOG_PAGE;

        page += 1;

    }



    vu_log_kick(dev);

contrib/vhost-user-blk/vhost-user-blk.c

+2 −1
Original line number Diff line number Diff line
@@ -398,7 +398,8 @@ vub_get_features(VuDev *dev) 
static uint64_t

vub_get_protocol_features(VuDev *dev)

{

    return 1ull << VHOST_USER_PROTOCOL_F_CONFIG;

    return 1ull << VHOST_USER_PROTOCOL_F_CONFIG |

           1ull << VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD;

}



static int

docs/interop/index.rst

+1 −1
Original line number Diff line number Diff line
@@ -15,4 +15,4 @@ Contents: 
   bitmaps

   live-block-operations

   pr-helper

   vhost-user

docs/interop/vhost-user.rst

0 → 100644
+1351 −0

File added.

Preview size limit exceeded, changes collapsed.