From 5c7cbadaccca8dbb47f2c42ab1b5a8afac9275e3 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 15 May 2013 14:47:32 +0100 Subject: tools: allow user to specify a system qemu-xen binary If this option is given don't bother building qemu-xen ourselves. Likely to be handy for distros who have an existing qemu package which they want to reuse. Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- tools/libxl/libxl_dm.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'tools/libxl') diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 615dcf3945..4035b6db62 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -33,6 +33,15 @@ const char *libxl__device_model_savefile(libxl__gc *gc, uint32_t domid) return libxl__sprintf(gc, "/var/lib/xen/qemu-save.%d", domid); } +static const char *qemu_xen_path(libxl__gc *gc) +{ +#ifdef QEMU_XEN_PATH + return QEMU_XEN_PATH; +#else + return libxl__abs_path(gc, "qemu-system-i386", libxl__libexec_path()); +#endif +} + const char *libxl__domain_device_model(libxl__gc *gc, const libxl_domain_build_info *info) { @@ -50,7 +59,7 @@ const char *libxl__domain_device_model(libxl__gc *gc, dm = libxl__abs_path(gc, "qemu-dm", libxl__libexec_path()); break; case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: - dm = libxl__abs_path(gc, "qemu-system-i386", libxl__libexec_path()); + dm = qemu_xen_path(gc); break; default: LIBXL__LOG(ctx, LIBXL__LOG_ERROR, -- cgit v1.2.3