* [Qemu-devel] [PULL for-4.5 1/2] xen: fix usage of xc_domain_create in domain builder
2015-11-25 11:22 [Qemu-devel] [PULL for-2.5 0/2] xen-20151125 Stefano Stabellini
@ 2015-11-25 11:22 ` Stefano Stabellini
2015-11-25 11:22 ` [Qemu-devel] [PULL for-4.5 2/2] xen_disk: Remove ioreq.postsync Stefano Stabellini
2015-11-25 13:28 ` [Qemu-devel] [PULL for-2.5 0/2] xen-20151125 Peter Maydell
2 siblings, 0 replies; 4+ messages in thread
From: Stefano Stabellini @ 2015-11-25 11:22 UTC (permalink / raw)
To: peter.maydell; +Cc: Roger Pau Monne, xen-devel, qemu-devel, Stefano Stabellini
From: Roger Pau Monne <roger.pau@citrix.com>
Due to the addition of HVMlite and the requirement to always provide a
valid xc_domain_configuration_t, xc_domain_create now always takes an arch
domain config, which can be NULL in order to mimic previous behaviour.
Add a small stub called xen_domain_create that encapsulates the correct
call to xc_domain_create depending on the libxc version detected.
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---
configure | 17 +++++++++++++++++
hw/xenpv/xen_domainbuild.c | 2 +-
include/hw/xen/xen_common.h | 16 ++++++++++++++++
3 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/configure b/configure
index f75df4b..10ca25c 100755
--- a/configure
+++ b/configure
@@ -1928,6 +1928,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>
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;
diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h
index d7fa6a4..4ac0c6f 100644
--- a/include/hw/xen/xen_common.h
+++ b/include/hw/xen/xen_common.h
@@ -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 */
--
1.7.10.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* [Qemu-devel] [PULL for-4.5 2/2] xen_disk: Remove ioreq.postsync
2015-11-25 11:22 [Qemu-devel] [PULL for-2.5 0/2] xen-20151125 Stefano Stabellini
2015-11-25 11:22 ` [Qemu-devel] [PULL for-4.5 1/2] xen: fix usage of xc_domain_create in domain builder Stefano Stabellini
@ 2015-11-25 11:22 ` Stefano Stabellini
2015-11-25 13:28 ` [Qemu-devel] [PULL for-2.5 0/2] xen-20151125 Peter Maydell
2 siblings, 0 replies; 4+ messages in thread
From: Stefano Stabellini @ 2015-11-25 11:22 UTC (permalink / raw)
To: peter.maydell; +Cc: xen-devel, Alberto Garcia, qemu-devel, Stefano Stabellini
From: Alberto Garcia <berto@igalia.com>
This code has been dead for three years (since commit 7e7b7cba1).
Signed-off-by: Alberto Garcia <berto@igalia.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---
hw/block/xen_disk.c | 8 --------
1 file changed, 8 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);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 4+ messages in thread