diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-11-25 12:09:34 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-11-25 12:09:34 +0000 |
| commit | e85dda8070b20dd8765d52daf64de70a9ccf395f (patch) | |
| tree | 0229a23a1c9e722570d94c243fc155238e07d17c /hw | |
| parent | 1aae36df4b8ed884c6ef6995e70c67fad79b49df (diff) | |
| parent | 22037db38ccfe497bd13a94edead6657781b9b37 (diff) | |
| download | hqemu-e85dda8070b20dd8765d52daf64de70a9ccf395f.zip hqemu-e85dda8070b20dd8765d52daf64de70a9ccf395f.tar.gz | |
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: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/block/xen_disk.c | 8 | ||||
| -rw-r--r-- | hw/xenpv/xen_domainbuild.c | 2 |
2 files changed, 1 insertions, 9 deletions
diff --git a/hw/block/xen_disk.c b/hw/block/xen_disk.c index 02eda6e..8146650 100644 --- a/hw/block/xen_disk.c +++ b/hw/block/xen_disk.c @@ -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); diff --git a/hw/xenpv/xen_domainbuild.c b/hw/xenpv/xen_domainbuild.c index c0ab753..ac0e5ac 100644 --- a/hw/xenpv/xen_domainbuild.c +++ b/hw/xenpv/xen_domainbuild.c @@ -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; |
