Commit c8eaf81f authored by Peter Maydell's avatar Peter Maydell
Browse files

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



virtio,acpi: features, fixes, cleanups.

vdpa support
virtio-mem support
a handy script for disassembling acpi tables
misc fixes and cleanups

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

# gpg: Signature made Tue 07 Jul 2020 13:00:35 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: (41 commits)
  vhost-vdpa: introduce vhost-vdpa net client
  vhost-vdpa: introduce vhost-vdpa backend
  vhost_net: introduce set_config & get_config
  vhost: implement vhost_force_iommu method
  vhost: introduce new VhostOps vhost_force_iommu
  vhost: implement vhost_vq_get_addr method
  vhost: introduce new VhostOps vhost_vq_get_addr
  vhost: implement vhost_dev_start method
  vhost: introduce new VhostOps vhost_dev_start
  vhost: check the existence of vhost_set_iotlb_callback
  virtio-pci: implement queue_enabled method
  virtio-bus: introduce queue_enabled method
  vhost_net: use the function qemu_get_peer
  net: introduce qemu_get_peer
  MAINTAINERS: add VT-d entry
  docs: vhost-user: add Virtio status protocol feature
  tests/acpi: remove stale allowed tables
  numa: Auto-enable NUMA when any memory devices are possible
  virtio-mem: Exclude unplugged memory during migration
  virtio-mem: Add trace events
  ...

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

# Conflicts:
#	hw/arm/virt.c
#	hw/virtio/trace-events
parents 710fb08f 1e0a84ea

MAINTAINERS

+18 −0
Original line number Diff line number Diff line
@@ -1792,6 +1792,15 @@ F: hw/virtio/virtio-crypto.c 
F: hw/virtio/virtio-crypto-pci.c

F: include/hw/virtio/virtio-crypto.h



virtio-mem

M: David Hildenbrand <david@redhat.com>

S: Supported

W: https://virtio-mem.gitlab.io/

F: hw/virtio/virtio-mem.c

F: hw/virtio/virtio-mem-pci.h

F: hw/virtio/virtio-mem-pci.c

F: include/hw/virtio/virtio-mem.h



nvme

M: Keith Busch <kbusch@kernel.org>

L: qemu-block@nongnu.org
@@ -2617,6 +2626,15 @@ F: tests/uefi-test-tools/ 
F: .gitlab-ci.d/edk2.yml

F: .gitlab-ci.d/edk2/



VT-d Emulation

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

M: Peter Xu <peterx@redhat.com>

R: Jason Wang <jasowang@redhat.com>

S: Supported

F: hw/i386/intel_iommu.c

F: hw/i386/intel_iommu_internal.h

F: include/hw/i386/intel_iommu.h



Usermode Emulation

------------------

Overall usermode emulation

accel/kvm/kvm-all.c

+2 −2
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ 
#include "trace.h"

#include "hw/irq.h"

#include "sysemu/sev.h"

#include "sysemu/balloon.h"

#include "qapi/visitor.h"

#include "qapi/qapi-types-common.h"

#include "qapi/qapi-visit-common.h"
@@ -2229,7 +2228,8 @@ static int kvm_init(MachineState *ms) 


    s->sync_mmu = !!kvm_vm_check_extension(kvm_state, KVM_CAP_SYNC_MMU);

    if (!s->sync_mmu) {

        qemu_balloon_inhibit(true);

        ret = ram_block_discard_disable(true);

        assert(!ret);

    }



    return 0;

balloon.c

+0 −17
Original line number Diff line number Diff line
@@ -36,23 +36,6 @@ 
static QEMUBalloonEvent *balloon_event_fn;

static QEMUBalloonStatus *balloon_stat_fn;

static void *balloon_opaque;

static int balloon_inhibit_count;



bool qemu_balloon_is_inhibited(void)

{

    return atomic_read(&balloon_inhibit_count) > 0;

}



void qemu_balloon_inhibit(bool state)

{

    if (state) {

        atomic_inc(&balloon_inhibit_count);

    } else {

        atomic_dec(&balloon_inhibit_count);

    }



    assert(atomic_read(&balloon_inhibit_count) >= 0);

}



static bool have_balloon(Error **errp)

{

configure

+21 −0
Original line number Diff line number Diff line
@@ -1575,6 +1575,10 @@ for opt do 
  ;;

  --enable-vhost-user) vhost_user="yes"

  ;;

  --disable-vhost-vdpa) vhost_vdpa="no"

  ;;

  --enable-vhost-vdpa) vhost_vdpa="yes"

  ;;

  --disable-vhost-kernel) vhost_kernel="no"

  ;;

  --enable-vhost-kernel) vhost_kernel="yes"
@@ -1883,6 +1887,7 @@ disabled with --disable-FEATURE, default is enabled if available: 
  vhost-crypto    vhost-user-crypto backend support

  vhost-kernel    vhost kernel backend support

  vhost-user      vhost-user backend support

  vhost-vdpa      vhost-vdpa kernel backend support

  spice           spice

  rbd             rados block device (rbd)

  libiscsi        iscsi support
@@ -2394,6 +2399,10 @@ test "$vhost_user" = "" && vhost_user=yes 
if test "$vhost_user" = "yes" && test "$mingw32" = "yes"; then

  error_exit "vhost-user isn't available on win32"

fi

test "$vhost_vdpa" = "" && vhost_vdpa=$linux

if test "$vhost_vdpa" = "yes" && test "$linux" != "yes"; then

  error_exit "vhost-vdpa is only available on Linux"

fi

test "$vhost_kernel" = "" && vhost_kernel=$linux

if test "$vhost_kernel" = "yes" && test "$linux" != "yes"; then

  error_exit "vhost-kernel is only available on Linux"
@@ -2422,6 +2431,11 @@ test "$vhost_user_fs" = "" && vhost_user_fs=$vhost_user 
if test "$vhost_user_fs" = "yes" && test "$vhost_user" = "no"; then

  error_exit "--enable-vhost-user-fs requires --enable-vhost-user"

fi

#vhost-vdpa backends

test "$vhost_net_vdpa" = "" && vhost_net_vdpa=$vhost_vdpa

if test "$vhost_net_vdpa" = "yes" && test "$vhost_vdpa" = "no"; then

  error_exit "--enable-vhost-net-vdpa requires --enable-vhost-vdpa"

fi



# OR the vhost-kernel and vhost-user values for simplicity

if test "$vhost_net" = ""; then
@@ -6947,6 +6961,7 @@ echo "vhost-scsi support $vhost_scsi" 
echo "vhost-vsock support $vhost_vsock"

echo "vhost-user support $vhost_user"

echo "vhost-user-fs support $vhost_user_fs"

echo "vhost-vdpa support $vhost_vdpa"

echo "Trace backends    $trace_backends"

if have_backend "simple"; then

echo "Trace output file $trace_file-<pid>"
@@ -7454,6 +7469,9 @@ fi 
if test "$vhost_net_user" = "yes" ; then

  echo "CONFIG_VHOST_NET_USER=y" >> $config_host_mak

fi

if test "$vhost_net_vdpa" = "yes" ; then

  echo "CONFIG_VHOST_NET_VDPA=y" >> $config_host_mak

fi

if test "$vhost_crypto" = "yes" ; then

  echo "CONFIG_VHOST_CRYPTO=y" >> $config_host_mak

fi
@@ -7469,6 +7487,9 @@ fi 
if test "$vhost_user" = "yes" ; then

  echo "CONFIG_VHOST_USER=y" >> $config_host_mak

fi

if test "$vhost_vdpa" = "yes" ; then

  echo "CONFIG_VHOST_VDPA=y" >> $config_host_mak

fi

if test "$vhost_user_fs" = "yes" ; then

  echo "CONFIG_VHOST_USER_FS=y" >> $config_host_mak

fi

docs/interop/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -20,3 +20,4 @@ Contents: 
   qemu-ga

   vhost-user

   vhost-user-gpu

   vhost-vdpa