From cb2643885b8d6a23dc0248adc76bf657e2d060c2 Mon Sep 17 00:00:00 2001 From: Stefano Stabellini Date: Tue, 29 May 2012 16:36:49 +0100 Subject: [PATCH] xl/libxl: add a blkdev_start parameter Introduce a blkdev_start in xl.conf and a corresponding string in libxl_domain_build_info. Add a blkdev_start parameter to libxl__device_disk_local_attach: it is going to be used in a following patch. blkdev_start specifies the first block device to be used for temporary block device allocations by the toolstack. Signed-off-by: Stefano Stabellini Acked-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Campbell --- docs/man/xl.conf.pod.5 | 6 ++++++ tools/examples/xl.conf | 3 +++ tools/libxl/libxl.c | 3 ++- tools/libxl/libxl_bootloader.c | 3 ++- tools/libxl/libxl_create.c | 3 +++ tools/libxl/libxl_internal.h | 3 ++- tools/libxl/libxl_types.idl | 1 + tools/libxl/xl.c | 3 +++ tools/libxl/xl.h | 1 + tools/libxl/xl_cmdimpl.c | 2 ++ 10 files changed, 25 insertions(+), 3 deletions(-) diff --git a/docs/man/xl.conf.pod.5 b/docs/man/xl.conf.pod.5 index 8bd45ea573..149430c61e 100644 --- a/docs/man/xl.conf.pod.5 +++ b/docs/man/xl.conf.pod.5 @@ -84,6 +84,12 @@ previous C toolstack this can be configured to use the old C Default: C +=item B + +Configures the name of the first block device to be used for temporary +block device allocations by the toolstack. +The default choice is "xvda". + =back =head1 SEE ALSO diff --git a/tools/examples/xl.conf b/tools/examples/xl.conf index 56d3b3b9c1..ebf057c37a 100644 --- a/tools/examples/xl.conf +++ b/tools/examples/xl.conf @@ -12,3 +12,6 @@ # default output format used by "xl list -l" #output_format="json" + +# first block device to be used for temporary VM disk mounts +#blkdev_start="xvda" diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index de71a66ec6..84e0950e14 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1745,7 +1745,8 @@ out: char * libxl__device_disk_local_attach(libxl__gc *gc, const libxl_device_disk *in_disk, - libxl_device_disk *disk) + libxl_device_disk *disk, + const char *blkdev_start) { libxl_ctx *ctx = gc->owner; char *dev = NULL; diff --git a/tools/libxl/libxl_bootloader.c b/tools/libxl/libxl_bootloader.c index e7959b9034..7ebc0dfcf3 100644 --- a/tools/libxl/libxl_bootloader.c +++ b/tools/libxl/libxl_bootloader.c @@ -344,7 +344,8 @@ void libxl__bootloader_run(libxl__egc *egc, libxl__bootloader_state *bl) goto out; } - bl->diskpath = libxl__device_disk_local_attach(gc, bl->disk, &bl->localdisk); + bl->diskpath = libxl__device_disk_local_attach(gc, bl->disk, &bl->localdisk, + info->blkdev_start); if (!bl->diskpath) { rc = ERROR_FAIL; goto out; diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index e5999c0a20..77acecca9a 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -107,6 +107,9 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, } } + if (b_info->blkdev_start == NULL) + b_info->blkdev_start = libxl__strdup(0, "xvda"); + if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) { if (!b_info->u.hvm.bios) switch (b_info->device_model_version) { diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index ef23734f10..f48f402072 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1290,7 +1290,8 @@ _hidden int libxl__device_disk_add(libxl__gc *gc, uint32_t domid, */ _hidden char * libxl__device_disk_local_attach(libxl__gc *gc, const libxl_device_disk *in_disk, - libxl_device_disk *new_disk); + libxl_device_disk *new_disk, + const char *blkdev_start); _hidden int libxl__device_disk_local_detach(libxl__gc *gc, libxl_device_disk *disk); diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 5b81ee978d..508194bd12 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -246,6 +246,7 @@ libxl_domain_build_info = Struct("domain_build_info",[ ("localtime", libxl_defbool), ("disable_migrate", libxl_defbool), ("cpuid", libxl_cpuid_policy_list), + ("blkdev_start", string), ("device_model_version", libxl_device_model_version), ("device_model_stubdomain", libxl_defbool), diff --git a/tools/libxl/xl.c b/tools/libxl/xl.c index 69f8737459..492153f29f 100644 --- a/tools/libxl/xl.c +++ b/tools/libxl/xl.c @@ -38,6 +38,7 @@ xentoollog_logger_stdiostream *logger; int dryrun_only; int force_execution; int autoballoon = 1; +char *blkdev_start; char *lockfile; char *default_vifscript = NULL; char *default_bridge = NULL; @@ -94,6 +95,8 @@ static void parse_global_config(const char *configfile, fprintf(stderr, "invalid default output format \"%s\"\n", buf); } } + if (!xlu_cfg_get_string (config, "blkdev_start", &buf, 0)) + blkdev_start = strdup(buf); xlu_cfg_destroy(config); } diff --git a/tools/libxl/xl.h b/tools/libxl/xl.h index 2af9428124..7169ed0c59 100644 --- a/tools/libxl/xl.h +++ b/tools/libxl/xl.h @@ -143,6 +143,7 @@ extern int dryrun_only; extern char *lockfile; extern char *default_vifscript; extern char *default_bridge; +extern char *blkdev_start; enum output_format { OUTPUT_FORMAT_JSON, diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index ca988d6979..259b065487 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -627,6 +627,8 @@ static void parse_config_data(const char *config_source, } libxl_domain_build_info_init_type(b_info, c_info->type); + if (blkdev_start) + b_info->blkdev_start = strdup(blkdev_start); /* the following is the actual config parsing with overriding values in the structures */ if (!xlu_cfg_get_long (config, "cpu_weight", &l, 0)) -- 2.39.5