Commit 3e5bdc65 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



pc, pci, virtio: features, fixes, cleanups

A bunch of fixes, cleanus and new features all over the place.

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

# gpg: Signature made Thu 18 Jan 2018 20:41:03 GMT
# gpg:                using RSA key 0x281F0DB8D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"
# 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: (29 commits)
  vhost: remove assertion to prevent crash
  vhost-user: fix misaligned access to payload
  vhost-user: factor out msg head and payload
  tests: acpi: add comments to fetch_rsdt_referenced_tables/data->tables usage
  tests: acpi: rename test_acpi_tables()/test_dst_table() to reflect its usage
  tests: acpi: init table descriptor in test_dst_table()
  tests: acpi: move tested tables array allocation outside of test_acpi_dsdt_table()
  x86_iommu: check if machine has PCI bus
  x86_iommu: Move machine check to x86_iommu_realize()
  vhost-user-test: use init_virtio_dev in multiqueue test
  vhost-user-test: make features mask an init_virtio_dev() argument
  vhost-user-test: setup virtqueues in all tests
  vhost-user-test: extract read-guest-mem test from main loop
  vhost-user-test: fix features mask
  hw/acpi-build: Make next_base easy to follow
  ACPI/unit-test: Add a testcase for RAM allocation in numa node
  hw/pci-bridge: fix QEMU crash because of pcie-root-port
  intel-iommu: Extend address width to 48 bits
  intel-iommu: Redefine macros to enable supporting 48 bit address width
  vhost-user: fix multiple queue specification
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents b4d6ed1c f4bf56fb

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ 
/module_block.h

/scsi/qemu-pr-helper

/vhost-user-scsi

/vhost-user-blk

/fsdev/virtfs-proxy-helper

*.tmp

*.[1-9]

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -852,6 +852,7 @@ X86 Machines 
------------

PC

M: Michael S. Tsirkin <mst@redhat.com>

M: Marcel Apfelbaum <marcel@redhat.com>

S: Supported

F: include/hw/i386/

F: hw/i386/

Makefile

+3 −0
Original line number Diff line number Diff line
@@ -334,6 +334,7 @@ dummy := $(call unnest-vars,, \ 
                ivshmem-server-obj-y \

                libvhost-user-obj-y \

                vhost-user-scsi-obj-y \

                vhost-user-blk-obj-y \

                qga-vss-dll-obj-y \

                block-obj-y \

                block-obj-m \
@@ -565,6 +566,8 @@ ivshmem-server$(EXESUF): $(ivshmem-server-obj-y) $(COMMON_LDADDS) 
endif

vhost-user-scsi$(EXESUF): $(vhost-user-scsi-obj-y) libvhost-user.a

	$(call LINK, $^)

vhost-user-blk$(EXESUF): $(vhost-user-blk-obj-y) libvhost-user.a

	$(call LINK, $^)



module_block.h: $(SRC_PATH)/scripts/modules/module_block.py config-host.mak

	$(call quiet-command,$(PYTHON) $< $@ \

Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ libvhost-user-obj-y = contrib/libvhost-user/ 
vhost-user-scsi.o-cflags := $(LIBISCSI_CFLAGS)

vhost-user-scsi.o-libs := $(LIBISCSI_LIBS)

vhost-user-scsi-obj-y = contrib/vhost-user-scsi/

vhost-user-blk-obj-y = contrib/vhost-user-blk/



######################################################################

trace-events-subdirs =

accel/kvm/kvm-all.c

+4 −0
Original line number Diff line number Diff line
@@ -812,6 +812,10 @@ static void kvm_mem_ioeventfd_del(MemoryListener *listener, 
    if (r < 0) {

        abort();

    }



    if (e->cleanup) {

        e->cleanup(e);

    }

}



static void kvm_io_ioeventfd_add(MemoryListener *listener,