Commit 39c36a05 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/sstabellini/tags/xen-20160126-2' into staging 



Xen 2016/01/26 with Signed-off-by lines.

# gpg: Signature made Tue 26 Jan 2016 17:20:12 GMT using RSA key ID 70E1AE90
# gpg: Good signature from "Stefano Stabellini <stefano.stabellini@eu.citrix.com>"

* remotes/sstabellini/tags/xen-20160126-2:
  xen: make it possible to build without the Xen PV domain builder
  xen: domainbuild: reopen libxenctrl interface after forking for domain watcher.
  xen: Use stable library interfaces when they are available.
  xen: Switch uses of xc_map_foreign_{pages,bulk} to use libxenforeignmemory API.
  xen: Switch uses of xc_map_foreign_range into xc_map_foreign_pages
  xen: Switch to libxengnttab interface for compat shims.
  xen: Switch to libxenevtchn interface for compat shims.
  xen_console: correctly cleanup primary console on teardown.

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

configure

+70 −0
Original line number Diff line number Diff line
@@ -250,6 +250,7 @@ vnc_jpeg="" 
vnc_png=""

xen=""

xen_ctrl_version=""

xen_pv_domain_build="no"

xen_pci_passthrough=""

linux_aio=""

cap_ng=""
@@ -927,6 +928,10 @@ 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"
@@ -1938,6 +1943,7 @@ fi 


if test "$xen" != "no" ; then

  xen_libs="-lxenstore -lxenctrl -lxenguest"

  xen_stable_libs="-lxenforeignmemory -lxengnttab -lxenevtchn"



  # First we test whether Xen headers and libraries are available.

  # If no, we are done and there is no Xen support.
@@ -1960,6 +1966,57 @@ EOF 
  # Xen unstable

  elif

      cat > $TMPC <<EOF &&

/*

 * If we have stable libs the we don't want the libxc compat

 * layers, regardless of what CFLAGS we may have been given.

 */

#undef XC_WANT_COMPAT_EVTCHN_API

#undef XC_WANT_COMPAT_GNTTAB_API

#undef XC_WANT_COMPAT_MAP_FOREIGN_API

#include <xenctrl.h>

#include <xenstore.h>

#include <xenevtchn.h>

#include <xengnttab.h>

#include <xenforeignmemory.h>

#include <stdint.h>

#include <xen/hvm/hvm_info_table.h>

#if !defined(HVM_MAX_VCPUS)

# error HVM_MAX_VCPUS not defined

#endif

int main(void) {

  xc_interface *xc = NULL;

  xenforeignmemory_handle *xfmem;

  xenevtchn_handle *xe;

  xengnttab_handle *xg;

  xen_domain_handle_t handle;



  xs_daemon_open();



  xc = xc_interface_open(0, 0, 0);

  xc_hvm_set_mem_type(0, 0, HVMMEM_ram_ro, 0, 0);

  xc_domain_add_to_physmap(0, 0, XENMAPSPACE_gmfn, 0, 0);

  xc_hvm_inject_msi(xc, 0, 0xf0000000, 0x00000000);

  xc_hvm_create_ioreq_server(xc, 0, HVM_IOREQSRV_BUFIOREQ_ATOMIC, NULL);

  xc_domain_create(xc, 0, handle, 0, NULL, NULL);



  xfmem = xenforeignmemory_open(0, 0);

  xenforeignmemory_map(xfmem, 0, 0, 0, 0, 0);



  xe = xenevtchn_open(0, 0);

  xenevtchn_fd(xe);



  xg = xengnttab_open(0, 0);

  xengnttab_map_grant_ref(xg, 0, 0, 0);



  return 0;

}

EOF

      compile_prog "" "$xen_libs $xen_stable_libs"

    then

    xen_ctrl_version=471

    xen=yes

  elif

      cat > $TMPC <<EOF &&

#include <xenctrl.h>

#include <stdint.h>

int main(void) {
@@ -2153,6 +2210,9 @@ EOF 
  fi



  if test "$xen" = yes; then

    if test $xen_ctrl_version -ge 471  ; then

      libs_softmmu="$xen_stable_libs $libs_softmmu"

    fi

    libs_softmmu="$xen_libs $libs_softmmu"

  fi

fi
@@ -2174,6 +2234,12 @@ 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



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

# libtool probe
@@ -4793,6 +4859,7 @@ 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"
@@ -5164,6 +5231,9 @@ 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/block/xen_disk.c

+20 −18
Original line number Diff line number Diff line
@@ -161,11 +161,11 @@ static gint int_cmp(gconstpointer a, gconstpointer b, gpointer user_data) 
static void destroy_grant(gpointer pgnt)

{

    PersistentGrant *grant = pgnt;

    XenGnttab gnt = grant->blkdev->xendev.gnttabdev;

    xengnttab_handle *gnt = grant->blkdev->xendev.gnttabdev;



    if (xc_gnttab_munmap(gnt, grant->page, 1) != 0) {

    if (xengnttab_unmap(gnt, grant->page, 1) != 0) {

        xen_be_printf(&grant->blkdev->xendev, 0,

                      "xc_gnttab_munmap failed: %s\n",

                      "xengnttab_unmap failed: %s\n",

                      strerror(errno));

    }

    grant->blkdev->persistent_gnt_count--;
@@ -178,11 +178,11 @@ static void remove_persistent_region(gpointer data, gpointer dev) 
{

    PersistentRegion *region = data;

    struct XenBlkDev *blkdev = dev;

    XenGnttab gnt = blkdev->xendev.gnttabdev;

    xengnttab_handle *gnt = blkdev->xendev.gnttabdev;



    if (xc_gnttab_munmap(gnt, region->addr, region->num) != 0) {

    if (xengnttab_unmap(gnt, region->addr, region->num) != 0) {

        xen_be_printf(&blkdev->xendev, 0,

                      "xc_gnttab_munmap region %p failed: %s\n",

                      "xengnttab_unmap region %p failed: %s\n",

                      region->addr, strerror(errno));

    }

    xen_be_printf(&blkdev->xendev, 3,
@@ -317,7 +317,7 @@ err: 


static void ioreq_unmap(struct ioreq *ioreq)

{

    XenGnttab gnt = ioreq->blkdev->xendev.gnttabdev;

    xengnttab_handle *gnt = ioreq->blkdev->xendev.gnttabdev;

    int i;



    if (ioreq->num_unmap == 0 || ioreq->mapped == 0) {
@@ -327,8 +327,9 @@ static void ioreq_unmap(struct ioreq *ioreq) 
        if (!ioreq->pages) {

            return;

        }

        if (xc_gnttab_munmap(gnt, ioreq->pages, ioreq->num_unmap) != 0) {

            xen_be_printf(&ioreq->blkdev->xendev, 0, "xc_gnttab_munmap failed: %s\n",

        if (xengnttab_unmap(gnt, ioreq->pages, ioreq->num_unmap) != 0) {

            xen_be_printf(&ioreq->blkdev->xendev, 0,

                          "xengnttab_unmap failed: %s\n",

                          strerror(errno));

        }

        ioreq->blkdev->cnt_map -= ioreq->num_unmap;
@@ -338,8 +339,9 @@ static void ioreq_unmap(struct ioreq *ioreq) 
            if (!ioreq->page[i]) {

                continue;

            }

            if (xc_gnttab_munmap(gnt, ioreq->page[i], 1) != 0) {

                xen_be_printf(&ioreq->blkdev->xendev, 0, "xc_gnttab_munmap failed: %s\n",

            if (xengnttab_unmap(gnt, ioreq->page[i], 1) != 0) {

                xen_be_printf(&ioreq->blkdev->xendev, 0,

                              "xengnttab_unmap failed: %s\n",

                              strerror(errno));

            }

            ioreq->blkdev->cnt_map--;
@@ -351,7 +353,7 @@ static void ioreq_unmap(struct ioreq *ioreq) 


static int ioreq_map(struct ioreq *ioreq)

{

    XenGnttab gnt = ioreq->blkdev->xendev.gnttabdev;

    xengnttab_handle *gnt = ioreq->blkdev->xendev.gnttabdev;

    uint32_t domids[BLKIF_MAX_SEGMENTS_PER_REQUEST];

    uint32_t refs[BLKIF_MAX_SEGMENTS_PER_REQUEST];

    void *page[BLKIF_MAX_SEGMENTS_PER_REQUEST];
@@ -402,7 +404,7 @@ static int ioreq_map(struct ioreq *ioreq) 
    }



    if (batch_maps && new_maps) {

        ioreq->pages = xc_gnttab_map_grant_refs

        ioreq->pages = xengnttab_map_grant_refs

            (gnt, new_maps, domids, refs, ioreq->prot);

        if (ioreq->pages == NULL) {

            xen_be_printf(&ioreq->blkdev->xendev, 0,
@@ -418,7 +420,7 @@ static int ioreq_map(struct ioreq *ioreq) 
        ioreq->blkdev->cnt_map += new_maps;

    } else if (new_maps)  {

        for (i = 0; i < new_maps; i++) {

            ioreq->page[i] = xc_gnttab_map_grant_ref

            ioreq->page[i] = xengnttab_map_grant_ref

                (gnt, domids[i], refs[i], ioreq->prot);

            if (ioreq->page[i] == NULL) {

                xen_be_printf(&ioreq->blkdev->xendev, 0,
@@ -768,9 +770,9 @@ static void blk_alloc(struct XenDevice *xendev) 
    if (xen_mode != XEN_EMULATE) {

        batch_maps = 1;

    }

    if (xc_gnttab_set_max_grants(xendev->gnttabdev,

    if (xengnttab_set_max_grants(xendev->gnttabdev,

            MAX_GRANTS(max_requests, BLKIF_MAX_SEGMENTS_PER_REQUEST)) < 0) {

        xen_be_printf(xendev, 0, "xc_gnttab_set_max_grants failed: %s\n",

        xen_be_printf(xendev, 0, "xengnttab_set_max_grants failed: %s\n",

                      strerror(errno));

    }

}
@@ -980,7 +982,7 @@ static int blk_connect(struct XenDevice *xendev) 
        }

    }



    blkdev->sring = xc_gnttab_map_grant_ref(blkdev->xendev.gnttabdev,

    blkdev->sring = xengnttab_map_grant_ref(blkdev->xendev.gnttabdev,

                                            blkdev->xendev.dom,

                                            blkdev->ring_ref,

                                            PROT_READ | PROT_WRITE);
@@ -1045,7 +1047,7 @@ static void blk_disconnect(struct XenDevice *xendev) 
    xen_be_unbind_evtchn(&blkdev->xendev);



    if (blkdev->sring) {

        xc_gnttab_munmap(blkdev->xendev.gnttabdev, blkdev->sring, 1);

        xengnttab_unmap(blkdev->xendev.gnttabdev, blkdev->sring, 1);

        blkdev->cnt_map--;

        blkdev->sring = NULL;

    }

hw/char/xen_console.c

+8 −11
Original line number Diff line number Diff line
@@ -228,12 +228,12 @@ static int con_initialise(struct XenDevice *xendev) 
	con->buffer.max_capacity = limit;



    if (!xendev->dev) {

        con->sring = xc_map_foreign_range(xen_xc, con->xendev.dom,

                                          XC_PAGE_SIZE,

        xen_pfn_t mfn = con->ring_ref;

        con->sring = xenforeignmemory_map(xen_fmem, con->xendev.dom,

                                          PROT_READ|PROT_WRITE,

                                          con->ring_ref);

                                          1, &mfn, NULL);

    } else {

        con->sring = xc_gnttab_map_grant_ref(xendev->gnttabdev, con->xendev.dom,

        con->sring = xengnttab_map_grant_ref(xendev->gnttabdev, con->xendev.dom,

                                             con->ring_ref,

                                             PROT_READ|PROT_WRITE);

    }
@@ -265,9 +265,6 @@ static void con_disconnect(struct XenDevice *xendev) 
{

    struct XenConsole *con = container_of(xendev, struct XenConsole, xendev);



    if (!xendev->dev) {

        return;

    }

    if (con->chr) {

        qemu_chr_add_handlers(con->chr, NULL, NULL, NULL, NULL);

        qemu_chr_fe_release(con->chr);
@@ -275,10 +272,10 @@ static void con_disconnect(struct XenDevice *xendev) 
    xen_be_unbind_evtchn(&con->xendev);



    if (con->sring) {

        if (!xendev->gnttabdev) {

            munmap(con->sring, XC_PAGE_SIZE);

        if (!xendev->dev) {

            xenforeignmemory_unmap(xen_fmem, con->sring, 1);

        } else {

            xc_gnttab_munmap(xendev->gnttabdev, con->sring, 1);

            xengnttab_unmap(xendev->gnttabdev, con->sring, 1);

        }

        con->sring = NULL;

    }

hw/display/xenfb.c

+15 −13
Original line number Diff line number Diff line
@@ -95,23 +95,24 @@ struct XenFB { 


static int common_bind(struct common *c)

{

    uint64_t mfn;

    uint64_t val;

    xen_pfn_t mfn;



    if (xenstore_read_fe_uint64(&c->xendev, "page-ref", &mfn) == -1)

    if (xenstore_read_fe_uint64(&c->xendev, "page-ref", &val) == -1)

	return -1;

    assert(mfn == (xen_pfn_t)mfn);

    mfn = (xen_pfn_t)val;

    assert(val == mfn);



    if (xenstore_read_fe_int(&c->xendev, "event-channel", &c->xendev.remote_port) == -1)

	return -1;



    c->page = xc_map_foreign_range(xen_xc, c->xendev.dom,

				   XC_PAGE_SIZE,

				   PROT_READ | PROT_WRITE, mfn);

    c->page = xenforeignmemory_map(xen_fmem, c->xendev.dom,

                                   PROT_READ | PROT_WRITE, 1, &mfn, NULL);

    if (c->page == NULL)

	return -1;



    xen_be_bind_evtchn(&c->xendev);

    xen_be_printf(&c->xendev, 1, "ring mfn %"PRIx64", remote-port %d, local-port %d\n",

    xen_be_printf(&c->xendev, 1, "ring mfn %"PRI_xen_pfn", remote-port %d, local-port %d\n",

		  mfn, c->xendev.remote_port, c->xendev.local_port);



    return 0;
@@ -121,7 +122,7 @@ static void common_unbind(struct common *c) 
{

    xen_be_unbind_evtchn(&c->xendev);

    if (c->page) {

	munmap(c->page, XC_PAGE_SIZE);

        xenforeignmemory_unmap(xen_fmem, c->page, 1);

	c->page = NULL;

    }

}
@@ -494,15 +495,15 @@ static int xenfb_map_fb(struct XenFB *xenfb) 
    fbmfns = g_malloc0(sizeof(xen_pfn_t) * xenfb->fbpages);



    xenfb_copy_mfns(mode, n_fbdirs, pgmfns, pd);

    map = xc_map_foreign_pages(xen_xc, xenfb->c.xendev.dom,

			       PROT_READ, pgmfns, n_fbdirs);

    map = xenforeignmemory_map(xen_fmem, xenfb->c.xendev.dom,

                               PROT_READ, n_fbdirs, pgmfns, NULL);

    if (map == NULL)

	goto out;

    xenfb_copy_mfns(mode, xenfb->fbpages, fbmfns, map);

    munmap(map, n_fbdirs * XC_PAGE_SIZE);

    xenforeignmemory_unmap(xen_fmem, map, n_fbdirs);



    xenfb->pixels = xc_map_foreign_pages(xen_xc, xenfb->c.xendev.dom,

            PROT_READ, fbmfns, xenfb->fbpages);

    xenfb->pixels = xenforeignmemory_map(xen_fmem, xenfb->c.xendev.dom,

            PROT_READ, xenfb->fbpages, fbmfns, NULL);

    if (xenfb->pixels == NULL)

	goto out;
@@ -912,6 +913,7 @@ static void fb_disconnect(struct XenDevice *xendev) 
     *   Replacing the framebuffer with anonymous shared memory

     *   instead.  This releases the guest pages and keeps qemu happy.

     */

    xenforeignmemory_unmap(xen_fmem, fb->pixels, fb->fbpages);

    fb->pixels = mmap(fb->pixels, fb->fbpages * XC_PAGE_SIZE,

                      PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANON,

                      -1, 0);

hw/net/xen_nic.c

+9 −9
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static void net_tx_packets(struct XenNetDev *netdev) 
                          (txreq.flags & NETTXF_more_data)      ? " more_data"      : "",

                          (txreq.flags & NETTXF_extra_info)     ? " extra_info"     : "");



            page = xc_gnttab_map_grant_ref(netdev->xendev.gnttabdev,

            page = xengnttab_map_grant_ref(netdev->xendev.gnttabdev,

                                           netdev->xendev.dom,

                                           txreq.gref, PROT_READ);

            if (page == NULL) {
@@ -190,7 +190,7 @@ static void net_tx_packets(struct XenNetDev *netdev) 
                qemu_send_packet(qemu_get_queue(netdev->nic),

                                 page + txreq.offset, txreq.size);

            }

            xc_gnttab_munmap(netdev->xendev.gnttabdev, page, 1);

            xengnttab_unmap(netdev->xendev.gnttabdev, page, 1);

            net_tx_response(netdev, &txreq, NETIF_RSP_OKAY);

        }

        if (!netdev->tx_work) {
@@ -260,7 +260,7 @@ static ssize_t net_rx_packet(NetClientState *nc, const uint8_t *buf, size_t size 
    memcpy(&rxreq, RING_GET_REQUEST(&netdev->rx_ring, rc), sizeof(rxreq));

    netdev->rx_ring.req_cons = ++rc;



    page = xc_gnttab_map_grant_ref(netdev->xendev.gnttabdev,

    page = xengnttab_map_grant_ref(netdev->xendev.gnttabdev,

                                   netdev->xendev.dom,

                                   rxreq.gref, PROT_WRITE);

    if (page == NULL) {
@@ -270,7 +270,7 @@ static ssize_t net_rx_packet(NetClientState *nc, const uint8_t *buf, size_t size 
        return -1;

    }

    memcpy(page + NET_IP_ALIGN, buf, size);

    xc_gnttab_munmap(netdev->xendev.gnttabdev, page, 1);

    xengnttab_unmap(netdev->xendev.gnttabdev, page, 1);

    net_rx_response(netdev, &rxreq, NETIF_RSP_OKAY, NET_IP_ALIGN, size, 0);



    return size;
@@ -342,19 +342,19 @@ static int net_connect(struct XenDevice *xendev) 
        return -1;

    }



    netdev->txs = xc_gnttab_map_grant_ref(netdev->xendev.gnttabdev,

    netdev->txs = xengnttab_map_grant_ref(netdev->xendev.gnttabdev,

                                          netdev->xendev.dom,

                                          netdev->tx_ring_ref,

                                          PROT_READ | PROT_WRITE);

    if (!netdev->txs) {

        return -1;

    }

    netdev->rxs = xc_gnttab_map_grant_ref(netdev->xendev.gnttabdev,

    netdev->rxs = xengnttab_map_grant_ref(netdev->xendev.gnttabdev,

                                          netdev->xendev.dom,

                                          netdev->rx_ring_ref,

                                          PROT_READ | PROT_WRITE);

    if (!netdev->rxs) {

        xc_gnttab_munmap(netdev->xendev.gnttabdev, netdev->txs, 1);

        xengnttab_unmap(netdev->xendev.gnttabdev, netdev->txs, 1);

        netdev->txs = NULL;

        return -1;

    }
@@ -379,11 +379,11 @@ static void net_disconnect(struct XenDevice *xendev) 
    xen_be_unbind_evtchn(&netdev->xendev);



    if (netdev->txs) {

        xc_gnttab_munmap(netdev->xendev.gnttabdev, netdev->txs, 1);

        xengnttab_unmap(netdev->xendev.gnttabdev, netdev->txs, 1);

        netdev->txs = NULL;

    }

    if (netdev->rxs) {

        xc_gnttab_munmap(netdev->xendev.gnttabdev, netdev->rxs, 1);

        xengnttab_unmap(netdev->xendev.gnttabdev, netdev->rxs, 1);

        netdev->rxs = NULL;

    }

}