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

Merge remote-tracking branch 'remotes/aperard/tags/pull-xen-20190114' into staging 



Xen queue

* Xen PV backend 'qdevification'.
  Starting with xen_disk.
* Performance improvements for xen-block.
* Remove of the Xen PV domain builder.
* bug fixes.

# gpg: Signature made Mon 14 Jan 2019 13:46:33 GMT
# gpg:                using RSA key 0CF5572FD7FB55AF
# gpg: Good signature from "Anthony PERARD <anthony.perard@gmail.com>"
# gpg:                 aka "Anthony PERARD <anthony.perard@citrix.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 5379 2F71 024C 600F 778A  7161 D8D5 7199 DF83 42C8
#      Subkey fingerprint: F80C 0063 08E2 2CFD 8A92  E798 0CF5 572F D7FB 55AF

* remotes/aperard/tags/pull-xen-20190114: (25 commits)
  xen-block: avoid repeated memory allocation
  xen-block: improve response latency
  xen-block: improve batching behaviour
  xen: Replace few mentions of xend by libxl
  Remove broken Xen PV domain builder
  xen: remove the legacy 'xen_disk' backend
  MAINTAINERS: add myself as a Xen maintainer
  xen: automatically create XenBlockDevice-s
  xen: add a mechanism to automatically create XenDevice-s...
  xen: add implementations of xen-block connect and disconnect functions...
  xen: purge 'blk' and 'ioreq' from function names in dataplane/xen-block.c
  xen: remove 'ioreq' struct/varable/field names from dataplane/xen-block.c
  xen: remove 'XenBlkDev' and 'blkdev' names from dataplane/xen-block
  xen: add header and build dataplane/xen-block.c
  xen: remove unnecessary code from dataplane/xen-block.c
  xen: duplicate xen_disk.c as basis of dataplane/xen-block.c
  xen: add event channel interface for XenDevice-s
  xen: add grant table interface for XenDevice-s
  xen: add xenstore watcher infrastructure
  xen: create xenstore areas for XenDevice-s
  ...

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

MAINTAINERS

+4 −1
Original line number Diff line number Diff line
@@ -407,6 +407,7 @@ Guest CPU Cores (Xen): 
X86

M: Stefano Stabellini <sstabellini@kernel.org>

M: Anthony Perard <anthony.perard@citrix.com>

M: Paul Durrant <paul.durrant@citrix.com>

L: xen-devel@lists.xenproject.org

S: Supported

F: */xen*
@@ -414,10 +415,12 @@ F: hw/9pfs/xen-9p-backend.c 
F: hw/char/xen_console.c

F: hw/display/xenfb.c

F: hw/net/xen_nic.c

F: hw/block/xen_*

F: hw/block/xen*

F: hw/block/dataplane/xen*

F: hw/xen/

F: hw/xenpv/

F: hw/i386/xen/

F: include/hw/block/dataplane/xen*

F: include/hw/xen/

F: include/sysemu/xen-mapcache.h

configure

+0 −17
Original line number Diff line number Diff line
@@ -357,7 +357,6 @@ vnc_png="" 
xkbcommon=""

xen=""

xen_ctrl_version=""

xen_pv_domain_build="no"

xen_pci_passthrough=""

linux_aio=""

cap_ng=""
@@ -1119,10 +1118,6 @@ for opt do 
  ;;

  --enable-xen-pci-passthrough) xen_pci_passthrough="yes"

  ;;

  --disable-xen-pv-domain-build) xen_pv_domain_build="no"

  ;;

  --enable-xen-pv-domain-build) xen_pv_domain_build="yes"

  ;;

  --disable-brlapi) brlapi="no"

  ;;

  --enable-brlapi) brlapi="yes"
@@ -1685,8 +1680,6 @@ Advanced options (experts only): 
  --tls-priority           default TLS protocol/cipher priority string

  --enable-gprof           QEMU profiling with gprof

  --enable-profiler        profiler support

  --enable-xen-pv-domain-build

                           xen pv domain builder

  --enable-debug-stack-usage

                           track the maximum stack usage of stacks created by qemu_alloc_stack
@@ -2678,12 +2671,6 @@ if test "$xen_pci_passthrough" != "no"; then 
  fi

fi



if test "$xen_pv_domain_build" = "yes" &&

   test "$xen" != "yes"; then

    error_exit "User requested Xen PV domain builder support" \

	       "which requires Xen support."

fi



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

# Windows Hypervisor Platform accelerator (WHPX) check

if test "$whpx" != "no" ; then
@@ -6069,7 +6056,6 @@ fi 
echo "xen support       $xen"

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

  echo "xen ctrl version  $xen_ctrl_version"

  echo "pv dom build      $xen_pv_domain_build"

fi

echo "brlapi support    $brlapi"

echo "bluez  support    $bluez"
@@ -6539,9 +6525,6 @@ fi 
if test "$xen" = "yes" ; then

  echo "CONFIG_XEN_BACKEND=y" >> $config_host_mak

  echo "CONFIG_XEN_CTRL_INTERFACE_VERSION=$xen_ctrl_version" >> $config_host_mak

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

    echo "CONFIG_XEN_PV_DOMAIN_BUILD=y" >> $config_host_mak

  fi

fi

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

  echo "CONFIG_LINUX_AIO=y" >> $config_host_mak

hw/9pfs/xen-9p-backend.c

+8 −8
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 


#include "hw/hw.h"

#include "hw/9pfs/9p.h"

#include "hw/xen/xen_backend.h"

#include "hw/xen/xen-legacy-backend.h"

#include "hw/9pfs/xen-9pfs.h"

#include "qapi/error.h"

#include "qemu/config-file.h"
@@ -45,7 +45,7 @@ typedef struct Xen9pfsRing { 
} Xen9pfsRing;



typedef struct Xen9pfsDev {

    struct XenDevice xendev;  /* must be first */

    struct XenLegacyDevice xendev;  /* must be first */

    V9fsState state;

    char *path;

    char *security_model;
@@ -56,7 +56,7 @@ typedef struct Xen9pfsDev { 
    Xen9pfsRing *rings;

} Xen9pfsDev;



static void xen_9pfs_disconnect(struct XenDevice *xendev);

static void xen_9pfs_disconnect(struct XenLegacyDevice *xendev);



static void xen_9pfs_in_sg(Xen9pfsRing *ring,

                           struct iovec *in_sg,
@@ -243,7 +243,7 @@ static const V9fsTransport xen_9p_transport = { 
    .push_and_notify = xen_9pfs_push_and_notify,

};



static int xen_9pfs_init(struct XenDevice *xendev)

static int xen_9pfs_init(struct XenLegacyDevice *xendev)

{

    return 0;

}
@@ -305,7 +305,7 @@ static void xen_9pfs_evtchn_event(void *opaque) 
    qemu_bh_schedule(ring->bh);

}



static void xen_9pfs_disconnect(struct XenDevice *xendev)

static void xen_9pfs_disconnect(struct XenLegacyDevice *xendev)

{

    Xen9pfsDev *xen_9pdev = container_of(xendev, Xen9pfsDev, xendev);

    int i;
@@ -321,7 +321,7 @@ static void xen_9pfs_disconnect(struct XenDevice *xendev) 
    }

}



static int xen_9pfs_free(struct XenDevice *xendev)

static int xen_9pfs_free(struct XenLegacyDevice *xendev)

{

    Xen9pfsDev *xen_9pdev = container_of(xendev, Xen9pfsDev, xendev);

    int i;
@@ -354,7 +354,7 @@ static int xen_9pfs_free(struct XenDevice *xendev) 
    return 0;

}



static int xen_9pfs_connect(struct XenDevice *xendev)

static int xen_9pfs_connect(struct XenLegacyDevice *xendev)

{

    Error *err = NULL;

    int i;
@@ -467,7 +467,7 @@ out: 
    return -1;

}



static void xen_9pfs_alloc(struct XenDevice *xendev)

static void xen_9pfs_alloc(struct XenLegacyDevice *xendev)

{

    xenstore_write_be_str(xendev, "versions", VERSIONS);

    xenstore_write_be_int(xendev, "max-rings", MAX_RINGS);

hw/block/Makefile.objs

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ common-obj-$(CONFIG_SSI_M25P80) += m25p80.o 
common-obj-$(CONFIG_NAND) += nand.o

common-obj-$(CONFIG_PFLASH_CFI01) += pflash_cfi01.o

common-obj-$(CONFIG_PFLASH_CFI02) += pflash_cfi02.o

common-obj-$(CONFIG_XEN) += xen_disk.o

common-obj-$(CONFIG_XEN) += xen-block.o

common-obj-$(CONFIG_ECC) += ecc.o

common-obj-$(CONFIG_ONENAND) += onenand.o

common-obj-$(CONFIG_NVME_PCI) += nvme.o

hw/block/dataplane/Makefile.objs

+1 −0
Original line number Diff line number Diff line 
obj-y += virtio-blk.o

obj-$(CONFIG_XEN) += xen-block.o