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

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



Xen 2015/11/25

# gpg: Signature made Wed 25 Nov 2015 11:19:26 GMT using RSA key ID 70E1AE90
# gpg: Good signature from "Stefano Stabellini <stefano.stabellini@eu.citrix.com>"

* remotes/sstabellini/tags/xen-20151125:
  xen_disk: Remove ioreq.postsync
  xen: fix usage of xc_domain_create in domain builder

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 1aae36df 22037db3

configure

+17 −0
Original line number Diff line number Diff line
@@ -1946,6 +1946,23 @@ EOF 
  elif

      cat > $TMPC <<EOF &&

#include <xenctrl.h>

#include <stdint.h>

int main(void) {

  xc_interface *xc = NULL;

  xen_domain_handle_t handle;

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

  return 0;

}

EOF

      compile_prog "" "$xen_libs"

    then

    xen_ctrl_version=470

    xen=yes



  # Xen 4.6

  elif

      cat > $TMPC <<EOF &&

#include <xenctrl.h>

#include <xenstore.h>

#include <stdint.h>

#include <xen/hvm/hvm_info_table.h>

hw/block/xen_disk.c

+0 −8
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ struct ioreq { 
    off_t               start;

    QEMUIOVector        v;

    int                 presync;

    int                 postsync;

    uint8_t             mapped;



    /* grant mapping */
@@ -144,7 +143,6 @@ static void ioreq_reset(struct ioreq *ioreq) 
    ioreq->status = 0;

    ioreq->start = 0;

    ioreq->presync = 0;

    ioreq->postsync = 0;

    ioreq->mapped = 0;



    memset(ioreq->domids, 0, sizeof(ioreq->domids));
@@ -520,12 +518,6 @@ static void qemu_aio_complete(void *opaque, int ret) 
    if (ioreq->aio_inflight > 0) {

        return;

    }

    if (ioreq->postsync) {

        ioreq->postsync = 0;

        ioreq->aio_inflight++;

        blk_aio_flush(ioreq->blkdev->blk, qemu_aio_complete, ioreq);

        return;

    }



    ioreq->status = ioreq->aio_errors ? BLKIF_RSP_ERROR : BLKIF_RSP_OKAY;

    ioreq_unmap(ioreq);

hw/xenpv/xen_domainbuild.c

+1 −1
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ int xen_domain_build_pv(const char *kernel, const char *ramdisk, 
    int rc;



    memcpy(uuid, qemu_uuid, sizeof(uuid));

    rc = xc_domain_create(xen_xc, ssidref, uuid, flags, &xen_domid);

    rc = xen_domain_create(xen_xc, ssidref, uuid, flags, &xen_domid);

    if (rc < 0) {

        fprintf(stderr, "xen: xc_domain_create() failed\n");

        goto err;

include/hw/xen/xen_common.h

+16 −0
Original line number Diff line number Diff line
@@ -439,4 +439,20 @@ static inline int xen_xc_domain_add_to_physmap(XenXC xch, uint32_t domid, 
}

#endif



#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 470

static inline int xen_domain_create(XenXC xc, uint32_t ssidref,

                                    xen_domain_handle_t handle, uint32_t flags,

                                    uint32_t *pdomid)

{

    return xc_domain_create(xc, ssidref, handle, flags, pdomid);

}

#else

static inline int xen_domain_create(XenXC xc, uint32_t ssidref,

                                    xen_domain_handle_t handle, uint32_t flags,

                                    uint32_t *pdomid)

{

    return xc_domain_create(xc, ssidref, handle, flags, pdomid, NULL);

}

#endif



#endif /* QEMU_HW_XEN_COMMON_H */