* [PATCH 0/9] libxl: disk configuration handling @ 2011-06-02 17:55 Ian Jackson 2011-06-02 17:55 ` [PATCH 1/9] libxl: disks: Make LIBXL_DISK_BACKEND_UNKNOWN work Ian Jackson 0 siblings, 1 reply; 49+ messages in thread From: Ian Jackson @ 2011-06-02 17:55 UTC (permalink / raw) To: xen-devel This is v3 of my disk series. What were previously patches 01-06 have been applied. These are the tested and updated remainder, addressing the previous comments. 1 Preparatory work. 2-4 The new parser and its documentation. 5-6 Replace old parsers with calls to the new one. 7-8 Two features, one of them essential. 9 Basic test suite for disk string parsing, as adhoc script. ^ permalink raw reply [flat|nested] 49+ messages in thread
* [PATCH 1/9] libxl: disks: Make LIBXL_DISK_BACKEND_UNKNOWN work 2011-06-02 17:55 [PATCH 0/9] libxl: disk configuration handling Ian Jackson @ 2011-06-02 17:55 ` Ian Jackson 2011-06-02 17:55 ` [PATCH 2/9] libxl: disks: new xlu_disk_parse function Ian Jackson 2011-06-03 8:42 ` [PATCH 1/9] libxl: disks: Make LIBXL_DISK_BACKEND_UNKNOWN work Ian Campbell 0 siblings, 2 replies; 49+ messages in thread From: Ian Jackson @ 2011-06-02 17:55 UTC (permalink / raw) To: xen-devel; +Cc: Ian Jackson libxl callers should not be required to specify the backend if they don't want to. So LIBXL_DISK_BACKEND_UNKNOWN should instruct libxl to choose the backend for itself. For now, we do this by simply treating it the same as BACKEND_TAP, which itself falls back to other methods. More thorough fixes for the disk handling will follow. Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com> --- tools/libxl/libxl.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index c21cfe7..58df99c 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -991,6 +991,21 @@ int libxl_device_disk_add(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *dis device.domid = domid; device.kind = DEVICE_VBD; + + /* + * Fixing the incoming backend type to try to decide on which + * backend to use. Unfortunately at the moment this code is + * utterly broken, but it more or less works. + */ + + /* + * Backend type UNKNOWN should mean "caller does not want to specify", + * not "break pointlessely". (Callers should not be required to + * specify the backend if they don't want to.) + */ + if (disk->backend == LIBXL_DISK_BACKEND_UNKNOWN) + disk->backend = LIBXL_DISK_BACKEND_TAP; + /* If blktap is not available then fallback to qdisk */ if (disk->backend == LIBXL_DISK_BACKEND_TAP && !libxl__blktap_enabled(&gc)) disk->backend = LIBXL_DISK_BACKEND_QDISK; @@ -1138,6 +1153,7 @@ char * libxl_device_disk_local_attach(libxl_ctx *ctx, libxl_device_disk *disk) dev = disk->pdev_path; break; case LIBXL_DISK_BACKEND_TAP: + case LIBXL_DISK_BACKEND_UNKNOWN: if (disk->format == LIBXL_DISK_FORMAT_VHD || disk->format == LIBXL_DISK_FORMAT_RAW) { @@ -1175,7 +1191,6 @@ char * libxl_device_disk_local_attach(libxl_ctx *ctx, libxl_device_disk *disk) disk->pdev_path); dev = disk->pdev_path; break; - case LIBXL_DISK_BACKEND_UNKNOWN: default: LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "unrecognized disk backend " "type: %d", disk->backend); -- 1.5.6.5 ^ permalink raw reply related [flat|nested] 49+ messages in thread
* [PATCH 2/9] libxl: disks: new xlu_disk_parse function 2011-06-02 17:55 ` [PATCH 1/9] libxl: disks: Make LIBXL_DISK_BACKEND_UNKNOWN work Ian Jackson @ 2011-06-02 17:55 ` Ian Jackson 2011-06-02 17:55 ` [PATCH 3/9] libxl: disks: commit libxlu_disk_l.[ch] flex output Ian Jackson ` (2 more replies) 2011-06-03 8:42 ` [PATCH 1/9] libxl: disks: Make LIBXL_DISK_BACKEND_UNKNOWN work Ian Campbell 1 sibling, 3 replies; 49+ messages in thread From: Ian Jackson @ 2011-06-02 17:55 UTC (permalink / raw) To: xen-devel; +Cc: Ian Jackson, Ian Jackson Introduce new flex/regexp-based parser for disk configuration strings. Callers will be updated in following patches. The existing xm command line syntax for block-attach expects multiple arguments containing different parameters for different parts of the disk specification, so we supply a parser function which can take multiple strings and scan them in sequence. Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com> --- tools/libxl/Makefile | 3 +- tools/libxl/libxlu_disk.c | 93 ++++++++++++++++++ tools/libxl/libxlu_disk_i.h | 21 ++++ tools/libxl/libxlu_disk_l.l | 217 +++++++++++++++++++++++++++++++++++++++++++ tools/libxl/libxlutil.h | 23 +++++ 5 files changed, 356 insertions(+), 1 deletions(-) create mode 100644 tools/libxl/libxlu_disk.c create mode 100644 tools/libxl/libxlu_disk_i.h create mode 100644 tools/libxl/libxlu_disk_l.l diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index 84ab76f..ddb639e 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -41,7 +41,8 @@ $(LIBXL_OBJS): CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_lib AUTOINCS= libxlu_cfg_y.h libxlu_cfg_l.h AUTOSRCS= libxlu_cfg_y.c libxlu_cfg_l.c -LIBXLU_OBJS = libxlu_cfg_y.o libxlu_cfg_l.o libxlu_cfg.o +LIBXLU_OBJS = libxlu_cfg_y.o libxlu_cfg_l.o libxlu_cfg.o \ + libxlu_disk_l.o libxlu_disk.o $(LIBXLU_OBJS): CFLAGS += $(CFLAGS_libxenctrl) # For xentoollog.h CLIENTS = xl diff --git a/tools/libxl/libxlu_disk.c b/tools/libxl/libxlu_disk.c new file mode 100644 index 0000000..0984145 --- /dev/null +++ b/tools/libxl/libxlu_disk.c @@ -0,0 +1,93 @@ +#include "libxlu_internal.h" +#include "libxlu_disk_l.h" +#include "libxlu_disk_i.h" +#include "libxlu_cfg_i.h" + +void xlu__disk_err(DiskParseContext *dpc, const char *erroneous, + const char *message) { + fprintf(dpc->cfg->report, + "%s: config parsing error in disk specification: %s" + "%s%s%s" + " in `%s'\n", + dpc->cfg->filename, message, + erroneous?": near `":"", erroneous?erroneous:"", erroneous?"'":"", + dpc->spec); + if (!dpc->err) dpc->err= EINVAL; +} + +static int dpc_prep(DiskParseContext *dpc, const char *spec) { + int e; + + dpc->spec = spec; + + e = xlu__disk_yylex_init_extra(dpc, &dpc->scanner); + if (e) goto fail; + + dpc->buf = xlu__disk_yy_scan_bytes(spec, strlen(spec), dpc->scanner); + if (!dpc->buf) { e = ENOMEM; goto fail; } + + return 0; + + fail: + fprintf(dpc->cfg->report, "cannot init disk scanner: %s\n", + strerror(errno)); + return e; +} + +static void dpc_dispose(DiskParseContext *dpc) { + if (dpc->buf) { + xlu__disk_yy_delete_buffer(dpc->buf, dpc->scanner); + dpc->buf = 0; + } + if (dpc->scanner) { + xlu__disk_yylex_destroy(dpc->scanner); + dpc->scanner = 0; + } +} + +int xlu_disk_parse(XLU_Config *cfg, + int nspecs, const char *const *specs, + libxl_device_disk *disk) { + DiskParseContext dpc; + int i, e; + + memset(&dpc,0,sizeof(dpc)); + dpc.cfg = cfg; + dpc.scanner = 0; + dpc.disk = disk; + + disk->readwrite = 1; + + for (i=0; i<nspecs; i++) { + e = dpc_prep(&dpc, specs[i]); + if (e) { dpc.err = e; goto x_err; } + + xlu__disk_yylex(dpc.scanner); + assert(!e); + if (dpc.err) goto x_err; + + dpc_dispose(&dpc); + } + + if (disk->format == LIBXL_DISK_FORMAT_UNKNOWN) { + disk->format = LIBXL_DISK_FORMAT_RAW; + } + if (disk->is_cdrom) { + disk->removable = 1; + disk->readwrite = 0; + } + + if (!disk->vdev) { + xlu__disk_err(&dpc,0, "no vdev specified"); + goto x_err; + } + if (!disk->pdev_path && !disk->removable) { + xlu__disk_err(&dpc,0,"no target specified (and device not removable)"); + goto x_err; + } + + x_err: + dpc_dispose(&dpc); + return dpc.err; +} + diff --git a/tools/libxl/libxlu_disk_i.h b/tools/libxl/libxlu_disk_i.h new file mode 100644 index 0000000..578920a --- /dev/null +++ b/tools/libxl/libxlu_disk_i.h @@ -0,0 +1,21 @@ +#ifndef LIBXLU_DISK_I_H +#define LIBXLU_DISK_I_H + +#include "libxlu_internal.h" + + +typedef struct { + XLU_Config *cfg; + int err; + void *scanner; + YY_BUFFER_STATE buf; + libxl_device_disk *disk; + int access_set, had_depr_prefix; + const char *spec; +} DiskParseContext; + +void xlu__disk_err(DiskParseContext *dpc, const char *erroneous, + const char *message); + + +#endif /*LIBXLU_DISK_I_H*/ diff --git a/tools/libxl/libxlu_disk_l.l b/tools/libxl/libxlu_disk_l.l new file mode 100644 index 0000000..48a1314 --- /dev/null +++ b/tools/libxl/libxlu_disk_l.l @@ -0,0 +1,217 @@ +/* -*- fundamental -*- */ +/* + * libxlu_disk_l.l - parser for disk specification strings + * + * Copyright (C) 2011 Citrix Ltd. + * Author Ian Jackson <ian.jackson@eu.citrix.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; version 2.1 only. with the special + * exception on linking described in file LICENSE. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + */ + +/* + * Parsing the old xm/xend/xl-4.1 disk specs is a tricky problem, + * because the target string might in theory contain "," which is the + * delimiter we use for stripping off things on the RHS, and ":", + * which is the delimiter we use for stripping off things on the LHS. + * + * In this parser we do not support such target strings in the old + * syntax; if the target string has to contain "," or ":" the new + * syntax's "target=" should be used. + */ + +%{ +#include "libxlu_disk_i.h" + +#define YY_NO_INPUT + +/* Some versions of flex have a bug (Fedora bugzilla 612465) which causes + * it to fail to declare these functions, which it defines. So declare + * them ourselves. Hopefully we won't have to simultaneously support + * a flex version which declares these differently somehow. */ +int xlu__disk_yyget_column(yyscan_t yyscanner); +void xlu__disk_yyset_column(int column_no, yyscan_t yyscanner); + + +/*----- useful macros and functions used in actions ----- + * we use macros in the actual rules to keep the actions short + * and particularly to avoid repeating boilerplate values such as + * DPC->disk, yytext, etc. */ + +#define DPC ((DiskParseContext*)yyextra) + +/* Sets an enum, checking it hasn't already been set to a different value */ +#define DSET(dpc,member,enumname,str,valname) do{ \ + if (dpc->disk->member != LIBXL_DISK_##enumname##_UNKNOWN && \ + dpc->disk->member != LIBXL_DISK_##enumname##_##valname) { \ + xlu__disk_err(dpc, str, TOSTRING(member) " respecified"); \ + } else { \ + dpc->disk->member = LIBXL_DISK_##enumname##_##valname; \ + } \ + }while(0) + +/* For actions whose patterns contain '=', finds the start of the value */ +#define FROMEQUALS (strchr(yytext,'=')+1) + +/* Chops the delimiter off, modifying yytext and yyleng. */ +#define STRIP(delim) do{ \ + if (yyleng>0 && yytext[yyleng-1]==(delim)) \ + yytext[--yyleng] = 0; \ + }while(0) + +/* Sets a string value, checking it hasn't been set already. */ +#define SAVESTRING(what,loc,val) do{ \ + savestring(DPC, what " respecified", &DPC->disk->loc, (val)); \ + }while(0) +static void savestring(DiskParseContext *dpc, const char *what_respecified, + char **update, const char *value) { + if (*update) { + if (**update) { xlu__disk_err(dpc,value,what_respecified); return; } + free(*update); /* do not complain about overwriting empty strings */ + } + *update = strdup(value); +} + +/* Sets ->readwrite from the string. This ought to be an enum, perhaps. */ +static void setaccess(DiskParseContext *dpc, const char *str) { + if (!strcmp(str, "r") || !strcmp(str, "ro")) { + dpc->disk->readwrite = 0; + } else if (!strcmp(str, "rw") || !strcmp(str, "w") || !strcmp(str,"")) { + dpc->disk->readwrite = 1; + } else { + xlu__disk_err(dpc,str,"unknown value for access"); + } +} + +/* Sets ->format from the string. IDL should provide something for this. */ +static void setformat(DiskParseContext *dpc, const char *str) { + if (!strcmp(str,"") || + !strcmp(str,"raw")) DSET(dpc,format,FORMAT,str,RAW); + else if (!strcmp(str,"qcow")) DSET(dpc,format,FORMAT,str,QCOW); + else if (!strcmp(str,"qcow2")) DSET(dpc,format,FORMAT,str,QCOW2); + else if (!strcmp(str,"vhd")) DSET(dpc,format,FORMAT,str,VHD); + else xlu__disk_err(dpc,str,"unknown value for format"); +} + +#define DEPRECATE(usewhatinstead) /* not currently reported */ + +%} + +%option warn +%option nodefault +%option batch +%option 8bit +%option noyywrap +%option reentrant +%option prefix="xlu__disk_yy" +%option nounput + +%x LEXERR + +%% + + /*----- the scanner rules which do the parsing -----*/ + +[ \t\n]+/([^ \t\n].*)? { /* ignore whitespace before parameters */ } + + /* ordinary parameters setting enums or strings */ + +format=[^,]*,? { STRIP(','); setformat(DPC, FROMEQUALS); } + +cdrom,? { DPC->disk->is_cdrom = 1; } +devtype=cdrom,? { DPC->disk->is_cdrom = 1; } +devtype=disk,? { DPC->disk->is_cdrom = 0; } +devtype=[^,]*,? { xlu__disk_err(DPC,yytext,"unknown value for type"); } + +access=[^,]*,? { STRIP(','); setaccess(DPC, FROMEQUALS); } + +vdev=[^,]*,? { STRIP(','); SAVESTRING("vdev", vdev, FROMEQUALS); } +script=[^,]*,? { STRIP(','); SAVESTRING("script", script, FROMEQUALS); } + + /* the target magic parameter, eats the rest of the string */ + +target=.* { STRIP(','); SAVESTRING("target", pdev_path, FROMEQUALS); } + + /* unknown parameters */ + +[a-z][-a-z0-9]*=[^,],? { xlu__disk_err(DPC,yytext,"unknown parameter"); } + + /* deprecated prefixes */ + + /* the "/.*" in these patterns ensures that they count as if they + * matched the whole string, so these patterns take precedence */ + +(raw|qcow2?|vhd):/.* { + STRIP(':'); + DPC->had_depr_prefix=1; DEPRECATE("use `[format=]...,'"); + setformat(DPC, yytext); + } + +iscsi:|e?nbd:drbd:/.* { + STRIP(':'); + DPC->had_depr_prefix=1; DEPRECATE("use `script=...'"); + SAVESTRING("script", script, yytext); + } + +tapdisk:/.* { DPC->had_depr_prefix=1; DEPRECATE(0); } +tap2?:/.* { DPC->had_depr_prefix=1; DEPRECATE(0); } +aio:/.* { DPC->had_depr_prefix=1; DEPRECATE(0); } +ioemu:/.* { DPC->had_depr_prefix=1; DEPRECATE(0); } +file:/.* { DPC->had_depr_prefix=1; DEPRECATE(0); } +phy:/.* { DPC->had_depr_prefix=1; DEPRECATE(0); } + +[a-z][a-z0-9]*:/([^a-z0-9].*)? { + xlu__disk_err(DPC,yytext,"unknown deprecated disk prefix"); + return 0; + } + + /* positional parameters */ + +[^=,]*,|[^=,]+,? { + char *colon; + STRIP(','); + + if (DPC->err) { + /* previous errors may just lead to subsequent ones */ + } else if (!DPC->disk->pdev_path) { + SAVESTRING("target", pdev_path, yytext); + } else if (!DPC->had_depr_prefix && + DPC->disk->format == LIBXL_DISK_FORMAT_UNKNOWN) { + setformat(DPC,yytext); + } else if (!DPC->disk->vdev) { + colon = strrchr(yytext, ':'); + if (colon) { + DEPRECATE("use `devtype=...'"); + *colon++ = 0; + if (!strcmp(colon,"cdrom")) { + DPC->disk->is_cdrom = 1; + } else if (!strcmp(colon,"disk")) { + DPC->disk->is_cdrom = 0; + } else { + xlu__disk_err(DPC,colon,"unknown deprecated type"); + } + } + SAVESTRING("vdev", vdev, yytext); + } else if (!DPC->access_set) { + DPC->access_set = 1; + setaccess(DPC,yytext); + } else { + xlu__disk_err(DPC,yytext,"too many positional parameters"); + return 0; /* don't print any more errors */ + } +} + +. { + BEGIN(LEXERR); + yymore(); +} +<LEXERR>.* { + xlu__disk_err(DPC,yytext,"bad disk syntax"); return 0; +} diff --git a/tools/libxl/libxlutil.h b/tools/libxl/libxlutil.h index 8a6fcbd..80c8753 100644 --- a/tools/libxl/libxlutil.h +++ b/tools/libxl/libxlutil.h @@ -58,4 +58,27 @@ const char *xlu_cfg_get_listitem(const XLU_ConfigList*, int entry); /* xlu_cfg_get_listitem cannot fail, except that if entry is * out of range it returns 0 (not setting errno) */ + +/* + * Disk specification parsing. + */ + +int xlu_disk_parse(XLU_Config *cfg, int nspecs, const char *const *specs, + libxl_device_disk *disk); + /* disk must have been initialised. + * + * On error, returns errno value. Bad strings cause EINVAL and + * print a message to cfg's report (that's all cfg is used for). + * + * Normally one would pass nspecs==1 and only specs[0]. But it is + * permitted to pass more strings in which case each is parsed as a + * string containing a collection of parameters (but they all refer + * to of the configuration for a single disk). + * + * nspecs==0 is permitted but since it does not specify some mandatory + * properties, it produces a run-time configuration error if the + * resulting disk struct is used with libxl. + */ + + #endif /* LIBXLUTIL_H */ -- 1.5.6.5 ^ permalink raw reply related [flat|nested] 49+ messages in thread
* [PATCH 3/9] libxl: disks: commit libxlu_disk_l.[ch] flex output 2011-06-02 17:55 ` [PATCH 2/9] libxl: disks: new xlu_disk_parse function Ian Jackson @ 2011-06-02 17:55 ` Ian Jackson 2011-06-02 17:55 ` [PATCH 4/9] docs: update xl-disk-configuration.txt to describe new syntax Ian Jackson 2011-06-03 10:19 ` [PATCH 3/9] libxl: disks: commit libxlu_disk_l.[ch] flex output Ian Campbell 2011-06-03 10:08 ` [PATCH 2/9] libxl: disks: new xlu_disk_parse function Ian Campbell 2011-06-03 10:18 ` Ian Campbell 2 siblings, 2 replies; 49+ messages in thread From: Ian Jackson @ 2011-06-02 17:55 UTC (permalink / raw) To: xen-devel; +Cc: Ian Jackson, Ian Jackson Commit the flex output into revision control, for the benefit of those without flex or with only very old flex. This change is split into a separate patch for ease of review. Generated with flex 2.5.35-6 on Debian lenny i386, by running "make" in the libxl directory. No manual changes in this commit. Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com> --- tools/libxl/libxlu_disk_l.c | 2471 +++++++++++++++++++++++++++++++++++++++++++ tools/libxl/libxlu_disk_l.h | 347 ++++++ 2 files changed, 2818 insertions(+), 0 deletions(-) create mode 100644 tools/libxl/libxlu_disk_l.c create mode 100644 tools/libxl/libxlu_disk_l.h diff --git a/tools/libxl/libxlu_disk_l.c b/tools/libxl/libxlu_disk_l.c new file mode 100644 index 0000000..e653d8d --- /dev/null +++ b/tools/libxl/libxlu_disk_l.c @@ -0,0 +1,2471 @@ +#line 2 "libxlu_disk_l.c" + +#line 4 "libxlu_disk_l.c" + +#define YY_INT_ALIGNED short int + +/* A lexical scanner generated by flex */ + +#define FLEX_SCANNER +#define YY_FLEX_MAJOR_VERSION 2 +#define YY_FLEX_MINOR_VERSION 5 +#define YY_FLEX_SUBMINOR_VERSION 35 +#if YY_FLEX_SUBMINOR_VERSION > 0 +#define FLEX_BETA +#endif + +/* First, we deal with platform-specific or compiler-specific issues. */ + +/* begin standard C headers. */ +#include <stdio.h> +#include <string.h> +#include <errno.h> +#include <stdlib.h> + +/* end standard C headers. */ + +/* flex integer type definitions */ + +#ifndef FLEXINT_H +#define FLEXINT_H + +/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */ + +#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L + +/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, + * if you want the limit (max/min) macros for int types. + */ +#ifndef __STDC_LIMIT_MACROS +#define __STDC_LIMIT_MACROS 1 +#endif + +#include <inttypes.h> +typedef int8_t flex_int8_t; +typedef uint8_t flex_uint8_t; +typedef int16_t flex_int16_t; +typedef uint16_t flex_uint16_t; +typedef int32_t flex_int32_t; +typedef uint32_t flex_uint32_t; +#else +typedef signed char flex_int8_t; +typedef short int flex_int16_t; +typedef int flex_int32_t; +typedef unsigned char flex_uint8_t; +typedef unsigned short int flex_uint16_t; +typedef unsigned int flex_uint32_t; + +/* Limits of integral types. */ +#ifndef INT8_MIN +#define INT8_MIN (-128) +#endif +#ifndef INT16_MIN +#define INT16_MIN (-32767-1) +#endif +#ifndef INT32_MIN +#define INT32_MIN (-2147483647-1) +#endif +#ifndef INT8_MAX +#define INT8_MAX (127) +#endif +#ifndef INT16_MAX +#define INT16_MAX (32767) +#endif +#ifndef INT32_MAX +#define INT32_MAX (2147483647) +#endif +#ifndef UINT8_MAX +#define UINT8_MAX (255U) +#endif +#ifndef UINT16_MAX +#define UINT16_MAX (65535U) +#endif +#ifndef UINT32_MAX +#define UINT32_MAX (4294967295U) +#endif + +#endif /* ! C99 */ + +#endif /* ! FLEXINT_H */ + +#ifdef __cplusplus + +/* The "const" storage-class-modifier is valid. */ +#define YY_USE_CONST + +#else /* ! __cplusplus */ + +/* C99 requires __STDC__ to be defined as 1. */ +#if defined (__STDC__) + +#define YY_USE_CONST + +#endif /* defined (__STDC__) */ +#endif /* ! __cplusplus */ + +#ifdef YY_USE_CONST +#define yyconst const +#else +#define yyconst +#endif + +/* Returned upon end-of-file. */ +#define YY_NULL 0 + +/* Promotes a possibly negative, possibly signed char to an unsigned + * integer for use as an array index. If the signed char is negative, + * we want to instead treat it as an 8-bit unsigned char, hence the + * double cast. + */ +#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c) + +/* An opaque pointer. */ +#ifndef YY_TYPEDEF_YY_SCANNER_T +#define YY_TYPEDEF_YY_SCANNER_T +typedef void* yyscan_t; +#endif + +/* For convenience, these vars (plus the bison vars far below) + are macros in the reentrant scanner. */ +#define yyin yyg->yyin_r +#define yyout yyg->yyout_r +#define yyextra yyg->yyextra_r +#define yyleng yyg->yyleng_r +#define yytext yyg->yytext_r +#define yylineno (YY_CURRENT_BUFFER_LVALUE->yy_bs_lineno) +#define yycolumn (YY_CURRENT_BUFFER_LVALUE->yy_bs_column) +#define yy_flex_debug yyg->yy_flex_debug_r + +/* Enter a start condition. This macro really ought to take a parameter, + * but we do it the disgusting crufty way forced on us by the ()-less + * definition of BEGIN. + */ +#define BEGIN yyg->yy_start = 1 + 2 * + +/* Translate the current start state into a value that can be later handed + * to BEGIN to return to the state. The YYSTATE alias is for lex + * compatibility. + */ +#define YY_START ((yyg->yy_start - 1) / 2) +#define YYSTATE YY_START + +/* Action number for EOF rule of a given start state. */ +#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) + +/* Special action meaning "start processing a new file". */ +#define YY_NEW_FILE xlu__disk_yyrestart(yyin ,yyscanner ) + +#define YY_END_OF_BUFFER_CHAR 0 + +/* Size of default input buffer. */ +#ifndef YY_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k. + * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. + * Ditto for the __ia64__ case accordingly. + */ +#define YY_BUF_SIZE 32768 +#else +#define YY_BUF_SIZE 16384 +#endif /* __ia64__ */ +#endif + +/* The state buf must be large enough to hold one state per character in the main buffer. + */ +#define YY_STATE_BUF_SIZE ((YY_BUF_SIZE + 2) * sizeof(yy_state_type)) + +#ifndef YY_TYPEDEF_YY_BUFFER_STATE +#define YY_TYPEDEF_YY_BUFFER_STATE +typedef struct yy_buffer_state *YY_BUFFER_STATE; +#endif + +#define EOB_ACT_CONTINUE_SCAN 0 +#define EOB_ACT_END_OF_FILE 1 +#define EOB_ACT_LAST_MATCH 2 + + #define YY_LESS_LINENO(n) + +/* Return all but the first "n" matched characters back to the input stream. */ +#define yyless(n) \ + do \ + { \ + /* Undo effects of setting up yytext. */ \ + int yyless_macro_arg = (n); \ + YY_LESS_LINENO(yyless_macro_arg);\ + *yy_cp = yyg->yy_hold_char; \ + YY_RESTORE_YY_MORE_OFFSET \ + yyg->yy_c_buf_p = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \ + YY_DO_BEFORE_ACTION; /* set up yytext again */ \ + } \ + while ( 0 ) + +#define unput(c) yyunput( c, yyg->yytext_ptr , yyscanner ) + +#ifndef YY_TYPEDEF_YY_SIZE_T +#define YY_TYPEDEF_YY_SIZE_T +typedef size_t yy_size_t; +#endif + +#ifndef YY_STRUCT_YY_BUFFER_STATE +#define YY_STRUCT_YY_BUFFER_STATE +struct yy_buffer_state + { + FILE *yy_input_file; + + char *yy_ch_buf; /* input buffer */ + char *yy_buf_pos; /* current position in input buffer */ + + /* Size of input buffer in bytes, not including room for EOB + * characters. + */ + yy_size_t yy_buf_size; + + /* Number of characters read into yy_ch_buf, not including EOB + * characters. + */ + int yy_n_chars; + + /* Whether we "own" the buffer - i.e., we know we created it, + * and can realloc() it to grow it, and should free() it to + * delete it. + */ + int yy_is_our_buffer; + + /* Whether this is an "interactive" input source; if so, and + * if we're using stdio for input, then we want to use getc() + * instead of fread(), to make sure we stop fetching input after + * each newline. + */ + int yy_is_interactive; + + /* Whether we're considered to be at the beginning of a line. + * If so, '^' rules will be active on the next match, otherwise + * not. + */ + int yy_at_bol; + + int yy_bs_lineno; /**< The line count. */ + int yy_bs_column; /**< The column count. */ + + /* Whether to try to fill the input buffer when we reach the + * end of it. + */ + int yy_fill_buffer; + + int yy_buffer_status; + +#define YY_BUFFER_NEW 0 +#define YY_BUFFER_NORMAL 1 + /* When an EOF's been seen but there's still some text to process + * then we mark the buffer as YY_EOF_PENDING, to indicate that we + * shouldn't try reading from the input source any more. We might + * still have a bunch of tokens to match, though, because of + * possible backing-up. + * + * When we actually see the EOF, we change the status to "new" + * (via xlu__disk_yyrestart()), so that the user can continue scanning by + * just pointing yyin at a new input file. + */ +#define YY_BUFFER_EOF_PENDING 2 + + }; +#endif /* !YY_STRUCT_YY_BUFFER_STATE */ + +/* We provide macros for accessing buffer states in case in the + * future we want to put the buffer states in a more general + * "scanner state". + * + * Returns the top of the stack, or NULL. + */ +#define YY_CURRENT_BUFFER ( yyg->yy_buffer_stack \ + ? yyg->yy_buffer_stack[yyg->yy_buffer_stack_top] \ + : NULL) + +/* Same as previous macro, but useful when we know that the buffer stack is not + * NULL or when we need an lvalue. For internal use only. + */ +#define YY_CURRENT_BUFFER_LVALUE yyg->yy_buffer_stack[yyg->yy_buffer_stack_top] + +void xlu__disk_yyrestart (FILE *input_file ,yyscan_t yyscanner ); +void xlu__disk_yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); +YY_BUFFER_STATE xlu__disk_yy_create_buffer (FILE *file,int size ,yyscan_t yyscanner ); +void xlu__disk_yy_delete_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); +void xlu__disk_yy_flush_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); +void xlu__disk_yypush_buffer_state (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); +void xlu__disk_yypop_buffer_state (yyscan_t yyscanner ); + +static void xlu__disk_yyensure_buffer_stack (yyscan_t yyscanner ); +static void xlu__disk_yy_load_buffer_state (yyscan_t yyscanner ); +static void xlu__disk_yy_init_buffer (YY_BUFFER_STATE b,FILE *file ,yyscan_t yyscanner ); + +#define YY_FLUSH_BUFFER xlu__disk_yy_flush_buffer(YY_CURRENT_BUFFER ,yyscanner) + +YY_BUFFER_STATE xlu__disk_yy_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner ); +YY_BUFFER_STATE xlu__disk_yy_scan_string (yyconst char *yy_str ,yyscan_t yyscanner ); +YY_BUFFER_STATE xlu__disk_yy_scan_bytes (yyconst char *bytes,int len ,yyscan_t yyscanner ); + +void *xlu__disk_yyalloc (yy_size_t ,yyscan_t yyscanner ); +void *xlu__disk_yyrealloc (void *,yy_size_t ,yyscan_t yyscanner ); +void xlu__disk_yyfree (void * ,yyscan_t yyscanner ); + +#define yy_new_buffer xlu__disk_yy_create_buffer + +#define yy_set_interactive(is_interactive) \ + { \ + if ( ! YY_CURRENT_BUFFER ){ \ + xlu__disk_yyensure_buffer_stack (yyscanner); \ + YY_CURRENT_BUFFER_LVALUE = \ + xlu__disk_yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); \ + } \ + YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ + } + +#define yy_set_bol(at_bol) \ + { \ + if ( ! YY_CURRENT_BUFFER ){\ + xlu__disk_yyensure_buffer_stack (yyscanner); \ + YY_CURRENT_BUFFER_LVALUE = \ + xlu__disk_yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); \ + } \ + YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ + } + +#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol) + +#define xlu__disk_yywrap(n) 1 +#define YY_SKIP_YYWRAP + +typedef unsigned char YY_CHAR; + +typedef int yy_state_type; + +#define yytext_ptr yytext_r + +static yy_state_type yy_get_previous_state (yyscan_t yyscanner ); +static yy_state_type yy_try_NUL_trans (yy_state_type current_state ,yyscan_t yyscanner); +static int yy_get_next_buffer (yyscan_t yyscanner ); +static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner ); + +/* Done after the current pattern has been matched and before the + * corresponding action - sets up yytext. + */ +#define YY_DO_BEFORE_ACTION \ + yyg->yytext_ptr = yy_bp; \ + yyg->yytext_ptr -= yyg->yy_more_len; \ + yyleng = (size_t) (yy_cp - yyg->yytext_ptr); \ + yyg->yy_hold_char = *yy_cp; \ + *yy_cp = '\0'; \ + yyg->yy_c_buf_p = yy_cp; + +#define YY_NUM_RULES 24 +#define YY_END_OF_BUFFER 25 +/* This struct is not used in this scanner, + but its presence is necessary. */ +struct yy_trans_info + { + flex_int32_t yy_verify; + flex_int32_t yy_nxt; + }; +static yyconst flex_int16_t yy_acclist[436] = + { 0, + 23, 23, 25, 21, 22, 24, 8193, 21, 22, 24, + 16385, 8193, 21, 24,16385, 21, 22, 24, 22, 24, + 21, 22, 24, 21, 22, 24, 21, 22, 24, 21, + 22, 24, 21, 22, 24, 21, 22, 24, 21, 22, + 24, 21, 22, 24, 21, 22, 24, 21, 22, 24, + 21, 22, 24, 21, 22, 24, 21, 22, 24, 21, + 22, 24, 23, 24, 24, 21, 21, 8193, 21, 8193, + 21,16385, 8193, 21, 8193, 21, 21, 8212, 21,16404, + 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, + 21, 21, 21, 21, 21, 21, 21, 23, 8193, 21, + + 8193, 21, 8193, 8212, 21, 8212, 21, 8212, 11, 21, + 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, + 21, 21, 21, 21, 21, 8212, 21, 8212, 21, 8212, + 11, 21, 16, 8212, 21,16404, 21, 21, 21, 21, + 21, 21, 8212, 21,16404, 19, 8212, 21,16404, 21, + 8204, 8212, 21,16396,16404, 21, 21, 8207, 8212, 21, + 16399,16404, 21, 21, 21, 21, 16, 8212, 21, 16, + 8212, 21, 16, 21, 16, 8212, 3, 21, 21, 18, + 8212, 21,16404, 21, 21, 21, 21, 19, 8212, 21, + 19, 8212, 21, 19, 21, 19, 8212, 8204, 8212, 21, + + 8204, 8212, 21, 8204, 21, 8204, 8212, 21, 8207, 8212, + 21, 8207, 8212, 21, 8207, 21, 8207, 8212, 21, 21, + 8, 21, 16, 8212, 21, 16, 8212, 21, 16, 8212, + 16, 21, 16, 3, 21, 21, 18, 8212, 21, 18, + 8212, 21, 18, 21, 18, 8212, 21, 17, 8212, 21, + 16404, 8205, 8212, 21,16397,16404, 21, 19, 8212, 21, + 19, 8212, 21, 19, 8212, 19, 21, 19, 8204, 8212, + 21, 8204, 8212, 21, 8204, 8212, 8204, 21, 8204, 21, + 8207, 8212, 21, 8207, 8212, 21, 8207, 8212, 8207, 21, + 8207, 21, 21, 8, 11, 8, 7, 21, 18, 8212, + + 21, 18, 8212, 21, 18, 8212, 18, 21, 18, 2, + 17, 8212, 21, 17, 8212, 21, 17, 21, 17, 8212, + 8205, 8212, 21, 8205, 8212, 21, 8205, 21, 8205, 8212, + 21, 9, 21, 10, 8, 8, 11, 7, 11, 7, + 6, 2, 11, 2, 17, 8212, 21, 17, 8212, 21, + 17, 8212, 17, 21, 17, 8205, 8212, 21, 8205, 8212, + 21, 8205, 8212, 8205, 21, 8205, 21, 9, 11, 9, + 14, 8212, 21,16404, 10, 11, 10, 7, 7, 11, + 6, 11, 6, 6, 11, 6, 11, 2, 2, 11, + 8205, 21,16397, 9, 9, 11, 14, 8212, 21, 14, + + 8212, 21, 14, 21, 14, 8212, 10, 11, 6, 6, + 11, 6, 6, 14, 8212, 21, 14, 8212, 21, 14, + 8212, 14, 21, 14, 6, 6, 6, 5, 6, 4, + 6, 5, 6, 4, 6 + } ; + +static yyconst flex_int16_t yy_accept[241] = + { 0, + 1, 1, 1, 2, 3, 4, 7, 12, 16, 19, + 21, 24, 27, 30, 33, 36, 39, 42, 45, 48, + 51, 54, 57, 60, 63, 65, 66, 67, 68, 70, + 73, 75, 76, 77, 78, 81, 81, 82, 83, 84, + 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, + 95, 96, 97, 98, 99, 101, 103, 104, 106, 108, + 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, + 119, 120, 121, 122, 123, 124, 125, 126, 128, 130, + 131, 132, 133, 137, 138, 139, 140, 141, 142, 143, + 146, 150, 151, 156, 157, 158, 163, 164, 165, 166, + + 167, 170, 173, 175, 177, 179, 180, 184, 185, 186, + 187, 188, 191, 194, 196, 198, 201, 204, 206, 208, + 209, 212, 215, 217, 219, 220, 221, 222, 223, 226, + 229, 231, 233, 234, 236, 237, 240, 243, 245, 247, + 248, 252, 257, 258, 261, 264, 266, 268, 269, 272, + 275, 277, 279, 280, 281, 284, 287, 289, 291, 292, + 293, 294, 296, 297, 298, 299, 302, 305, 307, 309, + 310, 311, 314, 317, 319, 321, 324, 327, 329, 331, + 332, 333, 334, 335, 336, 338, 340, 341, 342, 344, + 345, 348, 351, 353, 355, 356, 359, 362, 364, 366, + + 367, 368, 370, 371, 375, 377, 378, 379, 381, 383, + 384, 386, 388, 389, 391, 394, 395, 397, 400, 403, + 405, 407, 409, 410, 412, 413, 414, 417, 420, 422, + 424, 425, 426, 427, 428, 430, 432, 434, 436, 436 + } ; + +static yyconst flex_int32_t yy_ec[256] = + { 0, + 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 4, 5, 1, 1, 6, 6, 7, + 6, 6, 6, 6, 6, 6, 6, 8, 1, 1, + 9, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 10, 11, 12, 13, + + 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, + 24, 25, 26, 27, 28, 29, 30, 31, 32, 19, + 33, 19, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1 + } ; + +static yyconst flex_int32_t yy_meta[34] = + { 0, + 1, 1, 2, 3, 1, 1, 1, 1, 4, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1 + } ; + +static yyconst flex_int16_t yy_base[295] = + { 0, + 0, 0, 545, 544, 546, 541, 32, 35, 549, 549, + 44, 62, 531, 529, 519, 33, 26, 530, 523, 527, + 528, 525, 526, 42, 0, 549, 531, 549, 65, 73, + 0, 0, 82, 0, 91, 0, 522, 509, 505, 500, + 519, 508, 501, 513, 514, 512, 491, 499, 490, 494, + 15, 506, 506, 0, 69, 0, 0, 94, 0, 0, + 514, 503, 508, 491, 485, 499, 490, 489, 482, 501, + 500, 475, 498, 487, 94, 488, 472, 101, 0, 0, + 549, 474, 110, 477, 462, 475, 461, 437, 425, 422, + 119, 53, 128, 398, 403, 137, 389, 389, 382, 355, + + 140, 0, 144, 0, 371, 342, 153, 330, 339, 315, + 54, 156, 0, 160, 0, 163, 0, 167, 0, 287, + 170, 0, 174, 0, 279, 270, 277, 271, 177, 0, + 0, 0, 0, 549, 265, 181, 0, 184, 0, 269, + 193, 202, 76, 205, 0, 0, 0, 0, 209, 0, + 0, 0, 0, 268, 212, 0, 0, 0, 0, 256, + 266, 270, 549, 269, 263, 216, 0, 0, 0, 0, + 267, 219, 0, 223, 0, 226, 0, 230, 0, 75, + 265, 260, 105, 241, 549, 234, 549, 113, 227, 549, + 233, 0, 0, 0, 0, 237, 0, 0, 0, 0, + + 239, 220, 549, 247, 196, 0, 148, 549, 147, 549, + 178, 171, 131, 549, 250, 112, 549, 254, 0, 257, + 0, 0, 102, 549, 240, 164, 261, 0, 0, 0, + 0, 258, 130, 195, 85, 39, 549, 549, 549, 282, + 286, 289, 293, 297, 301, 305, 309, 313, 317, 321, + 325, 329, 333, 337, 341, 345, 349, 353, 357, 361, + 365, 369, 373, 377, 381, 385, 389, 393, 397, 401, + 405, 409, 413, 417, 421, 425, 429, 433, 437, 441, + 445, 449, 453, 457, 461, 465, 469, 473, 477, 481, + 485, 489, 493, 497 + + } ; + +static yyconst flex_int16_t yy_def[295] = + { 0, + 239, 1, 240, 240, 239, 241, 242, 242, 239, 239, + 243, 243, 12, 12, 12, 12, 12, 12, 12, 12, + 12, 12, 12, 12, 244, 239, 241, 239, 245, 242, + 246, 246, 247, 12, 241, 248, 12, 12, 12, 12, + 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, + 12, 12, 12, 244, 245, 246, 246, 249, 250, 250, + 239, 12, 12, 12, 12, 12, 12, 12, 12, 12, + 12, 12, 12, 12, 12, 12, 12, 249, 250, 250, + 239, 12, 251, 12, 12, 12, 12, 12, 12, 35, + 252, 12, 253, 12, 12, 254, 12, 12, 12, 12, + + 255, 256, 251, 256, 12, 12, 257, 12, 12, 12, + 241, 258, 259, 252, 259, 260, 261, 253, 261, 12, + 262, 263, 254, 263, 12, 12, 264, 12, 255, 256, + 256, 265, 265, 239, 12, 266, 267, 257, 267, 12, + 268, 269, 241, 258, 259, 259, 270, 270, 260, 261, + 261, 271, 271, 12, 262, 263, 263, 272, 272, 12, + 12, 273, 239, 274, 12, 266, 267, 267, 275, 275, + 276, 277, 278, 268, 278, 279, 280, 269, 280, 241, + 281, 12, 282, 273, 239, 283, 239, 284, 285, 239, + 277, 278, 278, 286, 286, 279, 280, 280, 287, 287, + + 241, 288, 239, 289, 290, 290, 283, 239, 291, 239, + 291, 291, 285, 239, 269, 288, 239, 292, 293, 289, + 293, 290, 291, 239, 291, 291, 292, 293, 293, 294, + 294, 291, 291, 291, 291, 291, 239, 239, 0, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239 + + } ; + +static yyconst flex_int16_t yy_nxt[583] = + { 0, + 6, 7, 8, 9, 6, 6, 6, 6, 10, 11, + 12, 13, 14, 15, 16, 12, 12, 17, 12, 12, + 12, 12, 18, 12, 19, 20, 21, 22, 23, 12, + 24, 12, 12, 30, 30, 31, 30, 30, 31, 75, + 32, 76, 238, 32, 27, 27, 27, 28, 33, 44, + 42, 35, 36, 45, 52, 37, 43, 28, 53, 73, + 93, 38, 27, 27, 27, 28, 33, 27, 56, 35, + 36, 27, 56, 57, 30, 30, 31, 57, 28, 28, + 143, 32, 27, 27, 27, 28, 180, 201, 237, 27, + 36, 58, 58, 58, 59, 58, 27, 79, 58, 60, + + 95, 96, 80, 27, 79, 210, 97, 61, 206, 80, + 101, 101, 58, 102, 101, 203, 210, 101, 104, 112, + 112, 58, 113, 112, 211, 212, 112, 115, 116, 116, + 58, 117, 116, 210, 190, 116, 119, 121, 121, 58, + 122, 121, 27, 130, 121, 124, 27, 132, 131, 235, + 224, 187, 133, 136, 136, 58, 137, 136, 27, 145, + 136, 139, 27, 147, 146, 27, 150, 210, 148, 27, + 152, 151, 27, 156, 224, 153, 27, 158, 157, 27, + 130, 224, 159, 27, 167, 131, 27, 169, 226, 168, + 225, 233, 170, 172, 172, 58, 173, 172, 210, 222, + + 172, 175, 176, 176, 58, 177, 176, 27, 145, 176, + 179, 27, 150, 146, 27, 156, 236, 151, 27, 167, + 157, 27, 192, 217, 168, 27, 194, 193, 27, 197, + 214, 195, 27, 199, 198, 27, 192, 208, 200, 27, + 197, 193, 28, 210, 163, 198, 215, 218, 218, 58, + 219, 218, 27, 199, 218, 221, 27, 228, 200, 27, + 230, 210, 229, 27, 228, 231, 232, 204, 203, 229, + 190, 188, 187, 185, 183, 182, 181, 171, 165, 164, + 163, 234, 25, 25, 25, 25, 27, 27, 27, 29, + 29, 29, 29, 34, 34, 34, 34, 54, 161, 54, + + 54, 55, 55, 55, 55, 57, 160, 57, 57, 33, + 33, 33, 33, 61, 61, 154, 61, 78, 78, 78, + 78, 80, 142, 80, 80, 103, 103, 103, 103, 114, + 114, 114, 114, 118, 118, 118, 118, 123, 123, 123, + 123, 129, 129, 129, 129, 131, 141, 131, 131, 138, + 138, 138, 138, 144, 144, 144, 144, 146, 140, 146, + 146, 149, 149, 149, 149, 151, 135, 151, 151, 155, + 155, 155, 155, 157, 134, 157, 157, 162, 162, 162, + 162, 133, 128, 133, 133, 166, 166, 166, 166, 168, + 127, 168, 168, 174, 174, 174, 174, 178, 178, 178, + + 178, 148, 126, 148, 148, 153, 125, 153, 153, 159, + 96, 159, 159, 184, 184, 184, 184, 186, 186, 186, + 186, 170, 120, 170, 170, 189, 189, 189, 189, 191, + 191, 191, 191, 193, 111, 193, 193, 196, 196, 196, + 196, 198, 110, 198, 198, 202, 202, 202, 202, 205, + 205, 205, 205, 207, 207, 207, 207, 209, 209, 209, + 209, 213, 213, 213, 213, 195, 109, 195, 195, 200, + 108, 200, 200, 216, 216, 216, 216, 220, 220, 220, + 220, 206, 107, 206, 206, 223, 223, 223, 223, 227, + 227, 227, 227, 229, 106, 229, 229, 231, 105, 231, + + 231, 100, 99, 98, 94, 93, 92, 91, 90, 89, + 88, 87, 86, 85, 84, 83, 82, 81, 73, 77, + 74, 73, 72, 71, 70, 69, 68, 67, 66, 46, + 65, 64, 63, 62, 28, 51, 50, 49, 48, 47, + 46, 41, 40, 39, 28, 239, 26, 26, 5, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239 + } ; + +static yyconst flex_int16_t yy_chk[583] = + { 0, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 7, 7, 7, 8, 8, 8, 51, + 7, 51, 236, 8, 11, 11, 11, 11, 11, 17, + 16, 11, 11, 17, 24, 11, 16, 111, 24, 92, + 92, 11, 12, 12, 12, 12, 12, 29, 29, 12, + 12, 55, 55, 29, 30, 30, 30, 55, 180, 143, + 111, 30, 33, 33, 33, 33, 143, 180, 235, 33, + 33, 35, 35, 35, 35, 35, 58, 58, 35, 35, + + 75, 75, 58, 78, 78, 223, 75, 183, 183, 78, + 83, 83, 83, 83, 83, 216, 188, 83, 83, 91, + 91, 91, 91, 91, 188, 188, 91, 91, 93, 93, + 93, 93, 93, 233, 213, 93, 93, 96, 96, 96, + 96, 96, 101, 101, 96, 96, 103, 103, 101, 233, + 209, 207, 103, 107, 107, 107, 107, 107, 112, 112, + 107, 107, 114, 114, 112, 116, 116, 226, 114, 118, + 118, 116, 121, 121, 212, 118, 123, 123, 121, 129, + 129, 211, 123, 136, 136, 129, 138, 138, 212, 136, + 211, 226, 138, 141, 141, 141, 141, 141, 234, 205, + + 141, 141, 142, 142, 142, 142, 142, 144, 144, 142, + 142, 149, 149, 144, 155, 155, 234, 149, 166, 166, + 155, 172, 172, 202, 166, 174, 174, 172, 176, 176, + 189, 174, 178, 178, 176, 191, 191, 186, 178, 196, + 196, 191, 201, 225, 184, 196, 201, 204, 204, 204, + 204, 204, 215, 215, 204, 204, 218, 218, 215, 220, + 220, 232, 218, 227, 227, 220, 225, 182, 181, 227, + 171, 165, 164, 162, 161, 160, 154, 140, 135, 128, + 127, 232, 240, 240, 240, 240, 241, 241, 241, 242, + 242, 242, 242, 243, 243, 243, 243, 244, 126, 244, + + 244, 245, 245, 245, 245, 246, 125, 246, 246, 247, + 247, 247, 247, 248, 248, 120, 248, 249, 249, 249, + 249, 250, 110, 250, 250, 251, 251, 251, 251, 252, + 252, 252, 252, 253, 253, 253, 253, 254, 254, 254, + 254, 255, 255, 255, 255, 256, 109, 256, 256, 257, + 257, 257, 257, 258, 258, 258, 258, 259, 108, 259, + 259, 260, 260, 260, 260, 261, 106, 261, 261, 262, + 262, 262, 262, 263, 105, 263, 263, 264, 264, 264, + 264, 265, 100, 265, 265, 266, 266, 266, 266, 267, + 99, 267, 267, 268, 268, 268, 268, 269, 269, 269, + + 269, 270, 98, 270, 270, 271, 97, 271, 271, 272, + 95, 272, 272, 273, 273, 273, 273, 274, 274, 274, + 274, 275, 94, 275, 275, 276, 276, 276, 276, 277, + 277, 277, 277, 278, 90, 278, 278, 279, 279, 279, + 279, 280, 89, 280, 280, 281, 281, 281, 281, 282, + 282, 282, 282, 283, 283, 283, 283, 284, 284, 284, + 284, 285, 285, 285, 285, 286, 88, 286, 286, 287, + 87, 287, 287, 288, 288, 288, 288, 289, 289, 289, + 289, 290, 86, 290, 290, 291, 291, 291, 291, 292, + 292, 292, 292, 293, 85, 293, 293, 294, 84, 294, + + 294, 82, 77, 76, 74, 73, 72, 71, 70, 69, + 68, 67, 66, 65, 64, 63, 62, 61, 53, 52, + 50, 49, 48, 47, 46, 45, 44, 43, 42, 41, + 40, 39, 38, 37, 27, 23, 22, 21, 20, 19, + 18, 15, 14, 13, 6, 5, 4, 3, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239 + } ; + +#define YY_TRAILING_MASK 0x2000 +#define YY_TRAILING_HEAD_MASK 0x4000 +#define REJECT \ +{ \ +*yy_cp = yyg->yy_hold_char; /* undo effects of setting up yytext */ \ +yy_cp = yyg->yy_full_match; /* restore poss. backed-over text */ \ +yyg->yy_lp = yyg->yy_full_lp; /* restore orig. accepting pos. */ \ +yyg->yy_state_ptr = yyg->yy_full_state; /* restore orig. state */ \ +yy_current_state = *yyg->yy_state_ptr; /* restore curr. state */ \ +++yyg->yy_lp; \ +goto find_rule; \ +} + +#define yymore() (yyg->yy_more_flag = 1) +#define YY_MORE_ADJ yyg->yy_more_len +#define YY_RESTORE_YY_MORE_OFFSET +#line 1 "libxlu_disk_l.l" +/* -*- fundamental -*- */ +/* + * libxlu_disk_l.l - parser for disk specification strings + * + * Copyright (C) 2011 Citrix Ltd. + * Author Ian Jackson <ian.jackson@eu.citrix.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; version 2.1 only. with the special + * exception on linking described in file LICENSE. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + */ +/* + * Parsing the old xm/xend/xl-4.1 disk specs is a tricky problem, + * because the target string might in theory contain "," which is the + * delimiter we use for stripping off things on the RHS, and ":", + * which is the delimiter we use for stripping off things on the LHS. + * + * In this parser we do not support such target strings in the old + * syntax; if the target string has to contain "," or ":" the new + * syntax's "target=" should be used. + */ +#line 31 "libxlu_disk_l.l" +#include "libxlu_disk_i.h" + +#define YY_NO_INPUT + +/* Some versions of flex have a bug (Fedora bugzilla 612465) which causes + * it to fail to declare these functions, which it defines. So declare + * them ourselves. Hopefully we won't have to simultaneously support + * a flex version which declares these differently somehow. */ +int xlu__disk_yyget_column(yyscan_t yyscanner); +void xlu__disk_yyset_column(int column_no, yyscan_t yyscanner); + + +/*----- useful macros and functions used in actions ----- + * we use macros in the actual rules to keep the actions short + * and particularly to avoid repeating boilerplate values such as + * DPC->disk, yytext, etc. */ + +#define DPC ((DiskParseContext*)yyextra) + +/* Sets an enum, checking it hasn't already been set to a different value */ +#define DSET(dpc,member,enumname,str,valname) do{ \ + if (dpc->disk->member != LIBXL_DISK_##enumname##_UNKNOWN && \ + dpc->disk->member != LIBXL_DISK_##enumname##_##valname) { \ + xlu__disk_err(dpc, str, TOSTRING(member) " respecified"); \ + } else { \ + dpc->disk->member = LIBXL_DISK_##enumname##_##valname; \ + } \ + }while(0) + +/* For actions whose patterns contain '=', finds the start of the value */ +#define FROMEQUALS (strchr(yytext,'=')+1) + +/* Chops the delimiter off, modifying yytext and yyleng. */ +#define STRIP(delim) do{ \ + if (yyleng>0 && yytext[yyleng-1]==(delim)) \ + yytext[--yyleng] = 0; \ + }while(0) + +/* Sets a string value, checking it hasn't been set already. */ +#define SAVESTRING(what,loc,val) do{ \ + savestring(DPC, what " respecified", &DPC->disk->loc, (val)); \ + }while(0) +static void savestring(DiskParseContext *dpc, const char *what_respecified, + char **update, const char *value) { + if (*update) { + if (**update) { xlu__disk_err(dpc,value,what_respecified); return; } + free(*update); /* do not complain about overwriting empty strings */ + } + *update = strdup(value); +} + +/* Sets ->readwrite from the string. This ought to be an enum, perhaps. */ +static void setaccess(DiskParseContext *dpc, const char *str) { + if (!strcmp(str, "r") || !strcmp(str, "ro")) { + dpc->disk->readwrite = 0; + } else if (!strcmp(str, "rw") || !strcmp(str, "w") || !strcmp(str,"")) { + dpc->disk->readwrite = 1; + } else { + xlu__disk_err(dpc,str,"unknown value for access"); + } +} + +/* Sets ->format from the string. IDL should provide something for this. */ +static void setformat(DiskParseContext *dpc, const char *str) { + if (!strcmp(str,"") || + !strcmp(str,"raw")) DSET(dpc,format,FORMAT,str,RAW); + else if (!strcmp(str,"qcow")) DSET(dpc,format,FORMAT,str,QCOW); + else if (!strcmp(str,"qcow2")) DSET(dpc,format,FORMAT,str,QCOW2); + else if (!strcmp(str,"vhd")) DSET(dpc,format,FORMAT,str,VHD); + else xlu__disk_err(dpc,str,"unknown value for format"); +} + +#define DEPRECATE(usewhatinstead) /* not currently reported */ + + +#line 822 "libxlu_disk_l.c" + +#define INITIAL 0 +#define LEXERR 1 + +#ifndef YY_NO_UNISTD_H +/* Special case for "unistd.h", since it is non-ANSI. We include it way + * down here because we want the user's section 1 to have been scanned first. + * The user has a chance to override it with an option. + */ +#include <unistd.h> +#endif + +#ifndef YY_EXTRA_TYPE +#define YY_EXTRA_TYPE void * +#endif + +/* Holds the entire state of the reentrant scanner. */ +struct yyguts_t + { + + /* User-defined. Not touched by flex. */ + YY_EXTRA_TYPE yyextra_r; + + /* The rest are the same as the globals declared in the non-reentrant scanner. */ + FILE *yyin_r, *yyout_r; + size_t yy_buffer_stack_top; /**< index of top of stack. */ + size_t yy_buffer_stack_max; /**< capacity of stack. */ + YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */ + char yy_hold_char; + int yy_n_chars; + int yyleng_r; + char *yy_c_buf_p; + int yy_init; + int yy_start; + int yy_did_buffer_switch_on_eof; + int yy_start_stack_ptr; + int yy_start_stack_depth; + int *yy_start_stack; + yy_state_type yy_last_accepting_state; + char* yy_last_accepting_cpos; + + int yylineno_r; + int yy_flex_debug_r; + + yy_state_type *yy_state_buf; + yy_state_type *yy_state_ptr; + char *yy_full_match; + int yy_lp; + + /* These are only needed for trailing context rules, + * but there's no conditional variable for that yet. */ + int yy_looking_for_trail_begin; + int yy_full_lp; + int *yy_full_state; + + char *yytext_r; + int yy_more_flag; + int yy_more_len; + + }; /* end struct yyguts_t */ + +static int yy_init_globals (yyscan_t yyscanner ); + +int xlu__disk_yylex_init (yyscan_t* scanner); + +int xlu__disk_yylex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner); + +/* Accessor methods to globals. + These are made visible to non-reentrant scanners for convenience. */ + +int xlu__disk_yylex_destroy (yyscan_t yyscanner ); + +int xlu__disk_yyget_debug (yyscan_t yyscanner ); + +void xlu__disk_yyset_debug (int debug_flag ,yyscan_t yyscanner ); + +YY_EXTRA_TYPE xlu__disk_yyget_extra (yyscan_t yyscanner ); + +void xlu__disk_yyset_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner ); + +FILE *xlu__disk_yyget_in (yyscan_t yyscanner ); + +void xlu__disk_yyset_in (FILE * in_str ,yyscan_t yyscanner ); + +FILE *xlu__disk_yyget_out (yyscan_t yyscanner ); + +void xlu__disk_yyset_out (FILE * out_str ,yyscan_t yyscanner ); + +int xlu__disk_yyget_leng (yyscan_t yyscanner ); + +char *xlu__disk_yyget_text (yyscan_t yyscanner ); + +int xlu__disk_yyget_lineno (yyscan_t yyscanner ); + +void xlu__disk_yyset_lineno (int line_number ,yyscan_t yyscanner ); + +/* Macros after this point can all be overridden by user definitions in + * section 1. + */ + +#ifndef YY_SKIP_YYWRAP +#ifdef __cplusplus +extern "C" int xlu__disk_yywrap (yyscan_t yyscanner ); +#else +extern int xlu__disk_yywrap (yyscan_t yyscanner ); +#endif +#endif + +#ifndef yytext_ptr +static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner); +#endif + +#ifdef YY_NEED_STRLEN +static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner); +#endif + +#ifndef YY_NO_INPUT + +#ifdef __cplusplus +static int yyinput (yyscan_t yyscanner ); +#else +static int input (yyscan_t yyscanner ); +#endif + +#endif + +/* Amount of stuff to slurp up with each read. */ +#ifndef YY_READ_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k */ +#define YY_READ_BUF_SIZE 16384 +#else +#define YY_READ_BUF_SIZE 8192 +#endif /* __ia64__ */ +#endif + +/* Copy whatever the last rule matched to the standard output. */ +#ifndef ECHO +/* This used to be an fputs(), but since the string might contain NUL's, + * we now use fwrite(). + */ +#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0) +#endif + +/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, + * is returned in "result". + */ +#ifndef YY_INPUT +#define YY_INPUT(buf,result,max_size) \ + if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ + { \ + int c = '*'; \ + size_t n; \ + for ( n = 0; n < max_size && \ + (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ + buf[n] = (char) c; \ + if ( c == '\n' ) \ + buf[n++] = (char) c; \ + if ( c == EOF && ferror( yyin ) ) \ + YY_FATAL_ERROR( "input in flex scanner failed" ); \ + result = n; \ + } \ + else \ + { \ + errno=0; \ + while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \ + { \ + if( errno != EINTR) \ + { \ + YY_FATAL_ERROR( "input in flex scanner failed" ); \ + break; \ + } \ + errno=0; \ + clearerr(yyin); \ + } \ + }\ +\ + +#endif + +/* No semi-colon after return; correct usage is to write "yyterminate();" - + * we don't want an extra ';' after the "return" because that will cause + * some compilers to complain about unreachable statements. + */ +#ifndef yyterminate +#define yyterminate() return YY_NULL +#endif + +/* Number of entries by which start-condition stack grows. */ +#ifndef YY_START_STACK_INCR +#define YY_START_STACK_INCR 25 +#endif + +/* Report a fatal error. */ +#ifndef YY_FATAL_ERROR +#define YY_FATAL_ERROR(msg) yy_fatal_error( msg , yyscanner) +#endif + +/* end tables serialization structures and prototypes */ + +/* Default declaration of generated scanner - a define so the user can + * easily add parameters. + */ +#ifndef YY_DECL +#define YY_DECL_IS_OURS 1 + +extern int xlu__disk_yylex (yyscan_t yyscanner); + +#define YY_DECL int xlu__disk_yylex (yyscan_t yyscanner) +#endif /* !YY_DECL */ + +/* Code executed at the beginning of each rule, after yytext and yyleng + * have been set up. + */ +#ifndef YY_USER_ACTION +#define YY_USER_ACTION +#endif + +/* Code executed at the end of each rule. */ +#ifndef YY_BREAK +#define YY_BREAK break; +#endif + +#define YY_RULE_SETUP \ + YY_USER_ACTION + +/** The main scanner function which does all the work. + */ +YY_DECL +{ + register yy_state_type yy_current_state; + register char *yy_cp, *yy_bp; + register int yy_act; + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + +#line 118 "libxlu_disk_l.l" + + + /*----- the scanner rules which do the parsing -----*/ + +#line 1063 "libxlu_disk_l.c" + + if ( !yyg->yy_init ) + { + yyg->yy_init = 1; + +#ifdef YY_USER_INIT + YY_USER_INIT; +#endif + + /* Create the reject buffer large enough to save one state per allowed character. */ + if ( ! yyg->yy_state_buf ) + yyg->yy_state_buf = (yy_state_type *)xlu__disk_yyalloc(YY_STATE_BUF_SIZE ,yyscanner); + if ( ! yyg->yy_state_buf ) + YY_FATAL_ERROR( "out of dynamic memory in xlu__disk_yylex()" ); + + if ( ! yyg->yy_start ) + yyg->yy_start = 1; /* first start state */ + + if ( ! yyin ) + yyin = stdin; + + if ( ! yyout ) + yyout = stdout; + + if ( ! YY_CURRENT_BUFFER ) { + xlu__disk_yyensure_buffer_stack (yyscanner); + YY_CURRENT_BUFFER_LVALUE = + xlu__disk_yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); + } + + xlu__disk_yy_load_buffer_state(yyscanner ); + } + + while ( 1 ) /* loops until end-of-file is reached */ + { + yyg->yy_more_len = 0; + if ( yyg->yy_more_flag ) + { + yyg->yy_more_len = yyg->yy_c_buf_p - yyg->yytext_ptr; + yyg->yy_more_flag = 0; + } + yy_cp = yyg->yy_c_buf_p; + + /* Support of yytext. */ + *yy_cp = yyg->yy_hold_char; + + /* yy_bp points to the position in yy_ch_buf of the start of + * the current run. + */ + yy_bp = yy_cp; + + yy_current_state = yyg->yy_start; + + yyg->yy_state_ptr = yyg->yy_state_buf; + *yyg->yy_state_ptr++ = yy_current_state; + +yy_match: + do + { + register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; + while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) + { + yy_current_state = (int) yy_def[yy_current_state]; + if ( yy_current_state >= 240 ) + yy_c = yy_meta[(unsigned int) yy_c]; + } + yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + *yyg->yy_state_ptr++ = yy_current_state; + ++yy_cp; + } + while ( yy_current_state != 239 ); + +yy_find_action: + yy_current_state = *--yyg->yy_state_ptr; + yyg->yy_lp = yy_accept[yy_current_state]; +find_rule: /* we branch to this label when backing up */ + for ( ; ; ) /* until we find what rule we matched */ + { + if ( yyg->yy_lp && yyg->yy_lp < yy_accept[yy_current_state + 1] ) + { + yy_act = yy_acclist[yyg->yy_lp]; + if ( yy_act & YY_TRAILING_HEAD_MASK || + yyg->yy_looking_for_trail_begin ) + { + if ( yy_act == yyg->yy_looking_for_trail_begin ) + { + yyg->yy_looking_for_trail_begin = 0; + yy_act &= ~YY_TRAILING_HEAD_MASK; + break; + } + } + else if ( yy_act & YY_TRAILING_MASK ) + { + yyg->yy_looking_for_trail_begin = yy_act & ~YY_TRAILING_MASK; + yyg->yy_looking_for_trail_begin |= YY_TRAILING_HEAD_MASK; + } + else + { + yyg->yy_full_match = yy_cp; + yyg->yy_full_state = yyg->yy_state_ptr; + yyg->yy_full_lp = yyg->yy_lp; + break; + } + ++yyg->yy_lp; + goto find_rule; + } + --yy_cp; + yy_current_state = *--yyg->yy_state_ptr; + yyg->yy_lp = yy_accept[yy_current_state]; + } + + YY_DO_BEFORE_ACTION; + +do_action: /* This label is used only to access EOF actions. */ + + switch ( yy_act ) + { /* beginning of action switch */ +case 1: +/* rule 1 can match eol */ +YY_RULE_SETUP +#line 122 "libxlu_disk_l.l" +{ /* ignore whitespace before parameters */ } + YY_BREAK +/* ordinary parameters setting enums or strings */ +case 2: +/* rule 2 can match eol */ +YY_RULE_SETUP +#line 126 "libxlu_disk_l.l" +{ STRIP(','); setformat(DPC, FROMEQUALS); } + YY_BREAK +case 3: +YY_RULE_SETUP +#line 128 "libxlu_disk_l.l" +{ DPC->disk->is_cdrom = 1; } + YY_BREAK +case 4: +YY_RULE_SETUP +#line 129 "libxlu_disk_l.l" +{ DPC->disk->is_cdrom = 1; } + YY_BREAK +case 5: +YY_RULE_SETUP +#line 130 "libxlu_disk_l.l" +{ DPC->disk->is_cdrom = 0; } + YY_BREAK +case 6: +/* rule 6 can match eol */ +YY_RULE_SETUP +#line 131 "libxlu_disk_l.l" +{ xlu__disk_err(DPC,yytext,"unknown value for type"); } + YY_BREAK +case 7: +/* rule 7 can match eol */ +YY_RULE_SETUP +#line 133 "libxlu_disk_l.l" +{ STRIP(','); setaccess(DPC, FROMEQUALS); } + YY_BREAK +case 8: +/* rule 8 can match eol */ +YY_RULE_SETUP +#line 135 "libxlu_disk_l.l" +{ STRIP(','); SAVESTRING("vdev", vdev, FROMEQUALS); } + YY_BREAK +case 9: +/* rule 9 can match eol */ +YY_RULE_SETUP +#line 136 "libxlu_disk_l.l" +{ STRIP(','); SAVESTRING("script", script, FROMEQUALS); } + YY_BREAK +/* the target magic parameter, eats the rest of the string */ +case 10: +YY_RULE_SETUP +#line 140 "libxlu_disk_l.l" +{ STRIP(','); SAVESTRING("target", pdev_path, FROMEQUALS); } + YY_BREAK +/* unknown parameters */ +case 11: +/* rule 11 can match eol */ +YY_RULE_SETUP +#line 144 "libxlu_disk_l.l" +{ xlu__disk_err(DPC,yytext,"unknown parameter"); } + YY_BREAK +/* deprecated prefixes */ +/* the "/.*" in these patterns ensures that they count as if they + * matched the whole string, so these patterns take precedence */ +case 12: +YY_RULE_SETUP +#line 151 "libxlu_disk_l.l" +{ + STRIP(':'); + DPC->had_depr_prefix=1; DEPRECATE("use `[format=]...,'"); + setformat(DPC, yytext); + } + YY_BREAK +case 13: +YY_RULE_SETUP +#line 157 "libxlu_disk_l.l" +{ + STRIP(':'); + DPC->had_depr_prefix=1; DEPRECATE("use `script=...'"); + SAVESTRING("script", script, yytext); + } + YY_BREAK +case 14: +*yy_cp = yyg->yy_hold_char; /* undo effects of setting up yytext */ +yyg->yy_c_buf_p = yy_cp = yy_bp + 8; +YY_DO_BEFORE_ACTION; /* set up yytext again */ +YY_RULE_SETUP +#line 163 "libxlu_disk_l.l" +{ DPC->had_depr_prefix=1; DEPRECATE(0); } + YY_BREAK +case 15: +YY_RULE_SETUP +#line 164 "libxlu_disk_l.l" +{ DPC->had_depr_prefix=1; DEPRECATE(0); } + YY_BREAK +case 16: +*yy_cp = yyg->yy_hold_char; /* undo effects of setting up yytext */ +yyg->yy_c_buf_p = yy_cp = yy_bp + 4; +YY_DO_BEFORE_ACTION; /* set up yytext again */ +YY_RULE_SETUP +#line 165 "libxlu_disk_l.l" +{ DPC->had_depr_prefix=1; DEPRECATE(0); } + YY_BREAK +case 17: +*yy_cp = yyg->yy_hold_char; /* undo effects of setting up yytext */ +yyg->yy_c_buf_p = yy_cp = yy_bp + 6; +YY_DO_BEFORE_ACTION; /* set up yytext again */ +YY_RULE_SETUP +#line 166 "libxlu_disk_l.l" +{ DPC->had_depr_prefix=1; DEPRECATE(0); } + YY_BREAK +case 18: +*yy_cp = yyg->yy_hold_char; /* undo effects of setting up yytext */ +yyg->yy_c_buf_p = yy_cp = yy_bp + 5; +YY_DO_BEFORE_ACTION; /* set up yytext again */ +YY_RULE_SETUP +#line 167 "libxlu_disk_l.l" +{ DPC->had_depr_prefix=1; DEPRECATE(0); } + YY_BREAK +case 19: +*yy_cp = yyg->yy_hold_char; /* undo effects of setting up yytext */ +yyg->yy_c_buf_p = yy_cp = yy_bp + 4; +YY_DO_BEFORE_ACTION; /* set up yytext again */ +YY_RULE_SETUP +#line 168 "libxlu_disk_l.l" +{ DPC->had_depr_prefix=1; DEPRECATE(0); } + YY_BREAK +case 20: +/* rule 20 can match eol */ +YY_RULE_SETUP +#line 170 "libxlu_disk_l.l" +{ + xlu__disk_err(DPC,yytext,"unknown deprecated disk prefix"); + return 0; + } + YY_BREAK +/* positional parameters */ +case 21: +/* rule 21 can match eol */ +YY_RULE_SETUP +#line 177 "libxlu_disk_l.l" +{ + char *colon; + STRIP(','); + + if (DPC->err) { + /* previous errors may just lead to subsequent ones */ + } else if (!DPC->disk->pdev_path) { + SAVESTRING("target", pdev_path, yytext); + } else if (!DPC->had_depr_prefix && + DPC->disk->format == LIBXL_DISK_FORMAT_UNKNOWN) { + setformat(DPC,yytext); + } else if (!DPC->disk->vdev) { + colon = strrchr(yytext, ':'); + if (colon) { + DEPRECATE("use `devtype=...'"); + *colon++ = 0; + if (!strcmp(colon,"cdrom")) { + DPC->disk->is_cdrom = 1; + } else if (!strcmp(colon,"disk")) { + DPC->disk->is_cdrom = 0; + } else { + xlu__disk_err(DPC,colon,"unknown deprecated type"); + } + } + SAVESTRING("vdev", vdev, yytext); + } else if (!DPC->access_set) { + DPC->access_set = 1; + setaccess(DPC,yytext); + } else { + xlu__disk_err(DPC,yytext,"too many positional parameters"); + return 0; /* don't print any more errors */ + } +} + YY_BREAK +case 22: +YY_RULE_SETUP +#line 211 "libxlu_disk_l.l" +{ + BEGIN(LEXERR); + yymore(); +} + YY_BREAK +case 23: +YY_RULE_SETUP +#line 215 "libxlu_disk_l.l" +{ + xlu__disk_err(DPC,yytext,"bad disk syntax"); return 0; +} + YY_BREAK +case 24: +YY_RULE_SETUP +#line 218 "libxlu_disk_l.l" +YY_FATAL_ERROR( "flex scanner jammed" ); + YY_BREAK +#line 1380 "libxlu_disk_l.c" + case YY_STATE_EOF(INITIAL): + case YY_STATE_EOF(LEXERR): + yyterminate(); + + case YY_END_OF_BUFFER: + { + /* Amount of text matched not including the EOB char. */ + int yy_amount_of_matched_text = (int) (yy_cp - yyg->yytext_ptr) - 1; + + /* Undo the effects of YY_DO_BEFORE_ACTION. */ + *yy_cp = yyg->yy_hold_char; + YY_RESTORE_YY_MORE_OFFSET + + if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW ) + { + /* We're scanning a new file or input source. It's + * possible that this happened because the user + * just pointed yyin at a new source and called + * xlu__disk_yylex(). If so, then we have to assure + * consistency between YY_CURRENT_BUFFER and our + * globals. Here is the right place to do so, because + * this is the first action (other than possibly a + * back-up) that will match for the new input source. + */ + yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; + YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin; + YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL; + } + + /* Note that here we test for yy_c_buf_p "<=" to the position + * of the first EOB in the buffer, since yy_c_buf_p will + * already have been incremented past the NUL character + * (since all states make transitions on EOB to the + * end-of-buffer state). Contrast this with the test + * in input(). + */ + if ( yyg->yy_c_buf_p <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] ) + { /* This was really a NUL. */ + yy_state_type yy_next_state; + + yyg->yy_c_buf_p = yyg->yytext_ptr + yy_amount_of_matched_text; + + yy_current_state = yy_get_previous_state( yyscanner ); + + /* Okay, we're now positioned to make the NUL + * transition. We couldn't have + * yy_get_previous_state() go ahead and do it + * for us because it doesn't know how to deal + * with the possibility of jamming (and we don't + * want to build jamming into it because then it + * will run more slowly). + */ + + yy_next_state = yy_try_NUL_trans( yy_current_state , yyscanner); + + yy_bp = yyg->yytext_ptr + YY_MORE_ADJ; + + if ( yy_next_state ) + { + /* Consume the NUL. */ + yy_cp = ++yyg->yy_c_buf_p; + yy_current_state = yy_next_state; + goto yy_match; + } + + else + { + yy_cp = yyg->yy_c_buf_p; + goto yy_find_action; + } + } + + else switch ( yy_get_next_buffer( yyscanner ) ) + { + case EOB_ACT_END_OF_FILE: + { + yyg->yy_did_buffer_switch_on_eof = 0; + + if ( xlu__disk_yywrap(yyscanner ) ) + { + /* Note: because we've taken care in + * yy_get_next_buffer() to have set up + * yytext, we can now set up + * yy_c_buf_p so that if some total + * hoser (like flex itself) wants to + * call the scanner after we return the + * YY_NULL, it'll still work - another + * YY_NULL will get returned. + */ + yyg->yy_c_buf_p = yyg->yytext_ptr + YY_MORE_ADJ; + + yy_act = YY_STATE_EOF(YY_START); + goto do_action; + } + + else + { + if ( ! yyg->yy_did_buffer_switch_on_eof ) + YY_NEW_FILE; + } + break; + } + + case EOB_ACT_CONTINUE_SCAN: + yyg->yy_c_buf_p = + yyg->yytext_ptr + yy_amount_of_matched_text; + + yy_current_state = yy_get_previous_state( yyscanner ); + + yy_cp = yyg->yy_c_buf_p; + yy_bp = yyg->yytext_ptr + YY_MORE_ADJ; + goto yy_match; + + case EOB_ACT_LAST_MATCH: + yyg->yy_c_buf_p = + &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars]; + + yy_current_state = yy_get_previous_state( yyscanner ); + + yy_cp = yyg->yy_c_buf_p; + yy_bp = yyg->yytext_ptr + YY_MORE_ADJ; + goto yy_find_action; + } + break; + } + + default: + YY_FATAL_ERROR( + "fatal flex scanner internal error--no action found" ); + } /* end of action switch */ + } /* end of scanning one token */ +} /* end of xlu__disk_yylex */ + +/* yy_get_next_buffer - try to read in a new buffer + * + * Returns a code representing an action: + * EOB_ACT_LAST_MATCH - + * EOB_ACT_CONTINUE_SCAN - continue scanning from current position + * EOB_ACT_END_OF_FILE - end of file + */ +static int yy_get_next_buffer (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; + register char *source = yyg->yytext_ptr; + register int number_to_move, i; + int ret_val; + + if ( yyg->yy_c_buf_p > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] ) + YY_FATAL_ERROR( + "fatal flex scanner internal error--end of buffer missed" ); + + if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 ) + { /* Don't try to fill the buffer, so this is an EOF. */ + if ( yyg->yy_c_buf_p - yyg->yytext_ptr - YY_MORE_ADJ == 1 ) + { + /* We matched a single character, the EOB, so + * treat this as a final EOF. + */ + return EOB_ACT_END_OF_FILE; + } + + else + { + /* We matched some text prior to the EOB, first + * process it. + */ + return EOB_ACT_LAST_MATCH; + } + } + + /* Try to read more data. */ + + /* First move last chars to start of buffer. */ + number_to_move = (int) (yyg->yy_c_buf_p - yyg->yytext_ptr) - 1; + + for ( i = 0; i < number_to_move; ++i ) + *(dest++) = *(source++); + + if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING ) + /* don't do the read, it's not guaranteed to return an EOF, + * just force an EOF + */ + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars = 0; + + else + { + int num_to_read = + YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; + + while ( num_to_read <= 0 ) + { /* Not enough room in the buffer - grow it. */ + + YY_FATAL_ERROR( +"input buffer overflow, can't enlarge buffer because scanner uses REJECT" ); + + } + + if ( num_to_read > YY_READ_BUF_SIZE ) + num_to_read = YY_READ_BUF_SIZE; + + /* Read in more data. */ + YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), + yyg->yy_n_chars, (size_t) num_to_read ); + + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars; + } + + if ( yyg->yy_n_chars == 0 ) + { + if ( number_to_move == YY_MORE_ADJ ) + { + ret_val = EOB_ACT_END_OF_FILE; + xlu__disk_yyrestart(yyin ,yyscanner); + } + + else + { + ret_val = EOB_ACT_LAST_MATCH; + YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = + YY_BUFFER_EOF_PENDING; + } + } + + else + ret_val = EOB_ACT_CONTINUE_SCAN; + + if ((yy_size_t) (yyg->yy_n_chars + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { + /* Extend the array by 50%, plus the number we really need. */ + yy_size_t new_size = yyg->yy_n_chars + number_to_move + (yyg->yy_n_chars >> 1); + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) xlu__disk_yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ,yyscanner ); + if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) + YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); + } + + yyg->yy_n_chars += number_to_move; + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] = YY_END_OF_BUFFER_CHAR; + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR; + + yyg->yytext_ptr = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0]; + + return ret_val; +} + +/* yy_get_previous_state - get the state just before the EOB char was reached */ + + static yy_state_type yy_get_previous_state (yyscan_t yyscanner) +{ + register yy_state_type yy_current_state; + register char *yy_cp; + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + + yy_current_state = yyg->yy_start; + + yyg->yy_state_ptr = yyg->yy_state_buf; + *yyg->yy_state_ptr++ = yy_current_state; + + for ( yy_cp = yyg->yytext_ptr + YY_MORE_ADJ; yy_cp < yyg->yy_c_buf_p; ++yy_cp ) + { + register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); + while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) + { + yy_current_state = (int) yy_def[yy_current_state]; + if ( yy_current_state >= 240 ) + yy_c = yy_meta[(unsigned int) yy_c]; + } + yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + *yyg->yy_state_ptr++ = yy_current_state; + } + + return yy_current_state; +} + +/* yy_try_NUL_trans - try to make a transition on the NUL character + * + * synopsis + * next_state = yy_try_NUL_trans( current_state ); + */ + static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state , yyscan_t yyscanner) +{ + register int yy_is_jam; + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* This var may be unused depending upon options. */ + + register YY_CHAR yy_c = 1; + while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) + { + yy_current_state = (int) yy_def[yy_current_state]; + if ( yy_current_state >= 240 ) + yy_c = yy_meta[(unsigned int) yy_c]; + } + yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + yy_is_jam = (yy_current_state == 239); + if ( ! yy_is_jam ) + *yyg->yy_state_ptr++ = yy_current_state; + + return yy_is_jam ? 0 : yy_current_state; +} + +#ifndef YY_NO_INPUT +#ifdef __cplusplus + static int yyinput (yyscan_t yyscanner) +#else + static int input (yyscan_t yyscanner) +#endif + +{ + int c; + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + + *yyg->yy_c_buf_p = yyg->yy_hold_char; + + if ( *yyg->yy_c_buf_p == YY_END_OF_BUFFER_CHAR ) + { + /* yy_c_buf_p now points to the character we want to return. + * If this occurs *before* the EOB characters, then it's a + * valid NUL; if not, then we've hit the end of the buffer. + */ + if ( yyg->yy_c_buf_p < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] ) + /* This was really a NUL. */ + *yyg->yy_c_buf_p = '\0'; + + else + { /* need more input */ + int offset = yyg->yy_c_buf_p - yyg->yytext_ptr; + ++yyg->yy_c_buf_p; + + switch ( yy_get_next_buffer( yyscanner ) ) + { + case EOB_ACT_LAST_MATCH: + /* This happens because yy_g_n_b() + * sees that we've accumulated a + * token and flags that we need to + * try matching the token before + * proceeding. But for input(), + * there's no matching to consider. + * So convert the EOB_ACT_LAST_MATCH + * to EOB_ACT_END_OF_FILE. + */ + + /* Reset buffer status. */ + xlu__disk_yyrestart(yyin ,yyscanner); + + /*FALLTHROUGH*/ + + case EOB_ACT_END_OF_FILE: + { + if ( xlu__disk_yywrap(yyscanner ) ) + return EOF; + + if ( ! yyg->yy_did_buffer_switch_on_eof ) + YY_NEW_FILE; +#ifdef __cplusplus + return yyinput(yyscanner); +#else + return input(yyscanner); +#endif + } + + case EOB_ACT_CONTINUE_SCAN: + yyg->yy_c_buf_p = yyg->yytext_ptr + offset; + break; + } + } + } + + c = *(unsigned char *) yyg->yy_c_buf_p; /* cast for 8-bit char's */ + *yyg->yy_c_buf_p = '\0'; /* preserve yytext */ + yyg->yy_hold_char = *++yyg->yy_c_buf_p; + + return c; +} +#endif /* ifndef YY_NO_INPUT */ + +/** Immediately switch to a different input stream. + * @param input_file A readable stream. + * @param yyscanner The scanner object. + * @note This function does not reset the start condition to @c INITIAL . + */ + void xlu__disk_yyrestart (FILE * input_file , yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + + if ( ! YY_CURRENT_BUFFER ){ + xlu__disk_yyensure_buffer_stack (yyscanner); + YY_CURRENT_BUFFER_LVALUE = + xlu__disk_yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); + } + + xlu__disk_yy_init_buffer(YY_CURRENT_BUFFER,input_file ,yyscanner); + xlu__disk_yy_load_buffer_state(yyscanner ); +} + +/** Switch to a different input buffer. + * @param new_buffer The new input buffer. + * @param yyscanner The scanner object. + */ + void xlu__disk_yy_switch_to_buffer (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + + /* TODO. We should be able to replace this entire function body + * with + * xlu__disk_yypop_buffer_state(); + * xlu__disk_yypush_buffer_state(new_buffer); + */ + xlu__disk_yyensure_buffer_stack (yyscanner); + if ( YY_CURRENT_BUFFER == new_buffer ) + return; + + if ( YY_CURRENT_BUFFER ) + { + /* Flush out information for old buffer. */ + *yyg->yy_c_buf_p = yyg->yy_hold_char; + YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = yyg->yy_c_buf_p; + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars; + } + + YY_CURRENT_BUFFER_LVALUE = new_buffer; + xlu__disk_yy_load_buffer_state(yyscanner ); + + /* We don't actually know whether we did this switch during + * EOF (xlu__disk_yywrap()) processing, but the only time this flag + * is looked at is after xlu__disk_yywrap() is called, so it's safe + * to go ahead and always set it. + */ + yyg->yy_did_buffer_switch_on_eof = 1; +} + +static void xlu__disk_yy_load_buffer_state (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; + yyg->yytext_ptr = yyg->yy_c_buf_p = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos; + yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file; + yyg->yy_hold_char = *yyg->yy_c_buf_p; +} + +/** Allocate and initialize an input buffer state. + * @param file A readable stream. + * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE. + * @param yyscanner The scanner object. + * @return the allocated buffer state. + */ + YY_BUFFER_STATE xlu__disk_yy_create_buffer (FILE * file, int size , yyscan_t yyscanner) +{ + YY_BUFFER_STATE b; + + b = (YY_BUFFER_STATE) xlu__disk_yyalloc(sizeof( struct yy_buffer_state ) ,yyscanner ); + if ( ! b ) + YY_FATAL_ERROR( "out of dynamic memory in xlu__disk_yy_create_buffer()" ); + + b->yy_buf_size = size; + + /* yy_ch_buf has to be 2 characters longer than the size given because + * we need to put in 2 end-of-buffer characters. + */ + b->yy_ch_buf = (char *) xlu__disk_yyalloc(b->yy_buf_size + 2 ,yyscanner ); + if ( ! b->yy_ch_buf ) + YY_FATAL_ERROR( "out of dynamic memory in xlu__disk_yy_create_buffer()" ); + + b->yy_is_our_buffer = 1; + + xlu__disk_yy_init_buffer(b,file ,yyscanner); + + return b; +} + +/** Destroy the buffer. + * @param b a buffer created with xlu__disk_yy_create_buffer() + * @param yyscanner The scanner object. + */ + void xlu__disk_yy_delete_buffer (YY_BUFFER_STATE b , yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + + if ( ! b ) + return; + + if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */ + YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0; + + if ( b->yy_is_our_buffer ) + xlu__disk_yyfree((void *) b->yy_ch_buf ,yyscanner ); + + xlu__disk_yyfree((void *) b ,yyscanner ); +} + +#ifndef __cplusplus +extern int isatty (int ); +#endif /* __cplusplus */ + +/* Initializes or reinitializes a buffer. + * This function is sometimes called more than once on the same buffer, + * such as during a xlu__disk_yyrestart() or at EOF. + */ + static void xlu__disk_yy_init_buffer (YY_BUFFER_STATE b, FILE * file , yyscan_t yyscanner) + +{ + int oerrno = errno; + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + + xlu__disk_yy_flush_buffer(b ,yyscanner); + + b->yy_input_file = file; + b->yy_fill_buffer = 1; + + /* If b is the current buffer, then xlu__disk_yy_init_buffer was _probably_ + * called from xlu__disk_yyrestart() or through yy_get_next_buffer. + * In that case, we don't want to reset the lineno or column. + */ + if (b != YY_CURRENT_BUFFER){ + b->yy_bs_lineno = 1; + b->yy_bs_column = 0; + } + + b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0; + + errno = oerrno; +} + +/** Discard all buffered characters. On the next scan, YY_INPUT will be called. + * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER. + * @param yyscanner The scanner object. + */ + void xlu__disk_yy_flush_buffer (YY_BUFFER_STATE b , yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + if ( ! b ) + return; + + b->yy_n_chars = 0; + + /* We always need two end-of-buffer characters. The first causes + * a transition to the end-of-buffer state. The second causes + * a jam in that state. + */ + b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR; + b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR; + + b->yy_buf_pos = &b->yy_ch_buf[0]; + + b->yy_at_bol = 1; + b->yy_buffer_status = YY_BUFFER_NEW; + + if ( b == YY_CURRENT_BUFFER ) + xlu__disk_yy_load_buffer_state(yyscanner ); +} + +/** Pushes the new state onto the stack. The new state becomes + * the current state. This function will allocate the stack + * if necessary. + * @param new_buffer The new state. + * @param yyscanner The scanner object. + */ +void xlu__disk_yypush_buffer_state (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + if (new_buffer == NULL) + return; + + xlu__disk_yyensure_buffer_stack(yyscanner); + + /* This block is copied from xlu__disk_yy_switch_to_buffer. */ + if ( YY_CURRENT_BUFFER ) + { + /* Flush out information for old buffer. */ + *yyg->yy_c_buf_p = yyg->yy_hold_char; + YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = yyg->yy_c_buf_p; + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars; + } + + /* Only push if top exists. Otherwise, replace top. */ + if (YY_CURRENT_BUFFER) + yyg->yy_buffer_stack_top++; + YY_CURRENT_BUFFER_LVALUE = new_buffer; + + /* copied from xlu__disk_yy_switch_to_buffer. */ + xlu__disk_yy_load_buffer_state(yyscanner ); + yyg->yy_did_buffer_switch_on_eof = 1; +} + +/** Removes and deletes the top of the stack, if present. + * The next element becomes the new top. + * @param yyscanner The scanner object. + */ +void xlu__disk_yypop_buffer_state (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + if (!YY_CURRENT_BUFFER) + return; + + xlu__disk_yy_delete_buffer(YY_CURRENT_BUFFER ,yyscanner); + YY_CURRENT_BUFFER_LVALUE = NULL; + if (yyg->yy_buffer_stack_top > 0) + --yyg->yy_buffer_stack_top; + + if (YY_CURRENT_BUFFER) { + xlu__disk_yy_load_buffer_state(yyscanner ); + yyg->yy_did_buffer_switch_on_eof = 1; + } +} + +/* Allocates the stack if it does not exist. + * Guarantees space for at least one push. + */ +static void xlu__disk_yyensure_buffer_stack (yyscan_t yyscanner) +{ + int num_to_alloc; + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + + if (!yyg->yy_buffer_stack) { + + /* First allocation is just for 2 elements, since we don't know if this + * scanner will even need a stack. We use 2 instead of 1 to avoid an + * immediate realloc on the next call. + */ + num_to_alloc = 1; + yyg->yy_buffer_stack = (struct yy_buffer_state**)xlu__disk_yyalloc + (num_to_alloc * sizeof(struct yy_buffer_state*) + , yyscanner); + if ( ! yyg->yy_buffer_stack ) + YY_FATAL_ERROR( "out of dynamic memory in xlu__disk_yyensure_buffer_stack()" ); + + memset(yyg->yy_buffer_stack, 0, num_to_alloc * sizeof(struct yy_buffer_state*)); + + yyg->yy_buffer_stack_max = num_to_alloc; + yyg->yy_buffer_stack_top = 0; + return; + } + + if (yyg->yy_buffer_stack_top >= (yyg->yy_buffer_stack_max) - 1){ + + /* Increase the buffer to prepare for a possible push. */ + int grow_size = 8 /* arbitrary grow size */; + + num_to_alloc = yyg->yy_buffer_stack_max + grow_size; + yyg->yy_buffer_stack = (struct yy_buffer_state**)xlu__disk_yyrealloc + (yyg->yy_buffer_stack, + num_to_alloc * sizeof(struct yy_buffer_state*) + , yyscanner); + if ( ! yyg->yy_buffer_stack ) + YY_FATAL_ERROR( "out of dynamic memory in xlu__disk_yyensure_buffer_stack()" ); + + /* zero only the new slots.*/ + memset(yyg->yy_buffer_stack + yyg->yy_buffer_stack_max, 0, grow_size * sizeof(struct yy_buffer_state*)); + yyg->yy_buffer_stack_max = num_to_alloc; + } +} + +/** Setup the input buffer state to scan directly from a user-specified character buffer. + * @param base the character buffer + * @param size the size in bytes of the character buffer + * @param yyscanner The scanner object. + * @return the newly allocated buffer state object. + */ +YY_BUFFER_STATE xlu__disk_yy_scan_buffer (char * base, yy_size_t size , yyscan_t yyscanner) +{ + YY_BUFFER_STATE b; + + if ( size < 2 || + base[size-2] != YY_END_OF_BUFFER_CHAR || + base[size-1] != YY_END_OF_BUFFER_CHAR ) + /* They forgot to leave room for the EOB's. */ + return 0; + + b = (YY_BUFFER_STATE) xlu__disk_yyalloc(sizeof( struct yy_buffer_state ) ,yyscanner ); + if ( ! b ) + YY_FATAL_ERROR( "out of dynamic memory in xlu__disk_yy_scan_buffer()" ); + + b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */ + b->yy_buf_pos = b->yy_ch_buf = base; + b->yy_is_our_buffer = 0; + b->yy_input_file = 0; + b->yy_n_chars = b->yy_buf_size; + b->yy_is_interactive = 0; + b->yy_at_bol = 1; + b->yy_fill_buffer = 0; + b->yy_buffer_status = YY_BUFFER_NEW; + + xlu__disk_yy_switch_to_buffer(b ,yyscanner ); + + return b; +} + +/** Setup the input buffer state to scan a string. The next call to xlu__disk_yylex() will + * scan from a @e copy of @a str. + * @param yystr a NUL-terminated string to scan + * @param yyscanner The scanner object. + * @return the newly allocated buffer state object. + * @note If you want to scan bytes that may contain NUL values, then use + * xlu__disk_yy_scan_bytes() instead. + */ +YY_BUFFER_STATE xlu__disk_yy_scan_string (yyconst char * yystr , yyscan_t yyscanner) +{ + + return xlu__disk_yy_scan_bytes(yystr,strlen(yystr) ,yyscanner); +} + +/** Setup the input buffer state to scan the given bytes. The next call to xlu__disk_yylex() will + * scan from a @e copy of @a bytes. + * @param yybytes the byte buffer to scan + * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. + * @param yyscanner The scanner object. + * @return the newly allocated buffer state object. + */ +YY_BUFFER_STATE xlu__disk_yy_scan_bytes (yyconst char * yybytes, int _yybytes_len , yyscan_t yyscanner) +{ + YY_BUFFER_STATE b; + char *buf; + yy_size_t n; + int i; + + /* Get memory for full buffer, including space for trailing EOB's. */ + n = _yybytes_len + 2; + buf = (char *) xlu__disk_yyalloc(n ,yyscanner ); + if ( ! buf ) + YY_FATAL_ERROR( "out of dynamic memory in xlu__disk_yy_scan_bytes()" ); + + for ( i = 0; i < _yybytes_len; ++i ) + buf[i] = yybytes[i]; + + buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR; + + b = xlu__disk_yy_scan_buffer(buf,n ,yyscanner); + if ( ! b ) + YY_FATAL_ERROR( "bad buffer in xlu__disk_yy_scan_bytes()" ); + + /* It's okay to grow etc. this buffer, and we should throw it + * away when we're done. + */ + b->yy_is_our_buffer = 1; + + return b; +} + +#ifndef YY_EXIT_FAILURE +#define YY_EXIT_FAILURE 2 +#endif + +static void yy_fatal_error (yyconst char* msg , yyscan_t yyscanner) +{ + (void) fprintf( stderr, "%s\n", msg ); + exit( YY_EXIT_FAILURE ); +} + +/* Redefine yyless() so it works in section 3 code. */ + +#undef yyless +#define yyless(n) \ + do \ + { \ + /* Undo effects of setting up yytext. */ \ + int yyless_macro_arg = (n); \ + YY_LESS_LINENO(yyless_macro_arg);\ + yytext[yyleng] = yyg->yy_hold_char; \ + yyg->yy_c_buf_p = yytext + yyless_macro_arg; \ + yyg->yy_hold_char = *yyg->yy_c_buf_p; \ + *yyg->yy_c_buf_p = '\0'; \ + yyleng = yyless_macro_arg; \ + } \ + while ( 0 ) + +/* Accessor methods (get/set functions) to struct members. */ + +/** Get the user-defined data for this scanner. + * @param yyscanner The scanner object. + */ +YY_EXTRA_TYPE xlu__disk_yyget_extra (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + return yyextra; +} + +/** Get the current line number. + * @param yyscanner The scanner object. + */ +int xlu__disk_yyget_lineno (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + + if (! YY_CURRENT_BUFFER) + return 0; + + return yylineno; +} + +/** Get the current column number. + * @param yyscanner The scanner object. + */ +int xlu__disk_yyget_column (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + + if (! YY_CURRENT_BUFFER) + return 0; + + return yycolumn; +} + +/** Get the input stream. + * @param yyscanner The scanner object. + */ +FILE *xlu__disk_yyget_in (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + return yyin; +} + +/** Get the output stream. + * @param yyscanner The scanner object. + */ +FILE *xlu__disk_yyget_out (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + return yyout; +} + +/** Get the length of the current token. + * @param yyscanner The scanner object. + */ +int xlu__disk_yyget_leng (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + return yyleng; +} + +/** Get the current token. + * @param yyscanner The scanner object. + */ + +char *xlu__disk_yyget_text (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + return yytext; +} + +/** Set the user-defined data. This data is never touched by the scanner. + * @param user_defined The data to be associated with this scanner. + * @param yyscanner The scanner object. + */ +void xlu__disk_yyset_extra (YY_EXTRA_TYPE user_defined , yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + yyextra = user_defined ; +} + +/** Set the current line number. + * @param line_number + * @param yyscanner The scanner object. + */ +void xlu__disk_yyset_lineno (int line_number , yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + + /* lineno is only valid if an input buffer exists. */ + if (! YY_CURRENT_BUFFER ) + yy_fatal_error( "xlu__disk_yyset_lineno called with no buffer" , yyscanner); + + yylineno = line_number; +} + +/** Set the current column. + * @param line_number + * @param yyscanner The scanner object. + */ +void xlu__disk_yyset_column (int column_no , yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + + /* column is only valid if an input buffer exists. */ + if (! YY_CURRENT_BUFFER ) + yy_fatal_error( "xlu__disk_yyset_column called with no buffer" , yyscanner); + + yycolumn = column_no; +} + +/** Set the input stream. This does not discard the current + * input buffer. + * @param in_str A readable stream. + * @param yyscanner The scanner object. + * @see xlu__disk_yy_switch_to_buffer + */ +void xlu__disk_yyset_in (FILE * in_str , yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + yyin = in_str ; +} + +void xlu__disk_yyset_out (FILE * out_str , yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + yyout = out_str ; +} + +int xlu__disk_yyget_debug (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + return yy_flex_debug; +} + +void xlu__disk_yyset_debug (int bdebug , yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + yy_flex_debug = bdebug ; +} + +/* Accessor methods for yylval and yylloc */ + +/* User-visible API */ + +/* xlu__disk_yylex_init is special because it creates the scanner itself, so it is + * the ONLY reentrant function that doesn't take the scanner as the last argument. + * That's why we explicitly handle the declaration, instead of using our macros. + */ + +int xlu__disk_yylex_init(yyscan_t* ptr_yy_globals) + +{ + if (ptr_yy_globals == NULL){ + errno = EINVAL; + return 1; + } + + *ptr_yy_globals = (yyscan_t) xlu__disk_yyalloc ( sizeof( struct yyguts_t ), NULL ); + + if (*ptr_yy_globals == NULL){ + errno = ENOMEM; + return 1; + } + + /* By setting to 0xAA, we expose bugs in yy_init_globals. Leave at 0x00 for releases. */ + memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t)); + + return yy_init_globals ( *ptr_yy_globals ); +} + +/* xlu__disk_yylex_init_extra has the same functionality as xlu__disk_yylex_init, but follows the + * convention of taking the scanner as the last argument. Note however, that + * this is a *pointer* to a scanner, as it will be allocated by this call (and + * is the reason, too, why this function also must handle its own declaration). + * The user defined value in the first argument will be available to xlu__disk_yyalloc in + * the yyextra field. + */ + +int xlu__disk_yylex_init_extra(YY_EXTRA_TYPE yy_user_defined,yyscan_t* ptr_yy_globals ) + +{ + struct yyguts_t dummy_yyguts; + + xlu__disk_yyset_extra (yy_user_defined, &dummy_yyguts); + + if (ptr_yy_globals == NULL){ + errno = EINVAL; + return 1; + } + + *ptr_yy_globals = (yyscan_t) xlu__disk_yyalloc ( sizeof( struct yyguts_t ), &dummy_yyguts ); + + if (*ptr_yy_globals == NULL){ + errno = ENOMEM; + return 1; + } + + /* By setting to 0xAA, we expose bugs in + yy_init_globals. Leave at 0x00 for releases. */ + memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t)); + + xlu__disk_yyset_extra (yy_user_defined, *ptr_yy_globals); + + return yy_init_globals ( *ptr_yy_globals ); +} + +static int yy_init_globals (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + /* Initialization is the same as for the non-reentrant scanner. + * This function is called from xlu__disk_yylex_destroy(), so don't allocate here. + */ + + yyg->yy_buffer_stack = 0; + yyg->yy_buffer_stack_top = 0; + yyg->yy_buffer_stack_max = 0; + yyg->yy_c_buf_p = (char *) 0; + yyg->yy_init = 0; + yyg->yy_start = 0; + + yyg->yy_start_stack_ptr = 0; + yyg->yy_start_stack_depth = 0; + yyg->yy_start_stack = NULL; + + yyg->yy_state_buf = 0; + yyg->yy_state_ptr = 0; + yyg->yy_full_match = 0; + yyg->yy_lp = 0; + +/* Defined in main.c */ +#ifdef YY_STDINIT + yyin = stdin; + yyout = stdout; +#else + yyin = (FILE *) 0; + yyout = (FILE *) 0; +#endif + + /* For future reference: Set errno on error, since we are called by + * xlu__disk_yylex_init() + */ + return 0; +} + +/* xlu__disk_yylex_destroy is for both reentrant and non-reentrant scanners. */ +int xlu__disk_yylex_destroy (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + + /* Pop the buffer stack, destroying each element. */ + while(YY_CURRENT_BUFFER){ + xlu__disk_yy_delete_buffer(YY_CURRENT_BUFFER ,yyscanner ); + YY_CURRENT_BUFFER_LVALUE = NULL; + xlu__disk_yypop_buffer_state(yyscanner); + } + + /* Destroy the stack itself. */ + xlu__disk_yyfree(yyg->yy_buffer_stack ,yyscanner); + yyg->yy_buffer_stack = NULL; + + /* Destroy the start condition stack. */ + xlu__disk_yyfree(yyg->yy_start_stack ,yyscanner ); + yyg->yy_start_stack = NULL; + + xlu__disk_yyfree ( yyg->yy_state_buf , yyscanner); + yyg->yy_state_buf = NULL; + + /* Reset the globals. This is important in a non-reentrant scanner so the next time + * xlu__disk_yylex() is called, initialization will occur. */ + yy_init_globals( yyscanner); + + /* Destroy the main struct (reentrant only). */ + xlu__disk_yyfree ( yyscanner , yyscanner ); + yyscanner = NULL; + return 0; +} + +/* + * Internal utility routines. + */ + +#ifndef yytext_ptr +static void yy_flex_strncpy (char* s1, yyconst char * s2, int n , yyscan_t yyscanner) +{ + register int i; + for ( i = 0; i < n; ++i ) + s1[i] = s2[i]; +} +#endif + +#ifdef YY_NEED_STRLEN +static int yy_flex_strlen (yyconst char * s , yyscan_t yyscanner) +{ + register int n; + for ( n = 0; s[n]; ++n ) + ; + + return n; +} +#endif + +void *xlu__disk_yyalloc (yy_size_t size , yyscan_t yyscanner) +{ + return (void *) malloc( size ); +} + +void *xlu__disk_yyrealloc (void * ptr, yy_size_t size , yyscan_t yyscanner) +{ + /* The cast to (char *) in the following accommodates both + * implementations that use char* generic pointers, and those + * that use void* generic pointers. It works with the latter + * because both ANSI C and C++ allow castless assignment from + * any pointer type to void*, and deal with argument conversions + * as though doing an assignment. + */ + return (void *) realloc( (char *) ptr, size ); +} + +void xlu__disk_yyfree (void * ptr , yyscan_t yyscanner) +{ + free( (char *) ptr ); /* see xlu__disk_yyrealloc() for (char *) cast */ +} + +#define YYTABLES_NAME "yytables" + +#line 218 "libxlu_disk_l.l" diff --git a/tools/libxl/libxlu_disk_l.h b/tools/libxl/libxlu_disk_l.h new file mode 100644 index 0000000..7c1a8a0 --- /dev/null +++ b/tools/libxl/libxlu_disk_l.h @@ -0,0 +1,347 @@ +#ifndef xlu__disk_yyHEADER_H +#define xlu__disk_yyHEADER_H 1 +#define xlu__disk_yyIN_HEADER 1 + +#line 6 "libxlu_disk_l.h" + +#line 8 "libxlu_disk_l.h" + +#define YY_INT_ALIGNED short int + +/* A lexical scanner generated by flex */ + +#define FLEX_SCANNER +#define YY_FLEX_MAJOR_VERSION 2 +#define YY_FLEX_MINOR_VERSION 5 +#define YY_FLEX_SUBMINOR_VERSION 35 +#if YY_FLEX_SUBMINOR_VERSION > 0 +#define FLEX_BETA +#endif + +/* First, we deal with platform-specific or compiler-specific issues. */ + +/* begin standard C headers. */ +#include <stdio.h> +#include <string.h> +#include <errno.h> +#include <stdlib.h> + +/* end standard C headers. */ + +/* flex integer type definitions */ + +#ifndef FLEXINT_H +#define FLEXINT_H + +/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */ + +#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L + +/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, + * if you want the limit (max/min) macros for int types. + */ +#ifndef __STDC_LIMIT_MACROS +#define __STDC_LIMIT_MACROS 1 +#endif + +#include <inttypes.h> +typedef int8_t flex_int8_t; +typedef uint8_t flex_uint8_t; +typedef int16_t flex_int16_t; +typedef uint16_t flex_uint16_t; +typedef int32_t flex_int32_t; +typedef uint32_t flex_uint32_t; +#else +typedef signed char flex_int8_t; +typedef short int flex_int16_t; +typedef int flex_int32_t; +typedef unsigned char flex_uint8_t; +typedef unsigned short int flex_uint16_t; +typedef unsigned int flex_uint32_t; + +/* Limits of integral types. */ +#ifndef INT8_MIN +#define INT8_MIN (-128) +#endif +#ifndef INT16_MIN +#define INT16_MIN (-32767-1) +#endif +#ifndef INT32_MIN +#define INT32_MIN (-2147483647-1) +#endif +#ifndef INT8_MAX +#define INT8_MAX (127) +#endif +#ifndef INT16_MAX +#define INT16_MAX (32767) +#endif +#ifndef INT32_MAX +#define INT32_MAX (2147483647) +#endif +#ifndef UINT8_MAX +#define UINT8_MAX (255U) +#endif +#ifndef UINT16_MAX +#define UINT16_MAX (65535U) +#endif +#ifndef UINT32_MAX +#define UINT32_MAX (4294967295U) +#endif + +#endif /* ! C99 */ + +#endif /* ! FLEXINT_H */ + +#ifdef __cplusplus + +/* The "const" storage-class-modifier is valid. */ +#define YY_USE_CONST + +#else /* ! __cplusplus */ + +/* C99 requires __STDC__ to be defined as 1. */ +#if defined (__STDC__) + +#define YY_USE_CONST + +#endif /* defined (__STDC__) */ +#endif /* ! __cplusplus */ + +#ifdef YY_USE_CONST +#define yyconst const +#else +#define yyconst +#endif + +/* An opaque pointer. */ +#ifndef YY_TYPEDEF_YY_SCANNER_T +#define YY_TYPEDEF_YY_SCANNER_T +typedef void* yyscan_t; +#endif + +/* For convenience, these vars (plus the bison vars far below) + are macros in the reentrant scanner. */ +#define yyin yyg->yyin_r +#define yyout yyg->yyout_r +#define yyextra yyg->yyextra_r +#define yyleng yyg->yyleng_r +#define yytext yyg->yytext_r +#define yylineno (YY_CURRENT_BUFFER_LVALUE->yy_bs_lineno) +#define yycolumn (YY_CURRENT_BUFFER_LVALUE->yy_bs_column) +#define yy_flex_debug yyg->yy_flex_debug_r + +/* Size of default input buffer. */ +#ifndef YY_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k. + * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. + * Ditto for the __ia64__ case accordingly. + */ +#define YY_BUF_SIZE 32768 +#else +#define YY_BUF_SIZE 16384 +#endif /* __ia64__ */ +#endif + +#ifndef YY_TYPEDEF_YY_BUFFER_STATE +#define YY_TYPEDEF_YY_BUFFER_STATE +typedef struct yy_buffer_state *YY_BUFFER_STATE; +#endif + +#ifndef YY_TYPEDEF_YY_SIZE_T +#define YY_TYPEDEF_YY_SIZE_T +typedef size_t yy_size_t; +#endif + +#ifndef YY_STRUCT_YY_BUFFER_STATE +#define YY_STRUCT_YY_BUFFER_STATE +struct yy_buffer_state + { + FILE *yy_input_file; + + char *yy_ch_buf; /* input buffer */ + char *yy_buf_pos; /* current position in input buffer */ + + /* Size of input buffer in bytes, not including room for EOB + * characters. + */ + yy_size_t yy_buf_size; + + /* Number of characters read into yy_ch_buf, not including EOB + * characters. + */ + int yy_n_chars; + + /* Whether we "own" the buffer - i.e., we know we created it, + * and can realloc() it to grow it, and should free() it to + * delete it. + */ + int yy_is_our_buffer; + + /* Whether this is an "interactive" input source; if so, and + * if we're using stdio for input, then we want to use getc() + * instead of fread(), to make sure we stop fetching input after + * each newline. + */ + int yy_is_interactive; + + /* Whether we're considered to be at the beginning of a line. + * If so, '^' rules will be active on the next match, otherwise + * not. + */ + int yy_at_bol; + + int yy_bs_lineno; /**< The line count. */ + int yy_bs_column; /**< The column count. */ + + /* Whether to try to fill the input buffer when we reach the + * end of it. + */ + int yy_fill_buffer; + + int yy_buffer_status; + + }; +#endif /* !YY_STRUCT_YY_BUFFER_STATE */ + +void xlu__disk_yyrestart (FILE *input_file ,yyscan_t yyscanner ); +void xlu__disk_yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); +YY_BUFFER_STATE xlu__disk_yy_create_buffer (FILE *file,int size ,yyscan_t yyscanner ); +void xlu__disk_yy_delete_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); +void xlu__disk_yy_flush_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); +void xlu__disk_yypush_buffer_state (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); +void xlu__disk_yypop_buffer_state (yyscan_t yyscanner ); + +YY_BUFFER_STATE xlu__disk_yy_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner ); +YY_BUFFER_STATE xlu__disk_yy_scan_string (yyconst char *yy_str ,yyscan_t yyscanner ); +YY_BUFFER_STATE xlu__disk_yy_scan_bytes (yyconst char *bytes,int len ,yyscan_t yyscanner ); + +void *xlu__disk_yyalloc (yy_size_t ,yyscan_t yyscanner ); +void *xlu__disk_yyrealloc (void *,yy_size_t ,yyscan_t yyscanner ); +void xlu__disk_yyfree (void * ,yyscan_t yyscanner ); + +#define xlu__disk_yywrap(n) 1 +#define YY_SKIP_YYWRAP + +#define yytext_ptr yytext_r + +#ifdef YY_HEADER_EXPORT_START_CONDITIONS +#define INITIAL 0 +#define LEXERR 1 + +#endif + +#ifndef YY_NO_UNISTD_H +/* Special case for "unistd.h", since it is non-ANSI. We include it way + * down here because we want the user's section 1 to have been scanned first. + * The user has a chance to override it with an option. + */ +#include <unistd.h> +#endif + +#ifndef YY_EXTRA_TYPE +#define YY_EXTRA_TYPE void * +#endif + +int xlu__disk_yylex_init (yyscan_t* scanner); + +int xlu__disk_yylex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner); + +/* Accessor methods to globals. + These are made visible to non-reentrant scanners for convenience. */ + +int xlu__disk_yylex_destroy (yyscan_t yyscanner ); + +int xlu__disk_yyget_debug (yyscan_t yyscanner ); + +void xlu__disk_yyset_debug (int debug_flag ,yyscan_t yyscanner ); + +YY_EXTRA_TYPE xlu__disk_yyget_extra (yyscan_t yyscanner ); + +void xlu__disk_yyset_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner ); + +FILE *xlu__disk_yyget_in (yyscan_t yyscanner ); + +void xlu__disk_yyset_in (FILE * in_str ,yyscan_t yyscanner ); + +FILE *xlu__disk_yyget_out (yyscan_t yyscanner ); + +void xlu__disk_yyset_out (FILE * out_str ,yyscan_t yyscanner ); + +int xlu__disk_yyget_leng (yyscan_t yyscanner ); + +char *xlu__disk_yyget_text (yyscan_t yyscanner ); + +int xlu__disk_yyget_lineno (yyscan_t yyscanner ); + +void xlu__disk_yyset_lineno (int line_number ,yyscan_t yyscanner ); + +/* Macros after this point can all be overridden by user definitions in + * section 1. + */ + +#ifndef YY_SKIP_YYWRAP +#ifdef __cplusplus +extern "C" int xlu__disk_yywrap (yyscan_t yyscanner ); +#else +extern int xlu__disk_yywrap (yyscan_t yyscanner ); +#endif +#endif + +#ifndef yytext_ptr +static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner); +#endif + +#ifdef YY_NEED_STRLEN +static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner); +#endif + +#ifndef YY_NO_INPUT + +#endif + +/* Amount of stuff to slurp up with each read. */ +#ifndef YY_READ_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k */ +#define YY_READ_BUF_SIZE 16384 +#else +#define YY_READ_BUF_SIZE 8192 +#endif /* __ia64__ */ +#endif + +/* Number of entries by which start-condition stack grows. */ +#ifndef YY_START_STACK_INCR +#define YY_START_STACK_INCR 25 +#endif + +/* Default declaration of generated scanner - a define so the user can + * easily add parameters. + */ +#ifndef YY_DECL +#define YY_DECL_IS_OURS 1 + +extern int xlu__disk_yylex (yyscan_t yyscanner); + +#define YY_DECL int xlu__disk_yylex (yyscan_t yyscanner) +#endif /* !YY_DECL */ + +/* yy_get_previous_state - get the state just before the EOB char was reached */ + +#undef YY_NEW_FILE +#undef YY_FLUSH_BUFFER +#undef yy_set_bol +#undef yy_new_buffer +#undef yy_set_interactive +#undef YY_DO_BEFORE_ACTION + +#ifdef YY_DECL_IS_OURS +#undef YY_DECL_IS_OURS +#undef YY_DECL +#endif + +#line 218 "libxlu_disk_l.l" + +#line 346 "libxlu_disk_l.h" +#undef xlu__disk_yyIN_HEADER +#endif /* xlu__disk_yyHEADER_H */ -- 1.5.6.5 ^ permalink raw reply related [flat|nested] 49+ messages in thread
* [PATCH 4/9] docs: update xl-disk-configuration.txt to describe new syntax 2011-06-02 17:55 ` [PATCH 3/9] libxl: disks: commit libxlu_disk_l.[ch] flex output Ian Jackson @ 2011-06-02 17:55 ` Ian Jackson 2011-06-02 17:55 ` [PATCH 5/9] xl: disks: replace config file disk spec parser with call to xlu_disk_parse Ian Jackson 2011-06-03 10:19 ` [PATCH 4/9] docs: update xl-disk-configuration.txt to describe new syntax Ian Campbell 2011-06-03 10:19 ` [PATCH 3/9] libxl: disks: commit libxlu_disk_l.[ch] flex output Ian Campbell 1 sibling, 2 replies; 49+ messages in thread From: Ian Jackson @ 2011-06-02 17:55 UTC (permalink / raw) To: xen-devel; +Cc: Ian Jackson --- docs/misc/xl-disk-configuration.txt | 249 +++++++++++++++++++++-------------- 1 files changed, 150 insertions(+), 99 deletions(-) diff --git a/docs/misc/xl-disk-configuration.txt b/docs/misc/xl-disk-configuration.txt index 58332a9..de0a75e 100644 --- a/docs/misc/xl-disk-configuration.txt +++ b/docs/misc/xl-disk-configuration.txt @@ -1,57 +1,98 @@ + --------------------- + XL DISK CONFIGURATION + --------------------- +This document specifies the xl config file format disk configuration +option. It has the following form: - ---------------------------- - xl Disk Configuration Option - ---------------------------- + disk = [ '<diskspec>', '<diskspec>', ... ] -This document provides a brief description of xl disk configuration -option, different attributes that can be passed through it and the -format in which they need to be specified. +where each diskspec is in this form: + + [<key>=<value>|<flag>,]*, + [<target>, [<format>, [<vdev>, [<access>]]]], + [<key>=<value>|<flag>,]* + [target=<target>] -At a higher level, xl disk configuration option takes the following -format: - disk = [ '[format:][path],vdev[:type],attrib', - '[format:][path],vdev[:type],attrib', ... ] +For example, these strings are equivalent: -Not all attributes are required (the attributes enclosed within square -brackets above are optional) and some are deprecated. Following is a -brief description of each of the attribute along with information on -whether or not they are mandatory. + /dev/vg/guest-volume,,hda + /dev/vg/guest-volume,raw,hda,rw + format=raw, vdev=hda, access=rw, target=/dev/vg/guest-volume + raw:/dev/vg/guest-volume,hda,w (deprecated, see below) +As are these: ------------------- -Attribute Details ------------------- + /root/image.iso,,hdc,cdrom + /root/image.iso,,hdc,,cdrom + /root/image.iso,raw,hdc,devtype=cdrom + format=raw, vdev=hdc, access=ro, devtype=cdrom, target=/root/image.iso + raw:/root/image.iso,hdc:cdrom,ro (deprecated, see below) +These might be specified in the domain config file like this: -format: ------- + disk = [ '/dev/vg/guest-volume,,hda', '/root/image.iso,,hdc,cdrom' ] -Description: Specifies the format of image file. -Supported values: raw, qcow, qcow2, vhd -Deprecated values: None -Mandatory: No. When not specified raw format is assumed. - For a physical block device the format must be - raw and need not be explicitly specified. For - an image file the format could be one of the - supported values and when not specified assumed - to be raw. -path: ----- -Description: Block device or image file path. For a - physical block device a /dev will be prepended - when not specified and when the path doesn't - start with a '/'. +More formally, the string is a series of comma-separated keyword/value +pairs, flags and positional parameters. Parameters which are not bare +keywords and which do not contain "=" symbols are assigned to the +so-far-unspecified positional parameters, in the order below. The +positional parameters may also be specified explicitly by name. + +Each parameter may be specified at most once, either as a positional +parameter or a named parameter. Default values apply if the parameter +is not specified, or if it is specified with an empty value (whether +positionally or explicitly). + +Whitespace may appear before each parameter and will be ignored. + + +===================== +POSITIONAL PARAMETERS +===================== + +target +------ + +Description: Block device or image file path. When this is + used as a path, /dev will be prepended + if the path doesn't start with a '/'. Supported values: N/A Deprecated values: N/A -Mandatory: No. While a path is provided in most cases - there is an exception. For a cdrom device, lack +Default value: None. While a path is provided in most cases + there is an exception: for a cdrom device, lack of this attribute would imply an empty cdrom drive. -vdev: +Special syntax: + + When this parameter is specified by name, ie with the "target=" + syntax in the configuration file, it consumes the whole rest of the + <diskspec>. Therefore in that case it must come last. This is + permissible even if an empty value for the target was already + specifed as a positional parameter. This is the only way to + specify a target string containing metacharacters such as commas + and (in some cases) colons, which would otherwise be + misinterpreted. + + Future parameter and flag names will start with an ascii letter and + contain only ascii alphanumerics, hyphens and underscores, and will + not be legal as vdevs. Targets which might match that syntax + should not be specified as positional parameters. + + +format +------ + +Description: Specifies the format of image file. +Supported values: raw, qcow, qcow2, vhd +Deprecated values: None +Default value: raw + + +vdev ---- Description: Virtual device as seen by the guest (also @@ -60,95 +101,105 @@ Description: Virtual device as seen by the guest (also Supported values: hd[x], xvd[x], sd[x] etc. Please refer to the above specification for further details. Deprecated values: None -Mandatory: Yes +Default Value: None, this parameter is mandatory. -type: ----- - -Description: Qualifies virtual device type. -Supported values: cdrom -Deprecated values: None -Mandatory: No -attrib: ------- +access +------- Description: Specified access control information. Whether or not the block device is provided to the guest in read-only or read-write mode depends on this attribute. -Supported values: 'r', 'w' +Supported values: ro, r (specifies read-only) + rw, w (specifies read/write) Deprecated values: None -Mandatory: Yes +Default value: rw + unless devtype=cdrom, in which case r --------------- -Example usages --------------- -disk = [ 'vhd:/path/to/dev,hda,w', '/path/to/iso,hdc:cdrom,r' ] -disk = [ 'path/to/phy/dev,hda,w', '/dev/cdrom,hdc:cdrom,r' ] -disk = [ 'qcow:/path/to/file,hda,w' ] -disk = [ 'qcow2:/path/to/file,hda,w', 'raw:/path/to/dev,hdc:cdrom,r' ] +========================== +OTHER PARAMETERS AND FLAGS +========================== -------------------------- -Miscellaneous Information -------------------------- +devtype=<devtype> +----------------- ---------------------- -Deprecated Attributes ---------------------- +Description: Qualifies virtual device type. +Supported values: cdrom +Deprecated values: None +Mandatory: No -Deprecated values are acceptable and will work the way they did -earlier except with a warning message printed to the xl log or screen. -However it's usage is supported purely for backward compatibility -purpose and not recommended. Also, support for these deprecated -attributes are likely to be dropped in future versions of xl. -The block-dev-type and access-type deprecated attributes described -below are prepended to the format attribute. Example - tap:aio:qcow -Further details on the deprecated attributes are below: +cdrom +----- -block-dev-type: --------------- +Convenience alias for "devtype=cdrom". -Description: Specifies the block device type. -Supported values: phy,file, tap, tap2 -access-type: ------------ +script=<script> +--------------- -Description: Backend implementation option to choose from - while accessing block device. - Example: tap:aio:vhd:/path/to/file -Supported values: 'aio', 'tapdisk', 'ioemu' +Specifies that <target> is not a normal host path, but rather +information to be interpreted by /etc/xen/scripts/block-<script>. ---------------------- -Impementation Details ---------------------- -Backend Details: ---------------- -For 'phy' block device type, blkback is always used as the backend. -When the running dom0 instance does not support blkback, block device -access will fail. For block device type 'file' with format raw or -when no format specfied, tapdisk2 is used when present otherwise qemu -fallback option is used. For 'file', 'tap' or 'tap2' block device -type with format 'vhd', only tapdisk2 is used as qemu does not support -vhd format. Absence of tapdisk2 support in this case will result in -failure. When it comes to image format and how that affects the -backend choice, for qcow/qcow2 qemu backend is used as tapdisk2 does -not work with these formats. For raw format image file, tapdisk2 is -used and when not available qemu backend is used as fallback. For vhd -format, as mentioned earlier tapdisk2 is used and tapdisk2 -unavailability will result in failure as qemu fallback option does not -support vhd file format. +================================== +DEPRECATED PARAMETERS AND PREFIXES +================================== + +Deprecated values are acceptable and are intended work compatibly with +xend and xl from xen 4.1. In future they may print a warning. +Support for deprecated parameters and syntaxes are likely to be +dropped in future versions of xl. + +There is also support for a deprecated old syntax for <diskspec>: + + [<format>:][<target>],<vdev>[:<devtype>],<access> (deprecated) + +This syntax also supports deprecated prefixes, described below. These +are found prepended to the format parameter - eg "tap:aio:qcow:". + + +<format>: +--------- + +Description: Specifies the format (deprecated) +Supported values: raw: qcow2: vhd: + +In xend and old versions of libxl it was necessary to specify the +format with a prefix. For compatibility, these three prefixes are +recognised as specifying the corresponding format. They are +equivalent to "format=<format>" or the specification of <format> +(without a colon) as a positional parameter. + + +<script>: +--------- +Description: Specifies the script (deprecated) +Supported values: iscsi: nbd: enbd: drbd: +In xend and old versions of libxl it was necessary to specify the +"script" (see above) with a prefix. For compatibility, these four +prefixes are recognised as specifying the corresponding script. They +are equivalent to "script=<script>". +<deprecated-prefix>: +-------------------- +Description; Deprecated prefix, ignored +Supported values: tapdisk: tap2: aio: ioemu: file: phy: +Various prefixes were required by xend and older versions of libxl to +make the block devices work. In some cases these options would +override the backend type, but in other cases they would be ignored in +favour of "making it work"; in yet other cases it would be necessary +to specify several of these, for example: + "tap:aio:/some/path..." +All of these prefixes are now stripped and ignored. -- 1.5.6.5 ^ permalink raw reply related [flat|nested] 49+ messages in thread
* [PATCH 5/9] xl: disks: replace config file disk spec parser with call to xlu_disk_parse 2011-06-02 17:55 ` [PATCH 4/9] docs: update xl-disk-configuration.txt to describe new syntax Ian Jackson @ 2011-06-02 17:55 ` Ian Jackson 2011-06-02 17:55 ` [PATCH 6/9] xl: disks: replace block-attach disk config parser with call to xlu_parse_disk Ian Jackson 2011-06-03 10:20 ` [PATCH 5/9] xl: disks: replace config file disk spec parser with call to xlu_disk_parse Ian Campbell 2011-06-03 10:19 ` [PATCH 4/9] docs: update xl-disk-configuration.txt to describe new syntax Ian Campbell 1 sibling, 2 replies; 49+ messages in thread From: Ian Jackson @ 2011-06-02 17:55 UTC (permalink / raw) To: xen-devel; +Cc: Ian Jackson Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com> --- tools/libxl/xl_cmdimpl.c | 163 ++++++--------------------------------------- 1 files changed, 22 insertions(+), 141 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index ecfcac4..63ac79a 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -477,148 +477,31 @@ static int parse_action_on_shutdown(const char *buf, libxl_action_on_shutdown *a #define DSTATE_RW 5 #define DSTATE_TERMINAL 6 -static int parse_disk_config(libxl_device_disk *disk, char *buf2) +static void parse_disk_config_multistring(XLU_Config **config, + int nspecs, const char *const *specs, + libxl_device_disk *disk) { - int state = DSTATE_INITIAL; - char *p, *end, *tok; + int e; memset(disk, 0, sizeof(*disk)); - for(tok = p = buf2, end = buf2 + strlen(buf2) + 1; p < end; p++) { - switch(state){ - case DSTATE_INITIAL: - if ( *p == ':' ) { - *p = '\0'; - if ( !strcmp(tok, "phy") ) { - state = DSTATE_PHYSPATH; - disk->format = LIBXL_DISK_FORMAT_RAW; - disk->backend = LIBXL_DISK_BACKEND_PHY; - }else if ( !strcmp(tok, "file") ) { - state = DSTATE_PHYSPATH; - disk->format = LIBXL_DISK_FORMAT_RAW; - disk->backend = LIBXL_DISK_BACKEND_TAP; - }else if ((!strcmp(tok, "tap")) || - (!strcmp(tok, "tap2"))) { - state = DSTATE_TAP; - }else{ - fprintf(stderr, "Unknown disk type: %s\n", tok); - return 0; - } - tok = p + 1; - } else if (*p == ',') { - state = DSTATE_VIRTPATH; - disk->format = LIBXL_DISK_FORMAT_EMPTY; - disk->backend = LIBXL_DISK_BACKEND_TAP; - disk->pdev_path = strdup(""); - tok = p + 1; - } - break; - case DSTATE_TAP: - if (*p == ',') { - disk->format = LIBXL_DISK_FORMAT_RAW; - disk->backend = LIBXL_DISK_BACKEND_TAP; - state = DSTATE_PHYSPATH; - } else if ( *p == ':' ) { - *p = '\0'; - if (!strcmp(tok, "aio")) { - tok = p + 1; - break; - } - if (!strcmp(tok, "vhd")) { - disk->format = LIBXL_DISK_FORMAT_VHD; - disk->backend = LIBXL_DISK_BACKEND_TAP; - }else if ( !strcmp(tok, "qcow") ) { - disk->format = LIBXL_DISK_FORMAT_QCOW; - disk->backend = LIBXL_DISK_BACKEND_QDISK; - }else if ( !strcmp(tok, "qcow2") ) { - disk->format = LIBXL_DISK_FORMAT_QCOW2; - disk->backend = LIBXL_DISK_BACKEND_QDISK; - }else if (!strcmp(tok, "raw")) { - disk->format = LIBXL_DISK_FORMAT_RAW; - disk->backend = LIBXL_DISK_BACKEND_TAP; - } - else { - fprintf(stderr, "Unknown tapdisk type: %s\n", tok); - return 0; - } - - tok = p + 1; - state = DSTATE_PHYSPATH; - break; - } else { - break; - } - case DSTATE_PHYSPATH: - if ( *p == ',' ) { - int ioemu_len; - - *p = '\0'; - disk->pdev_path = (*tok) ? strdup(tok) : NULL; - tok = p + 1; - - /* hack for ioemu disk spec */ - ioemu_len = strlen("ioemu:"); - state = DSTATE_VIRTPATH; - if ( tok + ioemu_len < end && - !strncmp(tok, "ioemu:", ioemu_len)) { - tok += ioemu_len; - p += ioemu_len; - } - } - break; - case DSTATE_VIRTPATH: - if ( *p == ',' || *p == ':' || *p == '\0' ) { - switch(*p) { - case ':': - state = DSTATE_VIRTTYPE; - break; - case ',': - state = DSTATE_RW; - break; - case '\0': - state = DSTATE_TERMINAL; - break; - } - if ( tok == p ) - goto out; - *p = '\0'; - disk->vdev = (*tok) ? strdup(tok) : NULL; - tok = p + 1; - } - break; - case DSTATE_VIRTTYPE: - if ( *p == ',' || *p == '\0' ) { - *p = '\0'; - if ( !strcmp(tok, "cdrom") ) { - disk->is_cdrom = 1; - disk->removable = 1; - }else{ - fprintf(stderr, "Unknown virtual disk type: %s\n", tok); - return 0; - } - tok = p + 1; - state = (*p == ',') ? DSTATE_RW : DSTATE_TERMINAL; - } - break; - case DSTATE_RW: - if ( *p == '\0' ) { - disk->readwrite = (tok[0] == 'w'); - tok = p + 1; - state = DSTATE_TERMINAL; - } - break; - case DSTATE_TERMINAL: - goto out; - } + if (!*config) { + *config = xlu_cfg_init(stderr, "command line"); + if (!*config) { perror("xlu_cfg_init"); exit(-1); } } -out: - if ( tok != p || state != DSTATE_TERMINAL ) { - fprintf(stderr, "parse error in disk config near '%s'\n", tok); - return 0; + e = xlu_disk_parse(*config, nspecs, specs, disk); + if (e == EINVAL) exit(-1); + if (e) { + fprintf(stderr,"xlu_disk_parse failed: %s\n",strerror(errno)); + exit(-1); } +} - return 1; +static void parse_disk_config(XLU_Config **config, const char *spec, + libxl_device_disk *disk) +{ + parse_disk_config_multistring(config, 1, &spec, disk); } static void parse_config_data(const char *configfile_filename_report, @@ -835,9 +718,7 @@ static void parse_config_data(const char *configfile_filename_report, d_config->disks = (libxl_device_disk *) realloc(d_config->disks, sizeof (libxl_device_disk) * (d_config->num_disks + 1)); disk = d_config->disks + d_config->num_disks; - if ( !parse_disk_config(disk, buf2) ) { - exit(1); - } + parse_disk_config(&config, buf2, disk); free(buf2); d_config->num_disks++; @@ -1919,6 +1800,7 @@ static void cd_insert(const char *dom, const char *virtdev, char *phys) { libxl_device_disk disk; /* we don't free disk's contents */ char *buf = NULL; + XLU_Config *config = 0; find_domain(dom); @@ -1926,10 +1808,9 @@ static void cd_insert(const char *dom, const char *virtdev, char *phys) fprintf(stderr, "out of memory\n"); return; } - if (!parse_disk_config(&disk, buf)) { - fprintf(stderr, "format error\n"); - return; - } + + parse_disk_config(&config, buf, &disk); + disk.backend_domid = 0; libxl_cdrom_insert(ctx, domid, &disk); -- 1.5.6.5 ^ permalink raw reply related [flat|nested] 49+ messages in thread
* [PATCH 6/9] xl: disks: replace block-attach disk config parser with call to xlu_parse_disk 2011-06-02 17:55 ` [PATCH 5/9] xl: disks: replace config file disk spec parser with call to xlu_disk_parse Ian Jackson @ 2011-06-02 17:55 ` Ian Jackson 2011-06-02 17:55 ` [PATCH 7/9] libxl: disks: allow specification of "backendtype=phy|tap|qdisk" Ian Jackson 2011-06-03 10:21 ` [PATCH 6/9] xl: disks: replace block-attach disk config parser with call to xlu_parse_disk Ian Campbell 2011-06-03 10:20 ` [PATCH 5/9] xl: disks: replace config file disk spec parser with call to xlu_disk_parse Ian Campbell 1 sibling, 2 replies; 49+ messages in thread From: Ian Jackson @ 2011-06-02 17:55 UTC (permalink / raw) To: xen-devel; +Cc: Ian Jackson Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com> --- tools/libxl/xl_cmdimpl.c | 50 ++++++-------------------------------------- tools/libxl/xl_cmdtable.c | 2 +- 2 files changed, 8 insertions(+), 44 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 63ac79a..d2e343d 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -4019,62 +4019,26 @@ int main_networkdetach(int argc, char **argv) int main_blockattach(int argc, char **argv) { int opt; - const char *tok; uint32_t fe_domid, be_domid = 0; libxl_device_disk disk = { 0 }; + XLU_Config *config = 0; if ((opt = def_getopt(argc, argv, "", "block-attach", 2)) != -1) return opt; - if (argc-optind > 5) { + if ((argc-optind < 2)) { help("block-attach"); return 2; } - tok = strtok(argv[optind+1], ":"); - if (!strcmp(tok, "phy")) { - disk.backend = LIBXL_DISK_BACKEND_PHY; - } else if (!strcmp(tok, "file")) { - disk.backend = LIBXL_DISK_BACKEND_TAP; - } else if (!strcmp(tok, "tap")) { - tok = strtok(NULL, ":"); - if (!strcmp(tok, "aio")) { - disk.backend = LIBXL_DISK_BACKEND_TAP; - } else if (!strcmp(tok, "vhd")) { - disk.format = LIBXL_DISK_FORMAT_VHD; - disk.backend = LIBXL_DISK_BACKEND_TAP; - } else if (!strcmp(tok, "qcow")) { - disk.format = LIBXL_DISK_FORMAT_QCOW; - disk.backend = LIBXL_DISK_BACKEND_QDISK; - } else if (!strcmp(tok, "qcow2")) { - disk.format = LIBXL_DISK_FORMAT_QCOW2; - disk.backend = LIBXL_DISK_BACKEND_QDISK; - } else { - fprintf(stderr, "Error: `%s' is not a valid disk image.\n", tok); - return 1; - } - } else { - fprintf(stderr, "Error: `%s' is not a valid block device.\n", tok); - return 1; - } - disk.pdev_path = strtok(NULL, "\0"); - if (!disk.pdev_path) { - fprintf(stderr, "Error: missing path to disk image.\n"); - return 1; - } - disk.vdev = argv[optind+2]; - disk.removable = 1; - disk.readwrite = ((argc-optind <= 3) || (argv[optind+3][0] == 'w')); - if (domain_qualifier_to_domid(argv[optind], &fe_domid, 0) < 0) { fprintf(stderr, "%s is an invalid domain identifier\n", argv[optind]); return 1; } - if (argc-optind == 5) { - if (domain_qualifier_to_domid(argv[optind+4], &be_domid, 0) < 0) { - fprintf(stderr, "%s is an invalid domain identifier\n", argv[optind+4]); - return 1; - } - } + optind++; + + parse_disk_config_multistring + (&config, argc-optind, (const char* const*)argv + optind, &disk); + disk.backend_domid = be_domid; if (libxl_device_disk_add(ctx, fe_domid, &disk)) { diff --git a/tools/libxl/xl_cmdtable.c b/tools/libxl/xl_cmdtable.c index 044c24d..a899803 100644 --- a/tools/libxl/xl_cmdtable.c +++ b/tools/libxl/xl_cmdtable.c @@ -257,7 +257,7 @@ struct cmd_spec cmd_table[] = { { "block-attach", &main_blockattach, "Create a new virtual block device", - "<Domain> <BackDev> <FrontDev> [<Mode>] [BackDomain]", + "<Domain> <disk-spec-component(s)>...", }, { "block-list", &main_blocklist, -- 1.5.6.5 ^ permalink raw reply related [flat|nested] 49+ messages in thread
* [PATCH 7/9] libxl: disks: allow specification of "backendtype=phy|tap|qdisk" 2011-06-02 17:55 ` [PATCH 6/9] xl: disks: replace block-attach disk config parser with call to xlu_parse_disk Ian Jackson @ 2011-06-02 17:55 ` Ian Jackson 2011-06-02 17:55 ` [PATCH 8/9] xl: xl block-attach -N (dry run) option Ian Jackson 2011-06-03 10:27 ` [PATCH 7/9] libxl: disks: allow specification of "backendtype=phy|tap|qdisk" Ian Campbell 2011-06-03 10:21 ` [PATCH 6/9] xl: disks: replace block-attach disk config parser with call to xlu_parse_disk Ian Campbell 1 sibling, 2 replies; 49+ messages in thread From: Ian Jackson @ 2011-06-02 17:55 UTC (permalink / raw) To: xen-devel; +Cc: Ian Jackson, Ian Jackson Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com> --- docs/misc/xl-disk-configuration.txt | 17 + tools/libxl/libxlu_disk_l.c | 690 +++++++++++++++++++---------------- tools/libxl/libxlu_disk_l.h | 2 +- tools/libxl/libxlu_disk_l.l | 9 + 4 files changed, 395 insertions(+), 323 deletions(-) diff --git a/docs/misc/xl-disk-configuration.txt b/docs/misc/xl-disk-configuration.txt index de0a75e..91e0cc7 100644 --- a/docs/misc/xl-disk-configuration.txt +++ b/docs/misc/xl-disk-configuration.txt @@ -139,6 +139,23 @@ cdrom Convenience alias for "devtype=cdrom". +backendtype=<backend-type> +-------------------------- + +Description: Specifies the backend implementation to use +Supported values: phy, tap, qdisk +Mandatory: No +Default value: Automatically determine which backend to use. + +This does not affect the guest's view of the device. It controls +which software implementation of the Xen backend driver us used. + +Not all backend drivers support all combinations of other options. +For example, "phy" does not support formats other than "raw". +Normally this option should not be specified, in which case libxl will +automatically determine the most suitable backend. + + script=<script> --------------- diff --git a/tools/libxl/libxlu_disk_l.c b/tools/libxl/libxlu_disk_l.c index e653d8d..14d3dce 100644 --- a/tools/libxl/libxlu_disk_l.c +++ b/tools/libxl/libxlu_disk_l.c @@ -357,8 +357,8 @@ static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner ); *yy_cp = '\0'; \ yyg->yy_c_buf_p = yy_cp; -#define YY_NUM_RULES 24 -#define YY_END_OF_BUFFER 25 +#define YY_NUM_RULES 25 +#define YY_END_OF_BUFFER 26 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -366,86 +366,90 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_acclist[436] = +static yyconst flex_int16_t yy_acclist[453] = { 0, - 23, 23, 25, 21, 22, 24, 8193, 21, 22, 24, - 16385, 8193, 21, 24,16385, 21, 22, 24, 22, 24, - 21, 22, 24, 21, 22, 24, 21, 22, 24, 21, - 22, 24, 21, 22, 24, 21, 22, 24, 21, 22, - 24, 21, 22, 24, 21, 22, 24, 21, 22, 24, - 21, 22, 24, 21, 22, 24, 21, 22, 24, 21, - 22, 24, 23, 24, 24, 21, 21, 8193, 21, 8193, - 21,16385, 8193, 21, 8193, 21, 21, 8212, 21,16404, - 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, - 21, 21, 21, 21, 21, 21, 21, 23, 8193, 21, - - 8193, 21, 8193, 8212, 21, 8212, 21, 8212, 11, 21, - 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, - 21, 21, 21, 21, 21, 8212, 21, 8212, 21, 8212, - 11, 21, 16, 8212, 21,16404, 21, 21, 21, 21, - 21, 21, 8212, 21,16404, 19, 8212, 21,16404, 21, - 8204, 8212, 21,16396,16404, 21, 21, 8207, 8212, 21, - 16399,16404, 21, 21, 21, 21, 16, 8212, 21, 16, - 8212, 21, 16, 21, 16, 8212, 3, 21, 21, 18, - 8212, 21,16404, 21, 21, 21, 21, 19, 8212, 21, - 19, 8212, 21, 19, 21, 19, 8212, 8204, 8212, 21, - - 8204, 8212, 21, 8204, 21, 8204, 8212, 21, 8207, 8212, - 21, 8207, 8212, 21, 8207, 21, 8207, 8212, 21, 21, - 8, 21, 16, 8212, 21, 16, 8212, 21, 16, 8212, - 16, 21, 16, 3, 21, 21, 18, 8212, 21, 18, - 8212, 21, 18, 21, 18, 8212, 21, 17, 8212, 21, - 16404, 8205, 8212, 21,16397,16404, 21, 19, 8212, 21, - 19, 8212, 21, 19, 8212, 19, 21, 19, 8204, 8212, - 21, 8204, 8212, 21, 8204, 8212, 8204, 21, 8204, 21, - 8207, 8212, 21, 8207, 8212, 21, 8207, 8212, 8207, 21, - 8207, 21, 21, 8, 11, 8, 7, 21, 18, 8212, - - 21, 18, 8212, 21, 18, 8212, 18, 21, 18, 2, - 17, 8212, 21, 17, 8212, 21, 17, 21, 17, 8212, - 8205, 8212, 21, 8205, 8212, 21, 8205, 21, 8205, 8212, - 21, 9, 21, 10, 8, 8, 11, 7, 11, 7, - 6, 2, 11, 2, 17, 8212, 21, 17, 8212, 21, - 17, 8212, 17, 21, 17, 8205, 8212, 21, 8205, 8212, - 21, 8205, 8212, 8205, 21, 8205, 21, 9, 11, 9, - 14, 8212, 21,16404, 10, 11, 10, 7, 7, 11, - 6, 11, 6, 6, 11, 6, 11, 2, 2, 11, - 8205, 21,16397, 9, 9, 11, 14, 8212, 21, 14, - - 8212, 21, 14, 21, 14, 8212, 10, 11, 6, 6, - 11, 6, 6, 14, 8212, 21, 14, 8212, 21, 14, - 8212, 14, 21, 14, 6, 6, 6, 5, 6, 4, - 6, 5, 6, 4, 6 + 24, 24, 26, 22, 23, 25, 8193, 22, 23, 25, + 16385, 8193, 22, 25,16385, 22, 23, 25, 23, 25, + 22, 23, 25, 22, 23, 25, 22, 23, 25, 22, + 23, 25, 22, 23, 25, 22, 23, 25, 22, 23, + 25, 22, 23, 25, 22, 23, 25, 22, 23, 25, + 22, 23, 25, 22, 23, 25, 22, 23, 25, 22, + 23, 25, 22, 23, 25, 24, 25, 25, 22, 22, + 8193, 22, 8193, 22,16385, 8193, 22, 8193, 22, 22, + 8213, 22,16405, 22, 22, 22, 22, 22, 22, 22, + 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, + + 22, 24, 8193, 22, 8193, 22, 8193, 8213, 22, 8213, + 22, 8213, 12, 22, 22, 22, 22, 22, 22, 22, + 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, + 8213, 22, 8213, 22, 8213, 12, 22, 17, 8213, 22, + 16405, 22, 22, 22, 22, 22, 22, 22, 8213, 22, + 16405, 20, 8213, 22,16405, 22, 8205, 8213, 22,16397, + 16405, 22, 22, 8208, 8213, 22,16400,16405, 22, 22, + 22, 22, 17, 8213, 22, 17, 8213, 22, 17, 22, + 17, 8213, 22, 3, 22, 22, 19, 8213, 22,16405, + 22, 22, 22, 22, 20, 8213, 22, 20, 8213, 22, + + 20, 22, 20, 8213, 8205, 8213, 22, 8205, 8213, 22, + 8205, 22, 8205, 8213, 22, 8208, 8213, 22, 8208, 8213, + 22, 8208, 22, 8208, 8213, 22, 22, 9, 22, 17, + 8213, 22, 17, 8213, 22, 17, 8213, 17, 22, 17, + 22, 3, 22, 22, 19, 8213, 22, 19, 8213, 22, + 19, 22, 19, 8213, 22, 18, 8213, 22,16405, 8206, + 8213, 22,16398,16405, 22, 20, 8213, 22, 20, 8213, + 22, 20, 8213, 20, 22, 20, 8205, 8213, 22, 8205, + 8213, 22, 8205, 8213, 8205, 22, 8205, 22, 8208, 8213, + 22, 8208, 8213, 22, 8208, 8213, 8208, 22, 8208, 22, + + 22, 9, 12, 9, 7, 22, 22, 19, 8213, 22, + 19, 8213, 22, 19, 8213, 19, 22, 19, 2, 18, + 8213, 22, 18, 8213, 22, 18, 22, 18, 8213, 8206, + 8213, 22, 8206, 8213, 22, 8206, 22, 8206, 8213, 22, + 10, 22, 11, 9, 9, 12, 7, 12, 7, 22, + 6, 2, 12, 2, 18, 8213, 22, 18, 8213, 22, + 18, 8213, 18, 22, 18, 8206, 8213, 22, 8206, 8213, + 22, 8206, 8213, 8206, 22, 8206, 22, 10, 12, 10, + 15, 8213, 22,16405, 11, 12, 11, 7, 7, 12, + 22, 6, 12, 6, 6, 12, 6, 12, 2, 2, + + 12, 8206, 22,16398, 10, 10, 12, 15, 8213, 22, + 15, 8213, 22, 15, 22, 15, 8213, 11, 12, 22, + 6, 6, 12, 6, 6, 15, 8213, 22, 15, 8213, + 22, 15, 8213, 15, 22, 15, 22, 6, 6, 8, + 6, 5, 6, 8, 12, 4, 6, 5, 6, 8, + 4, 6 } ; -static yyconst flex_int16_t yy_accept[241] = +static yyconst flex_int16_t yy_accept[255] = { 0, 1, 1, 1, 2, 3, 4, 7, 12, 16, 19, 21, 24, 27, 30, 33, 36, 39, 42, 45, 48, - 51, 54, 57, 60, 63, 65, 66, 67, 68, 70, - 73, 75, 76, 77, 78, 81, 81, 82, 83, 84, - 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, - 95, 96, 97, 98, 99, 101, 103, 104, 106, 108, - 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, - 119, 120, 121, 122, 123, 124, 125, 126, 128, 130, - 131, 132, 133, 137, 138, 139, 140, 141, 142, 143, - 146, 150, 151, 156, 157, 158, 163, 164, 165, 166, - - 167, 170, 173, 175, 177, 179, 180, 184, 185, 186, - 187, 188, 191, 194, 196, 198, 201, 204, 206, 208, - 209, 212, 215, 217, 219, 220, 221, 222, 223, 226, - 229, 231, 233, 234, 236, 237, 240, 243, 245, 247, - 248, 252, 257, 258, 261, 264, 266, 268, 269, 272, - 275, 277, 279, 280, 281, 284, 287, 289, 291, 292, - 293, 294, 296, 297, 298, 299, 302, 305, 307, 309, - 310, 311, 314, 317, 319, 321, 324, 327, 329, 331, - 332, 333, 334, 335, 336, 338, 340, 341, 342, 344, - 345, 348, 351, 353, 355, 356, 359, 362, 364, 366, - - 367, 368, 370, 371, 375, 377, 378, 379, 381, 383, - 384, 386, 388, 389, 391, 394, 395, 397, 400, 403, - 405, 407, 409, 410, 412, 413, 414, 417, 420, 422, - 424, 425, 426, 427, 428, 430, 432, 434, 436, 436 + 51, 54, 57, 60, 63, 66, 68, 69, 70, 71, + 73, 76, 78, 79, 80, 81, 84, 84, 85, 86, + 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, + 97, 98, 99, 100, 101, 102, 103, 105, 107, 108, + 110, 112, 113, 114, 115, 116, 117, 118, 119, 120, + 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, + 131, 133, 135, 136, 137, 138, 142, 143, 144, 145, + 146, 147, 148, 149, 152, 156, 157, 162, 163, 164, + + 169, 170, 171, 172, 173, 176, 179, 181, 183, 184, + 186, 187, 191, 192, 193, 194, 195, 198, 201, 203, + 205, 208, 211, 213, 215, 216, 219, 222, 224, 226, + 227, 228, 229, 230, 233, 236, 238, 240, 241, 242, + 244, 245, 248, 251, 253, 255, 256, 260, 265, 266, + 269, 272, 274, 276, 277, 280, 283, 285, 287, 288, + 289, 292, 295, 297, 299, 300, 301, 302, 304, 305, + 306, 307, 308, 311, 314, 316, 318, 319, 320, 323, + 326, 328, 330, 333, 336, 338, 340, 341, 342, 343, + 344, 345, 347, 349, 350, 351, 352, 354, 355, 358, + + 361, 363, 365, 366, 369, 372, 374, 376, 377, 378, + 380, 381, 385, 387, 388, 389, 391, 392, 394, 395, + 397, 399, 400, 402, 405, 406, 408, 411, 414, 416, + 418, 420, 421, 422, 424, 425, 426, 429, 432, 434, + 436, 437, 438, 439, 440, 441, 442, 444, 446, 448, + 450, 451, 453, 453 } ; static yyconst flex_int32_t yy_ec[256] = @@ -488,214 +492,242 @@ static yyconst flex_int32_t yy_meta[34] = 1, 1, 1 } ; -static yyconst flex_int16_t yy_base[295] = +static yyconst flex_int16_t yy_base[311] = { 0, - 0, 0, 545, 544, 546, 541, 32, 35, 549, 549, - 44, 62, 531, 529, 519, 33, 26, 530, 523, 527, - 528, 525, 526, 42, 0, 549, 531, 549, 65, 73, - 0, 0, 82, 0, 91, 0, 522, 509, 505, 500, - 519, 508, 501, 513, 514, 512, 491, 499, 490, 494, - 15, 506, 506, 0, 69, 0, 0, 94, 0, 0, - 514, 503, 508, 491, 485, 499, 490, 489, 482, 501, - 500, 475, 498, 487, 94, 488, 472, 101, 0, 0, - 549, 474, 110, 477, 462, 475, 461, 437, 425, 422, - 119, 53, 128, 398, 403, 137, 389, 389, 382, 355, - - 140, 0, 144, 0, 371, 342, 153, 330, 339, 315, - 54, 156, 0, 160, 0, 163, 0, 167, 0, 287, - 170, 0, 174, 0, 279, 270, 277, 271, 177, 0, - 0, 0, 0, 549, 265, 181, 0, 184, 0, 269, - 193, 202, 76, 205, 0, 0, 0, 0, 209, 0, - 0, 0, 0, 268, 212, 0, 0, 0, 0, 256, - 266, 270, 549, 269, 263, 216, 0, 0, 0, 0, - 267, 219, 0, 223, 0, 226, 0, 230, 0, 75, - 265, 260, 105, 241, 549, 234, 549, 113, 227, 549, - 233, 0, 0, 0, 0, 237, 0, 0, 0, 0, - - 239, 220, 549, 247, 196, 0, 148, 549, 147, 549, - 178, 171, 131, 549, 250, 112, 549, 254, 0, 257, - 0, 0, 102, 549, 240, 164, 261, 0, 0, 0, - 0, 258, 130, 195, 85, 39, 549, 549, 549, 282, - 286, 289, 293, 297, 301, 305, 309, 313, 317, 321, - 325, 329, 333, 337, 341, 345, 349, 353, 357, 361, - 365, 369, 373, 377, 381, 385, 389, 393, 397, 401, - 405, 409, 413, 417, 421, 425, 429, 433, 437, 441, - 445, 449, 453, 457, 461, 465, 469, 473, 477, 481, - 485, 489, 493, 497 - + 0, 0, 560, 556, 555, 539, 32, 35, 662, 662, + 44, 62, 30, 40, 32, 50, 525, 49, 47, 59, + 68, 517, 69, 509, 72, 0, 662, 507, 662, 83, + 91, 0, 0, 100, 489, 109, 0, 78, 51, 86, + 89, 74, 96, 105, 109, 110, 111, 112, 117, 73, + 119, 118, 121, 120, 122, 0, 134, 0, 0, 138, + 0, 0, 471, 130, 144, 129, 143, 145, 146, 147, + 148, 149, 153, 154, 155, 158, 161, 165, 166, 170, + 180, 0, 0, 662, 171, 201, 176, 175, 178, 183, + 458, 182, 190, 446, 212, 188, 221, 208, 224, 234, + + 209, 230, 236, 221, 244, 0, 247, 0, 184, 248, + 244, 269, 231, 247, 251, 258, 272, 0, 279, 0, + 283, 0, 286, 0, 255, 290, 0, 293, 0, 270, + 281, 447, 254, 297, 0, 0, 0, 0, 294, 662, + 295, 308, 0, 310, 0, 257, 319, 328, 304, 331, + 0, 0, 0, 0, 335, 0, 0, 0, 0, 316, + 338, 0, 0, 0, 0, 333, 336, 429, 662, 428, + 338, 340, 348, 0, 0, 0, 0, 427, 351, 0, + 355, 0, 359, 0, 362, 0, 357, 426, 308, 369, + 425, 662, 423, 662, 346, 365, 421, 662, 371, 0, + + 0, 0, 0, 378, 0, 0, 0, 0, 380, 420, + 662, 388, 419, 0, 418, 662, 373, 417, 662, 372, + 382, 416, 662, 398, 415, 662, 400, 0, 402, 0, + 0, 385, 264, 662, 390, 275, 409, 0, 0, 0, + 0, 405, 404, 406, 0, 412, 224, 129, 87, 662, + 47, 662, 662, 434, 438, 441, 445, 449, 453, 457, + 461, 465, 469, 473, 477, 481, 485, 489, 493, 497, + 501, 505, 509, 513, 517, 521, 525, 529, 533, 537, + 541, 545, 549, 553, 557, 561, 565, 569, 573, 577, + 581, 585, 589, 593, 597, 601, 605, 609, 613, 617, + + 621, 625, 629, 633, 637, 641, 645, 649, 653, 657 } ; -static yyconst flex_int16_t yy_def[295] = +static yyconst flex_int16_t yy_def[311] = { 0, - 239, 1, 240, 240, 239, 241, 242, 242, 239, 239, - 243, 243, 12, 12, 12, 12, 12, 12, 12, 12, - 12, 12, 12, 12, 244, 239, 241, 239, 245, 242, - 246, 246, 247, 12, 241, 248, 12, 12, 12, 12, + 253, 1, 254, 254, 253, 255, 256, 256, 253, 253, + 257, 257, 12, 12, 12, 12, 12, 12, 12, 12, + 12, 12, 12, 12, 12, 258, 253, 255, 253, 259, + 256, 260, 260, 261, 12, 255, 262, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, - 12, 12, 12, 244, 245, 246, 246, 249, 250, 250, - 239, 12, 12, 12, 12, 12, 12, 12, 12, 12, - 12, 12, 12, 12, 12, 12, 12, 249, 250, 250, - 239, 12, 251, 12, 12, 12, 12, 12, 12, 35, - 252, 12, 253, 12, 12, 254, 12, 12, 12, 12, - - 255, 256, 251, 256, 12, 12, 257, 12, 12, 12, - 241, 258, 259, 252, 259, 260, 261, 253, 261, 12, - 262, 263, 254, 263, 12, 12, 264, 12, 255, 256, - 256, 265, 265, 239, 12, 266, 267, 257, 267, 12, - 268, 269, 241, 258, 259, 259, 270, 270, 260, 261, - 261, 271, 271, 12, 262, 263, 263, 272, 272, 12, - 12, 273, 239, 274, 12, 266, 267, 267, 275, 275, - 276, 277, 278, 268, 278, 279, 280, 269, 280, 241, - 281, 12, 282, 273, 239, 283, 239, 284, 285, 239, - 277, 278, 278, 286, 286, 279, 280, 280, 287, 287, - - 241, 288, 239, 289, 290, 290, 283, 239, 291, 239, - 291, 291, 285, 239, 269, 288, 239, 292, 293, 289, - 293, 290, 291, 239, 291, 291, 292, 293, 293, 294, - 294, 291, 291, 291, 291, 291, 239, 239, 0, 239, - 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, - 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, - 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, - 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, - 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, - 239, 239, 239, 239 - + 12, 12, 12, 12, 12, 258, 259, 260, 260, 263, + 264, 264, 253, 12, 12, 12, 12, 12, 12, 12, + 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, + 263, 264, 264, 253, 12, 265, 12, 12, 12, 12, + 12, 12, 12, 36, 266, 12, 267, 12, 12, 268, + + 12, 12, 12, 12, 269, 270, 265, 270, 12, 12, + 12, 271, 12, 12, 12, 255, 272, 273, 266, 273, + 274, 275, 267, 275, 12, 276, 277, 268, 277, 12, + 12, 278, 12, 269, 270, 270, 279, 279, 12, 253, + 12, 280, 281, 271, 281, 12, 282, 283, 255, 272, + 273, 273, 284, 284, 274, 275, 275, 285, 285, 12, + 276, 277, 277, 286, 286, 12, 12, 287, 253, 288, + 12, 12, 280, 281, 281, 289, 289, 290, 291, 292, + 282, 292, 293, 294, 283, 294, 255, 295, 12, 296, + 287, 253, 297, 253, 12, 298, 299, 253, 291, 292, + + 292, 300, 300, 293, 294, 294, 301, 301, 255, 302, + 253, 303, 304, 304, 297, 253, 12, 305, 253, 305, + 305, 299, 253, 283, 302, 253, 306, 307, 303, 307, + 304, 12, 305, 253, 305, 305, 306, 307, 307, 308, + 308, 12, 305, 305, 309, 305, 305, 310, 305, 253, + 310, 253, 0, 253, 253, 253, 253, 253, 253, 253, + 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, + 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, + 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, + 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, + + 253, 253, 253, 253, 253, 253, 253, 253, 253, 253 } ; -static yyconst flex_int16_t yy_nxt[583] = +static yyconst flex_int16_t yy_nxt[696] = { 0, 6, 7, 8, 9, 6, 6, 6, 6, 10, 11, - 12, 13, 14, 15, 16, 12, 12, 17, 12, 12, - 12, 12, 18, 12, 19, 20, 21, 22, 23, 12, - 24, 12, 12, 30, 30, 31, 30, 30, 31, 75, - 32, 76, 238, 32, 27, 27, 27, 28, 33, 44, - 42, 35, 36, 45, 52, 37, 43, 28, 53, 73, - 93, 38, 27, 27, 27, 28, 33, 27, 56, 35, - 36, 27, 56, 57, 30, 30, 31, 57, 28, 28, - 143, 32, 27, 27, 27, 28, 180, 201, 237, 27, - 36, 58, 58, 58, 59, 58, 27, 79, 58, 60, - - 95, 96, 80, 27, 79, 210, 97, 61, 206, 80, - 101, 101, 58, 102, 101, 203, 210, 101, 104, 112, - 112, 58, 113, 112, 211, 212, 112, 115, 116, 116, - 58, 117, 116, 210, 190, 116, 119, 121, 121, 58, - 122, 121, 27, 130, 121, 124, 27, 132, 131, 235, - 224, 187, 133, 136, 136, 58, 137, 136, 27, 145, - 136, 139, 27, 147, 146, 27, 150, 210, 148, 27, - 152, 151, 27, 156, 224, 153, 27, 158, 157, 27, - 130, 224, 159, 27, 167, 131, 27, 169, 226, 168, - 225, 233, 170, 172, 172, 58, 173, 172, 210, 222, - - 172, 175, 176, 176, 58, 177, 176, 27, 145, 176, - 179, 27, 150, 146, 27, 156, 236, 151, 27, 167, - 157, 27, 192, 217, 168, 27, 194, 193, 27, 197, - 214, 195, 27, 199, 198, 27, 192, 208, 200, 27, - 197, 193, 28, 210, 163, 198, 215, 218, 218, 58, - 219, 218, 27, 199, 218, 221, 27, 228, 200, 27, - 230, 210, 229, 27, 228, 231, 232, 204, 203, 229, - 190, 188, 187, 185, 183, 182, 181, 171, 165, 164, - 163, 234, 25, 25, 25, 25, 27, 27, 27, 29, - 29, 29, 29, 34, 34, 34, 34, 54, 161, 54, - - 54, 55, 55, 55, 55, 57, 160, 57, 57, 33, - 33, 33, 33, 61, 61, 154, 61, 78, 78, 78, - 78, 80, 142, 80, 80, 103, 103, 103, 103, 114, - 114, 114, 114, 118, 118, 118, 118, 123, 123, 123, - 123, 129, 129, 129, 129, 131, 141, 131, 131, 138, - 138, 138, 138, 144, 144, 144, 144, 146, 140, 146, - 146, 149, 149, 149, 149, 151, 135, 151, 151, 155, - 155, 155, 155, 157, 134, 157, 157, 162, 162, 162, - 162, 133, 128, 133, 133, 166, 166, 166, 166, 168, - 127, 168, 168, 174, 174, 174, 174, 178, 178, 178, - - 178, 148, 126, 148, 148, 153, 125, 153, 153, 159, - 96, 159, 159, 184, 184, 184, 184, 186, 186, 186, - 186, 170, 120, 170, 170, 189, 189, 189, 189, 191, - 191, 191, 191, 193, 111, 193, 193, 196, 196, 196, - 196, 198, 110, 198, 198, 202, 202, 202, 202, 205, - 205, 205, 205, 207, 207, 207, 207, 209, 209, 209, - 209, 213, 213, 213, 213, 195, 109, 195, 195, 200, - 108, 200, 200, 216, 216, 216, 216, 220, 220, 220, - 220, 206, 107, 206, 206, 223, 223, 223, 223, 227, - 227, 227, 227, 229, 106, 229, 229, 231, 105, 231, - - 231, 100, 99, 98, 94, 93, 92, 91, 90, 89, - 88, 87, 86, 85, 84, 83, 82, 81, 73, 77, - 74, 73, 72, 71, 70, 69, 68, 67, 66, 46, - 65, 64, 63, 62, 28, 51, 50, 49, 48, 47, - 46, 41, 40, 39, 28, 239, 26, 26, 5, 239, - 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, - 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, - 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, - 239, 239 + 12, 13, 14, 15, 16, 17, 17, 18, 17, 17, + 17, 17, 19, 17, 20, 21, 22, 23, 24, 17, + 25, 17, 17, 31, 31, 32, 31, 31, 32, 35, + 33, 35, 41, 33, 28, 28, 28, 29, 34, 35, + 253, 36, 37, 42, 43, 38, 35, 48, 35, 35, + 35, 39, 28, 28, 28, 29, 34, 44, 35, 36, + 37, 40, 46, 45, 65, 49, 47, 35, 35, 50, + 52, 35, 35, 35, 54, 28, 58, 35, 55, 64, + 252, 59, 31, 31, 32, 35, 75, 66, 35, 33, + + 28, 28, 28, 29, 68, 35, 48, 28, 37, 60, + 60, 60, 61, 60, 35, 67, 60, 62, 35, 35, + 35, 35, 72, 71, 73, 69, 35, 35, 35, 35, + 35, 35, 84, 80, 76, 70, 28, 58, 35, 35, + 28, 82, 59, 85, 77, 78, 83, 79, 87, 74, + 76, 86, 35, 35, 35, 35, 35, 35, 35, 90, + 94, 95, 35, 35, 35, 97, 88, 35, 91, 92, + 35, 99, 100, 89, 35, 35, 93, 101, 98, 35, + 35, 102, 28, 82, 35, 35, 96, 35, 83, 109, + 112, 35, 35, 35, 76, 97, 110, 35, 104, 35, + + 103, 105, 105, 60, 106, 105, 139, 115, 105, 108, + 111, 114, 117, 117, 60, 118, 117, 35, 35, 117, + 120, 121, 121, 60, 122, 121, 130, 250, 121, 124, + 35, 100, 125, 35, 126, 126, 60, 127, 126, 35, + 35, 126, 129, 131, 132, 35, 28, 135, 133, 28, + 137, 140, 136, 35, 147, 138, 35, 35, 148, 146, + 35, 29, 170, 35, 35, 178, 35, 219, 141, 142, + 142, 60, 143, 142, 28, 151, 142, 145, 219, 35, + 152, 28, 153, 160, 149, 28, 156, 154, 28, 158, + 35, 157, 28, 162, 159, 28, 164, 166, 163, 28, + + 135, 165, 244, 35, 35, 136, 171, 29, 172, 167, + 28, 174, 28, 176, 187, 212, 175, 35, 177, 179, + 179, 60, 180, 179, 188, 35, 179, 182, 183, 183, + 60, 184, 183, 28, 151, 183, 186, 28, 156, 152, + 28, 162, 35, 157, 190, 35, 163, 35, 196, 35, + 28, 174, 189, 28, 200, 35, 175, 28, 202, 201, + 29, 28, 205, 203, 28, 207, 195, 206, 219, 209, + 208, 63, 214, 28, 200, 234, 220, 221, 217, 201, + 28, 205, 35, 29, 235, 234, 206, 224, 227, 227, + 60, 228, 227, 219, 35, 227, 230, 232, 242, 236, + + 28, 207, 28, 238, 28, 240, 208, 219, 239, 219, + 241, 28, 238, 245, 35, 219, 243, 239, 211, 198, + 234, 194, 231, 226, 223, 247, 216, 246, 169, 211, + 198, 194, 192, 249, 26, 26, 26, 26, 28, 28, + 28, 30, 30, 30, 30, 35, 35, 35, 35, 56, + 169, 56, 56, 57, 57, 57, 57, 59, 116, 59, + 59, 34, 34, 34, 34, 63, 63, 113, 63, 81, + 81, 81, 81, 83, 84, 83, 83, 107, 107, 107, + 107, 119, 119, 119, 119, 123, 123, 123, 123, 128, + 128, 128, 128, 134, 134, 134, 134, 136, 35, 136, + + 136, 144, 144, 144, 144, 150, 150, 150, 150, 152, + 29, 152, 152, 155, 155, 155, 155, 157, 53, 157, + 157, 161, 161, 161, 161, 163, 51, 163, 163, 168, + 168, 168, 168, 138, 35, 138, 138, 173, 173, 173, + 173, 175, 29, 175, 175, 181, 181, 181, 181, 185, + 185, 185, 185, 154, 253, 154, 154, 159, 27, 159, + 159, 165, 27, 165, 165, 191, 191, 191, 191, 193, + 193, 193, 193, 177, 253, 177, 177, 197, 197, 197, + 197, 199, 199, 199, 199, 201, 253, 201, 201, 204, + 204, 204, 204, 206, 253, 206, 206, 210, 210, 210, + + 210, 213, 213, 213, 213, 215, 215, 215, 215, 218, + 218, 218, 218, 222, 222, 222, 222, 203, 253, 203, + 203, 208, 253, 208, 208, 225, 225, 225, 225, 229, + 229, 229, 229, 214, 253, 214, 214, 233, 233, 233, + 233, 237, 237, 237, 237, 239, 253, 239, 239, 241, + 253, 241, 241, 248, 248, 253, 248, 251, 251, 251, + 251, 5, 253, 253, 253, 253, 253, 253, 253, 253, + 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, + 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, + 253, 253, 253, 253, 253 + } ; -static yyconst flex_int16_t yy_chk[583] = +static yyconst flex_int16_t yy_chk[696] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 7, 7, 7, 8, 8, 8, 51, - 7, 51, 236, 8, 11, 11, 11, 11, 11, 17, - 16, 11, 11, 17, 24, 11, 16, 111, 24, 92, - 92, 11, 12, 12, 12, 12, 12, 29, 29, 12, - 12, 55, 55, 29, 30, 30, 30, 55, 180, 143, - 111, 30, 33, 33, 33, 33, 143, 180, 235, 33, - 33, 35, 35, 35, 35, 35, 58, 58, 35, 35, - - 75, 75, 58, 78, 78, 223, 75, 183, 183, 78, - 83, 83, 83, 83, 83, 216, 188, 83, 83, 91, - 91, 91, 91, 91, 188, 188, 91, 91, 93, 93, - 93, 93, 93, 233, 213, 93, 93, 96, 96, 96, - 96, 96, 101, 101, 96, 96, 103, 103, 101, 233, - 209, 207, 103, 107, 107, 107, 107, 107, 112, 112, - 107, 107, 114, 114, 112, 116, 116, 226, 114, 118, - 118, 116, 121, 121, 212, 118, 123, 123, 121, 129, - 129, 211, 123, 136, 136, 129, 138, 138, 212, 136, - 211, 226, 138, 141, 141, 141, 141, 141, 234, 205, - - 141, 141, 142, 142, 142, 142, 142, 144, 144, 142, - 142, 149, 149, 144, 155, 155, 234, 149, 166, 166, - 155, 172, 172, 202, 166, 174, 174, 172, 176, 176, - 189, 174, 178, 178, 176, 191, 191, 186, 178, 196, - 196, 191, 201, 225, 184, 196, 201, 204, 204, 204, - 204, 204, 215, 215, 204, 204, 218, 218, 215, 220, - 220, 232, 218, 227, 227, 220, 225, 182, 181, 227, - 171, 165, 164, 162, 161, 160, 154, 140, 135, 128, - 127, 232, 240, 240, 240, 240, 241, 241, 241, 242, - 242, 242, 242, 243, 243, 243, 243, 244, 126, 244, - - 244, 245, 245, 245, 245, 246, 125, 246, 246, 247, - 247, 247, 247, 248, 248, 120, 248, 249, 249, 249, - 249, 250, 110, 250, 250, 251, 251, 251, 251, 252, - 252, 252, 252, 253, 253, 253, 253, 254, 254, 254, - 254, 255, 255, 255, 255, 256, 109, 256, 256, 257, - 257, 257, 257, 258, 258, 258, 258, 259, 108, 259, - 259, 260, 260, 260, 260, 261, 106, 261, 261, 262, - 262, 262, 262, 263, 105, 263, 263, 264, 264, 264, - 264, 265, 100, 265, 265, 266, 266, 266, 266, 267, - 99, 267, 267, 268, 268, 268, 268, 269, 269, 269, - - 269, 270, 98, 270, 270, 271, 97, 271, 271, 272, - 95, 272, 272, 273, 273, 273, 273, 274, 274, 274, - 274, 275, 94, 275, 275, 276, 276, 276, 276, 277, - 277, 277, 277, 278, 90, 278, 278, 279, 279, 279, - 279, 280, 89, 280, 280, 281, 281, 281, 281, 282, - 282, 282, 282, 283, 283, 283, 283, 284, 284, 284, - 284, 285, 285, 285, 285, 286, 88, 286, 286, 287, - 87, 287, 287, 288, 288, 288, 288, 289, 289, 289, - 289, 290, 86, 290, 290, 291, 291, 291, 291, 292, - 292, 292, 292, 293, 85, 293, 293, 294, 84, 294, - - 294, 82, 77, 76, 74, 73, 72, 71, 70, 69, - 68, 67, 66, 65, 64, 63, 62, 61, 53, 52, - 50, 49, 48, 47, 46, 45, 44, 43, 42, 41, - 40, 39, 38, 37, 27, 23, 22, 21, 20, 19, - 18, 15, 14, 13, 6, 5, 4, 3, 239, 239, - 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, - 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, - 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, - 239, 239 + 1, 1, 1, 7, 7, 7, 8, 8, 8, 13, + 7, 15, 13, 8, 11, 11, 11, 11, 11, 14, + 251, 11, 11, 14, 15, 11, 19, 19, 18, 16, + 39, 11, 12, 12, 12, 12, 12, 16, 20, 12, + 12, 12, 18, 16, 39, 20, 18, 21, 23, 21, + 23, 25, 50, 42, 25, 30, 30, 38, 25, 38, + 249, 30, 31, 31, 31, 40, 50, 40, 41, 31, + + 34, 34, 34, 34, 42, 43, 43, 34, 34, 36, + 36, 36, 36, 36, 44, 41, 36, 36, 45, 46, + 47, 48, 47, 46, 48, 44, 49, 52, 51, 54, + 53, 55, 248, 54, 55, 45, 57, 57, 66, 64, + 60, 60, 57, 64, 52, 53, 60, 53, 66, 49, + 51, 65, 67, 65, 68, 69, 70, 71, 72, 69, + 73, 74, 73, 74, 75, 76, 67, 76, 70, 71, + 77, 78, 78, 68, 78, 79, 72, 78, 77, 80, + 85, 79, 81, 81, 88, 87, 75, 89, 81, 87, + 90, 92, 90, 109, 96, 96, 88, 96, 85, 93, + + 80, 86, 86, 86, 86, 86, 109, 93, 86, 86, + 89, 92, 95, 95, 95, 95, 95, 98, 101, 95, + 95, 97, 97, 97, 97, 97, 101, 247, 97, 97, + 104, 99, 98, 99, 100, 100, 100, 100, 100, 102, + 113, 100, 100, 102, 103, 103, 105, 105, 104, 107, + 107, 110, 105, 111, 114, 107, 114, 110, 115, 113, + 115, 116, 133, 133, 125, 146, 146, 233, 111, 112, + 112, 112, 112, 112, 117, 117, 112, 112, 236, 130, + 117, 119, 119, 125, 116, 121, 121, 119, 123, 123, + 131, 121, 126, 126, 123, 128, 128, 130, 126, 134, + + 134, 128, 236, 139, 141, 134, 139, 149, 141, 131, + 142, 142, 144, 144, 149, 189, 142, 189, 144, 147, + 147, 147, 147, 147, 160, 160, 147, 147, 148, 148, + 148, 148, 148, 150, 150, 148, 148, 155, 155, 150, + 161, 161, 166, 155, 167, 167, 161, 171, 172, 172, + 173, 173, 166, 179, 179, 195, 173, 181, 181, 179, + 187, 183, 183, 181, 185, 185, 171, 183, 196, 187, + 185, 190, 190, 199, 199, 220, 196, 196, 195, 199, + 204, 204, 217, 209, 220, 221, 204, 209, 212, 212, + 212, 212, 212, 235, 232, 212, 212, 217, 232, 221, + + 224, 224, 227, 227, 229, 229, 224, 243, 227, 244, + 229, 237, 237, 242, 242, 246, 235, 237, 225, 222, + 218, 215, 213, 210, 197, 244, 193, 243, 191, 188, + 178, 170, 168, 246, 254, 254, 254, 254, 255, 255, + 255, 256, 256, 256, 256, 257, 257, 257, 257, 258, + 132, 258, 258, 259, 259, 259, 259, 260, 94, 260, + 260, 261, 261, 261, 261, 262, 262, 91, 262, 263, + 263, 263, 263, 264, 63, 264, 264, 265, 265, 265, + 265, 266, 266, 266, 266, 267, 267, 267, 267, 268, + 268, 268, 268, 269, 269, 269, 269, 270, 35, 270, + + 270, 271, 271, 271, 271, 272, 272, 272, 272, 273, + 28, 273, 273, 274, 274, 274, 274, 275, 24, 275, + 275, 276, 276, 276, 276, 277, 22, 277, 277, 278, + 278, 278, 278, 279, 17, 279, 279, 280, 280, 280, + 280, 281, 6, 281, 281, 282, 282, 282, 282, 283, + 283, 283, 283, 284, 5, 284, 284, 285, 4, 285, + 285, 286, 3, 286, 286, 287, 287, 287, 287, 288, + 288, 288, 288, 289, 0, 289, 289, 290, 290, 290, + 290, 291, 291, 291, 291, 292, 0, 292, 292, 293, + 293, 293, 293, 294, 0, 294, 294, 295, 295, 295, + + 295, 296, 296, 296, 296, 297, 297, 297, 297, 298, + 298, 298, 298, 299, 299, 299, 299, 300, 0, 300, + 300, 301, 0, 301, 301, 302, 302, 302, 302, 303, + 303, 303, 303, 304, 0, 304, 304, 305, 305, 305, + 305, 306, 306, 306, 306, 307, 0, 307, 307, 308, + 0, 308, 308, 309, 309, 0, 309, 310, 310, 310, + 310, 253, 253, 253, 253, 253, 253, 253, 253, 253, + 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, + 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, + 253, 253, 253, 253, 253 + } ; #define YY_TRAILING_MASK 0x2000 @@ -815,10 +847,18 @@ static void setformat(DiskParseContext *dpc, const char *str) { else xlu__disk_err(dpc,str,"unknown value for format"); } +/* Sets ->backend from the string. IDL should provide something for this. */ +static void setbackendtype(DiskParseContext *dpc, const char *str) { + if ( !strcmp(str,"phy")) DSET(dpc,backend,BACKEND,str,PHY); + else if (!strcmp(str,"tap")) DSET(dpc,backend,BACKEND,str,TAP); + else if (!strcmp(str,"qdisk")) DSET(dpc,backend,BACKEND,str,QDISK); + else xlu__disk_err(dpc,str,"unknown value for backendtype"); +} + #define DEPRECATE(usewhatinstead) /* not currently reported */ -#line 822 "libxlu_disk_l.c" +#line 862 "libxlu_disk_l.c" #define INITIAL 0 #define LEXERR 1 @@ -1054,12 +1094,12 @@ YY_DECL register int yy_act; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; -#line 118 "libxlu_disk_l.l" +#line 126 "libxlu_disk_l.l" /*----- the scanner rules which do the parsing -----*/ -#line 1063 "libxlu_disk_l.c" +#line 1103 "libxlu_disk_l.c" if ( !yyg->yy_init ) { @@ -1123,14 +1163,14 @@ yy_match: while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 240 ) + if ( yy_current_state >= 254 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; *yyg->yy_state_ptr++ = yy_current_state; ++yy_cp; } - while ( yy_current_state != 239 ); + while ( yy_current_state != 253 ); yy_find_action: yy_current_state = *--yyg->yy_state_ptr; @@ -1180,148 +1220,154 @@ do_action: /* This label is used only to access EOF actions. */ case 1: /* rule 1 can match eol */ YY_RULE_SETUP -#line 122 "libxlu_disk_l.l" +#line 130 "libxlu_disk_l.l" { /* ignore whitespace before parameters */ } YY_BREAK /* ordinary parameters setting enums or strings */ case 2: /* rule 2 can match eol */ YY_RULE_SETUP -#line 126 "libxlu_disk_l.l" +#line 134 "libxlu_disk_l.l" { STRIP(','); setformat(DPC, FROMEQUALS); } YY_BREAK case 3: YY_RULE_SETUP -#line 128 "libxlu_disk_l.l" +#line 136 "libxlu_disk_l.l" { DPC->disk->is_cdrom = 1; } YY_BREAK case 4: YY_RULE_SETUP -#line 129 "libxlu_disk_l.l" +#line 137 "libxlu_disk_l.l" { DPC->disk->is_cdrom = 1; } YY_BREAK case 5: YY_RULE_SETUP -#line 130 "libxlu_disk_l.l" +#line 138 "libxlu_disk_l.l" { DPC->disk->is_cdrom = 0; } YY_BREAK case 6: /* rule 6 can match eol */ YY_RULE_SETUP -#line 131 "libxlu_disk_l.l" +#line 139 "libxlu_disk_l.l" { xlu__disk_err(DPC,yytext,"unknown value for type"); } YY_BREAK case 7: /* rule 7 can match eol */ YY_RULE_SETUP -#line 133 "libxlu_disk_l.l" +#line 141 "libxlu_disk_l.l" { STRIP(','); setaccess(DPC, FROMEQUALS); } YY_BREAK case 8: /* rule 8 can match eol */ YY_RULE_SETUP -#line 135 "libxlu_disk_l.l" -{ STRIP(','); SAVESTRING("vdev", vdev, FROMEQUALS); } +#line 142 "libxlu_disk_l.l" +{ STRIP(','); setbackendtype(DPC,yytext); } YY_BREAK case 9: /* rule 9 can match eol */ YY_RULE_SETUP -#line 136 "libxlu_disk_l.l" +#line 144 "libxlu_disk_l.l" +{ STRIP(','); SAVESTRING("vdev", vdev, FROMEQUALS); } + YY_BREAK +case 10: +/* rule 10 can match eol */ +YY_RULE_SETUP +#line 145 "libxlu_disk_l.l" { STRIP(','); SAVESTRING("script", script, FROMEQUALS); } YY_BREAK /* the target magic parameter, eats the rest of the string */ -case 10: +case 11: YY_RULE_SETUP -#line 140 "libxlu_disk_l.l" +#line 149 "libxlu_disk_l.l" { STRIP(','); SAVESTRING("target", pdev_path, FROMEQUALS); } YY_BREAK /* unknown parameters */ -case 11: -/* rule 11 can match eol */ +case 12: +/* rule 12 can match eol */ YY_RULE_SETUP -#line 144 "libxlu_disk_l.l" +#line 153 "libxlu_disk_l.l" { xlu__disk_err(DPC,yytext,"unknown parameter"); } YY_BREAK /* deprecated prefixes */ /* the "/.*" in these patterns ensures that they count as if they * matched the whole string, so these patterns take precedence */ -case 12: +case 13: YY_RULE_SETUP -#line 151 "libxlu_disk_l.l" +#line 160 "libxlu_disk_l.l" { STRIP(':'); DPC->had_depr_prefix=1; DEPRECATE("use `[format=]...,'"); setformat(DPC, yytext); } YY_BREAK -case 13: +case 14: YY_RULE_SETUP -#line 157 "libxlu_disk_l.l" +#line 166 "libxlu_disk_l.l" { STRIP(':'); DPC->had_depr_prefix=1; DEPRECATE("use `script=...'"); SAVESTRING("script", script, yytext); } YY_BREAK -case 14: +case 15: *yy_cp = yyg->yy_hold_char; /* undo effects of setting up yytext */ yyg->yy_c_buf_p = yy_cp = yy_bp + 8; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 163 "libxlu_disk_l.l" +#line 172 "libxlu_disk_l.l" { DPC->had_depr_prefix=1; DEPRECATE(0); } YY_BREAK -case 15: +case 16: YY_RULE_SETUP -#line 164 "libxlu_disk_l.l" +#line 173 "libxlu_disk_l.l" { DPC->had_depr_prefix=1; DEPRECATE(0); } YY_BREAK -case 16: +case 17: *yy_cp = yyg->yy_hold_char; /* undo effects of setting up yytext */ yyg->yy_c_buf_p = yy_cp = yy_bp + 4; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 165 "libxlu_disk_l.l" +#line 174 "libxlu_disk_l.l" { DPC->had_depr_prefix=1; DEPRECATE(0); } YY_BREAK -case 17: +case 18: *yy_cp = yyg->yy_hold_char; /* undo effects of setting up yytext */ yyg->yy_c_buf_p = yy_cp = yy_bp + 6; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 166 "libxlu_disk_l.l" +#line 175 "libxlu_disk_l.l" { DPC->had_depr_prefix=1; DEPRECATE(0); } YY_BREAK -case 18: +case 19: *yy_cp = yyg->yy_hold_char; /* undo effects of setting up yytext */ yyg->yy_c_buf_p = yy_cp = yy_bp + 5; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 167 "libxlu_disk_l.l" +#line 176 "libxlu_disk_l.l" { DPC->had_depr_prefix=1; DEPRECATE(0); } YY_BREAK -case 19: +case 20: *yy_cp = yyg->yy_hold_char; /* undo effects of setting up yytext */ yyg->yy_c_buf_p = yy_cp = yy_bp + 4; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 168 "libxlu_disk_l.l" +#line 177 "libxlu_disk_l.l" { DPC->had_depr_prefix=1; DEPRECATE(0); } YY_BREAK -case 20: -/* rule 20 can match eol */ +case 21: +/* rule 21 can match eol */ YY_RULE_SETUP -#line 170 "libxlu_disk_l.l" +#line 179 "libxlu_disk_l.l" { xlu__disk_err(DPC,yytext,"unknown deprecated disk prefix"); return 0; } YY_BREAK /* positional parameters */ -case 21: -/* rule 21 can match eol */ +case 22: +/* rule 22 can match eol */ YY_RULE_SETUP -#line 177 "libxlu_disk_l.l" +#line 186 "libxlu_disk_l.l" { char *colon; STRIP(','); @@ -1356,27 +1402,27 @@ YY_RULE_SETUP } } YY_BREAK -case 22: +case 23: YY_RULE_SETUP -#line 211 "libxlu_disk_l.l" +#line 220 "libxlu_disk_l.l" { BEGIN(LEXERR); yymore(); } YY_BREAK -case 23: +case 24: YY_RULE_SETUP -#line 215 "libxlu_disk_l.l" +#line 224 "libxlu_disk_l.l" { xlu__disk_err(DPC,yytext,"bad disk syntax"); return 0; } YY_BREAK -case 24: +case 25: YY_RULE_SETUP -#line 218 "libxlu_disk_l.l" +#line 227 "libxlu_disk_l.l" YY_FATAL_ERROR( "flex scanner jammed" ); YY_BREAK -#line 1380 "libxlu_disk_l.c" +#line 1426 "libxlu_disk_l.c" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(LEXERR): yyterminate(); @@ -1640,7 +1686,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 240 ) + if ( yy_current_state >= 254 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -1664,11 +1710,11 @@ static int yy_get_next_buffer (yyscan_t yyscanner) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 240 ) + if ( yy_current_state >= 254 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - yy_is_jam = (yy_current_state == 239); + yy_is_jam = (yy_current_state == 253); if ( ! yy_is_jam ) *yyg->yy_state_ptr++ = yy_current_state; @@ -2468,4 +2514,4 @@ void xlu__disk_yyfree (void * ptr , yyscan_t yyscanner) #define YYTABLES_NAME "yytables" -#line 218 "libxlu_disk_l.l" +#line 227 "libxlu_disk_l.l" diff --git a/tools/libxl/libxlu_disk_l.h b/tools/libxl/libxlu_disk_l.h index 7c1a8a0..2b6396e 100644 --- a/tools/libxl/libxlu_disk_l.h +++ b/tools/libxl/libxlu_disk_l.h @@ -340,7 +340,7 @@ extern int xlu__disk_yylex (yyscan_t yyscanner); #undef YY_DECL #endif -#line 218 "libxlu_disk_l.l" +#line 227 "libxlu_disk_l.l" #line 346 "libxlu_disk_l.h" #undef xlu__disk_yyIN_HEADER diff --git a/tools/libxl/libxlu_disk_l.l b/tools/libxl/libxlu_disk_l.l index 48a1314..e9d43c9 100644 --- a/tools/libxl/libxlu_disk_l.l +++ b/tools/libxl/libxlu_disk_l.l @@ -100,6 +100,14 @@ static void setformat(DiskParseContext *dpc, const char *str) { else xlu__disk_err(dpc,str,"unknown value for format"); } +/* Sets ->backend from the string. IDL should provide something for this. */ +static void setbackendtype(DiskParseContext *dpc, const char *str) { + if ( !strcmp(str,"phy")) DSET(dpc,backend,BACKEND,str,PHY); + else if (!strcmp(str,"tap")) DSET(dpc,backend,BACKEND,str,TAP); + else if (!strcmp(str,"qdisk")) DSET(dpc,backend,BACKEND,str,QDISK); + else xlu__disk_err(dpc,str,"unknown value for backendtype"); +} + #define DEPRECATE(usewhatinstead) /* not currently reported */ %} @@ -131,6 +139,7 @@ devtype=disk,? { DPC->disk->is_cdrom = 0; } devtype=[^,]*,? { xlu__disk_err(DPC,yytext,"unknown value for type"); } access=[^,]*,? { STRIP(','); setaccess(DPC, FROMEQUALS); } +backendtype=[^,]*? { STRIP(','); setbackendtype(DPC,yytext); } vdev=[^,]*,? { STRIP(','); SAVESTRING("vdev", vdev, FROMEQUALS); } script=[^,]*,? { STRIP(','); SAVESTRING("script", script, FROMEQUALS); } -- 1.5.6.5 ^ permalink raw reply related [flat|nested] 49+ messages in thread
* [PATCH 8/9] xl: xl block-attach -N (dry run) option 2011-06-02 17:55 ` [PATCH 7/9] libxl: disks: allow specification of "backendtype=phy|tap|qdisk" Ian Jackson @ 2011-06-02 17:55 ` Ian Jackson 2011-06-02 17:55 ` [PATCH 9/9] xl: new "check-xl-disk-parse" test script for disk parser Ian Jackson ` (3 more replies) 2011-06-03 10:27 ` [PATCH 7/9] libxl: disks: allow specification of "backendtype=phy|tap|qdisk" Ian Campbell 1 sibling, 4 replies; 49+ messages in thread From: Ian Jackson @ 2011-06-02 17:55 UTC (permalink / raw) To: xen-devel; +Cc: Ian Jackson, Ian Jackson This is mainly for debugging purposes at the moment. Eventually I hope all commands will gain this so that -N will be a global option. In the meantime this new option is not documented and should be regarded as unstable. Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com> --- tools/libxl/xl_cmdimpl.c | 34 +++++++++++++++++++++++++++++++--- 1 files changed, 31 insertions(+), 3 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index d2e343d..ac6d719 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -4018,13 +4018,25 @@ int main_networkdetach(int argc, char **argv) int main_blockattach(int argc, char **argv) { - int opt; + int opt, dry_run = 0; uint32_t fe_domid, be_domid = 0; libxl_device_disk disk = { 0 }; XLU_Config *config = 0; - if ((opt = def_getopt(argc, argv, "", "block-attach", 2)) != -1) - return opt; + while ((opt = getopt(argc, argv, "Nh")) != -1) { + switch (opt) { + case 'N': + /* fixme this should become a global option eventually */ + dry_run = 1; + break; + case 'h': + help("block-attach"); + return 0; + default: + fprintf(stderr, "option `%c' not supported.\n", optopt); + break; + } + } if ((argc-optind < 2)) { help("block-attach"); return 2; @@ -4041,6 +4053,22 @@ int main_blockattach(int argc, char **argv) disk.backend_domid = be_domid; + if (dry_run) { + /* fixme: this should be generated from the idl */ + /* fixme: enums (backend, format) should be converted to strings */ + printf("disk.backend_domid = %"PRIx32"\n", disk.backend_domid); + printf("disk.pdev_path = %s\n", disk.pdev_path); + printf("disk.vdev = %s\n", disk.vdev); + printf("disk.backend = %d\n", disk.backend); + printf("disk.format = %d\n", disk.format); + printf("disk.script = %s\n", disk.script); + printf("disk.removable = %d\n", disk.removable); + printf("disk.readwrite = %d\n", disk.readwrite); + printf("disk.is_cdrom = %d\n", disk.is_cdrom); + if (ferror(stdout) || fflush(stdout)) { perror("stdout"); exit(-1); } + return 0; + } + if (libxl_device_disk_add(ctx, fe_domid, &disk)) { fprintf(stderr, "libxl_device_disk_add failed.\n"); } -- 1.5.6.5 ^ permalink raw reply related [flat|nested] 49+ messages in thread
* [PATCH 9/9] xl: new "check-xl-disk-parse" test script for disk parser 2011-06-02 17:55 ` [PATCH 8/9] xl: xl block-attach -N (dry run) option Ian Jackson @ 2011-06-02 17:55 ` Ian Jackson 2011-06-03 10:38 ` Ian Campbell 2011-06-03 10:30 ` [PATCH 8/9] xl: xl block-attach -N (dry run) option Ian Campbell ` (2 subsequent siblings) 3 siblings, 1 reply; 49+ messages in thread From: Ian Jackson @ 2011-06-02 17:55 UTC (permalink / raw) To: xen-devel; +Cc: Ian Jackson, Ian Jackson This runs "xl block-attach -N 1 <some strings>" for various sets of strings and checks that the output is as expected. Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com> --- tools/libxl/check-xl-disk-parse | 82 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 82 insertions(+), 0 deletions(-) create mode 100755 tools/libxl/check-xl-disk-parse diff --git a/tools/libxl/check-xl-disk-parse b/tools/libxl/check-xl-disk-parse new file mode 100755 index 0000000..caaff9d --- /dev/null +++ b/tools/libxl/check-xl-disk-parse @@ -0,0 +1,82 @@ +#!/bin/bash + +set -e + +fprefix=tmp.check-xl-disk-parse + +expected () { + cat >$fprefix.expected +} + +failures=0 + +one () { + expected_rc=$1; shift + printf "test case %s...\n" "$*" + set +e + LD_LIBRARY_PATH=.:../libxc:../xenstore \ + ./xl block-attach -N 1 "$@" </dev/null >$fprefix.actual 2>/dev/null + actual_rc=$? + diff -u $fprefix.expected $fprefix.actual + diff_rc=$? + set -e + if [ $actual_rc != $expected_rc ] || [ $diff_rc != 0 ]; then + echo >&2 "test case \`$*' failed ($actual_rc $diff_rc)" + failures=$(( $failures + 1 )) + fi +} + +complete () { + if [ "$failures" = 0 ]; then + echo all ok.; exit 0 + else + echo "$failures tests failed."; exit 1 + fi +} + +e=255 + + +#---------- test data ---------- +# +# culled from docs/misc/xl-disk-configuration.txt + +expected </dev/null +one $e foo + +expected <<END +disk.backend_domid = 0 +disk.pdev_path = /dev/vg/guest-volume +disk.vdev = hda +disk.backend = 0 +disk.format = 4 +disk.script = (null) +disk.removable = 0 +disk.readwrite = 1 +disk.is_cdrom = 0 +END +one 0 /dev/vg/guest-volume,,hda +one 0 /dev/vg/guest-volume,raw,hda,rw +one 0 "format=raw, vdev=hda, access=rw, target=/dev/vg/guest-volume" +one 0 format=raw vdev=hda access=rw target=/dev/vg/guest-volume +one 0 raw:/dev/vg/guest-volume,hda,w + +expected <<END +disk.backend_domid = 0 +disk.pdev_path = /root/image.iso +disk.vdev = hdc +disk.backend = 0 +disk.format = 4 +disk.script = (null) +disk.removable = 1 +disk.readwrite = 0 +disk.is_cdrom = 1 +END +one 0 /root/image.iso,,hdc,cdrom +one 0 /root/image.iso,,hdc,,cdrom +one 0 /root/image.iso,raw,hdc,devtype=cdrom +one 0 "format=raw, vdev=hdc, access=ro, devtype=cdrom, target=/root/image.iso" +one 0 format=raw vdev=hdc access=ro devtype=cdrom target=/root/image.iso +one 0 raw:/root/image.iso,hdc:cdrom,ro + +complete -- 1.5.6.5 ^ permalink raw reply related [flat|nested] 49+ messages in thread
* Re: [PATCH 9/9] xl: new "check-xl-disk-parse" test script for disk parser 2011-06-02 17:55 ` [PATCH 9/9] xl: new "check-xl-disk-parse" test script for disk parser Ian Jackson @ 2011-06-03 10:38 ` Ian Campbell 2011-06-03 11:12 ` Ian Jackson 2011-06-03 14:25 ` Ian Jackson 0 siblings, 2 replies; 49+ messages in thread From: Ian Campbell @ 2011-06-03 10:38 UTC (permalink / raw) To: Ian Jackson; +Cc: xen-devel On Thu, 2011-06-02 at 18:55 +0100, Ian Jackson wrote: > This runs "xl block-attach -N 1 <some strings>" for various sets of > strings and checks that the output is as expected. Does this work if there is no dom1? It looks like the domain_qualifier_to_domid will fail before you get to produce any output. block-attach should work on dom0 (more so for dry run), which most likely does exist ;-). Ian. > > Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com> > --- > tools/libxl/check-xl-disk-parse | 82 +++++++++++++++++++++++++++++++++++++++ > 1 files changed, 82 insertions(+), 0 deletions(-) > create mode 100755 tools/libxl/check-xl-disk-parse > > diff --git a/tools/libxl/check-xl-disk-parse b/tools/libxl/check-xl-disk-parse > new file mode 100755 > index 0000000..caaff9d > --- /dev/null > +++ b/tools/libxl/check-xl-disk-parse > @@ -0,0 +1,82 @@ > +#!/bin/bash > + > +set -e > + > +fprefix=tmp.check-xl-disk-parse > + > +expected () { > + cat >$fprefix.expected > +} > + > +failures=0 > + > +one () { > + expected_rc=$1; shift > + printf "test case %s...\n" "$*" > + set +e > + LD_LIBRARY_PATH=.:../libxc:../xenstore \ > + ./xl block-attach -N 1 "$@" </dev/null >$fprefix.actual 2>/dev/null > + actual_rc=$? > + diff -u $fprefix.expected $fprefix.actual > + diff_rc=$? > + set -e > + if [ $actual_rc != $expected_rc ] || [ $diff_rc != 0 ]; then > + echo >&2 "test case \`$*' failed ($actual_rc $diff_rc)" > + failures=$(( $failures + 1 )) > + fi > +} > + > +complete () { > + if [ "$failures" = 0 ]; then > + echo all ok.; exit 0 > + else > + echo "$failures tests failed."; exit 1 > + fi > +} > + > +e=255 > + > + > +#---------- test data ---------- > +# > +# culled from docs/misc/xl-disk-configuration.txt > + > +expected </dev/null > +one $e foo > + > +expected <<END > +disk.backend_domid = 0 > +disk.pdev_path = /dev/vg/guest-volume > +disk.vdev = hda > +disk.backend = 0 > +disk.format = 4 > +disk.script = (null) > +disk.removable = 0 > +disk.readwrite = 1 > +disk.is_cdrom = 0 > +END > +one 0 /dev/vg/guest-volume,,hda > +one 0 /dev/vg/guest-volume,raw,hda,rw > +one 0 "format=raw, vdev=hda, access=rw, target=/dev/vg/guest-volume" > +one 0 format=raw vdev=hda access=rw target=/dev/vg/guest-volume > +one 0 raw:/dev/vg/guest-volume,hda,w > + > +expected <<END > +disk.backend_domid = 0 > +disk.pdev_path = /root/image.iso > +disk.vdev = hdc > +disk.backend = 0 > +disk.format = 4 > +disk.script = (null) > +disk.removable = 1 > +disk.readwrite = 0 > +disk.is_cdrom = 1 > +END > +one 0 /root/image.iso,,hdc,cdrom > +one 0 /root/image.iso,,hdc,,cdrom > +one 0 /root/image.iso,raw,hdc,devtype=cdrom > +one 0 "format=raw, vdev=hdc, access=ro, devtype=cdrom, target=/root/image.iso" > +one 0 format=raw vdev=hdc access=ro devtype=cdrom target=/root/image.iso > +one 0 raw:/root/image.iso,hdc:cdrom,ro > + > +complete ^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 9/9] xl: new "check-xl-disk-parse" test script for disk parser 2011-06-03 10:38 ` Ian Campbell @ 2011-06-03 11:12 ` Ian Jackson 2011-06-03 14:25 ` Ian Jackson 1 sibling, 0 replies; 49+ messages in thread From: Ian Jackson @ 2011-06-03 11:12 UTC (permalink / raw) To: Ian Campbell; +Cc: xen-devel Ian Campbell writes ("Re: [Xen-devel] [PATCH 9/9] xl: new "check-xl-disk-parse" test script for disk parser"): > On Thu, 2011-06-02 at 18:55 +0100, Ian Jackson wrote: > > This runs "xl block-attach -N 1 <some strings>" for various sets of > > strings and checks that the output is as expected. > > Does this work if there is no dom1? It looks like the > domain_qualifier_to_domid will fail before you get to produce any > output. Err, oops. When I tested this (on my laptop with no Xen) I had a shim patch that made that work. > block-attach should work on dom0 (more so for dry run), which most > likely does exist ;-). Good point. Ian. ^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 9/9] xl: new "check-xl-disk-parse" test script for disk parser 2011-06-03 10:38 ` Ian Campbell 2011-06-03 11:12 ` Ian Jackson @ 2011-06-03 14:25 ` Ian Jackson 2011-06-03 14:32 ` Ian Campbell 1 sibling, 1 reply; 49+ messages in thread From: Ian Jackson @ 2011-06-03 14:25 UTC (permalink / raw) To: Ian Campbell; +Cc: xen-devel, Ian Jackson Ian Campbell writes ("Re: [Xen-devel] [PATCH 9/9] xl: new "check-xl-disk-parse" test script for disk parser"): > Does this work if there is no dom1? It looks like the > domain_qualifier_to_domid will fail before you get to produce any > output. Fixed. commit d76bea783e4c4ee97a7c3f2f5862589cea134523 Author: Ian Jackson <ian.jackson@eu.citrix.com> Date: Fri May 27 16:50:41 2011 +0100 xl: new "check-xl-disk-parse" test script for disk parser This runs "xl block-attach -N 1 <some strings>" for various sets of strings and checks that the output is as expected. Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com> diff --git a/tools/libxl/check-xl-disk-parse b/tools/libxl/check-xl-disk-parse new file mode 100755 index 0000000..8f59485 --- /dev/null +++ b/tools/libxl/check-xl-disk-parse @@ -0,0 +1,82 @@ +#!/bin/bash + +set -e + +fprefix=tmp.check-xl-disk-parse + +expected () { + cat >$fprefix.expected +} + +failures=0 + +one () { + expected_rc=$1; shift + printf "test case %s...\n" "$*" + set +e + LD_LIBRARY_PATH=.:../libxc:../xenstore \ + ./xl block-attach -N 0 "$@" </dev/null >$fprefix.actual 2>/dev/null + actual_rc=$? + diff -u $fprefix.expected $fprefix.actual + diff_rc=$? + set -e + if [ $actual_rc != $expected_rc ] || [ $diff_rc != 0 ]; then + echo >&2 "test case \`$*' failed ($actual_rc $diff_rc)" + failures=$(( $failures + 1 )) + fi +} + +complete () { + if [ "$failures" = 0 ]; then + echo all ok.; exit 0 + else + echo "$failures tests failed."; exit 1 + fi +} + +e=255 + + +#---------- test data ---------- +# +# culled from docs/misc/xl-disk-configuration.txt + +expected </dev/null +one $e foo + +expected <<END +disk.backend_domid = 0 +disk.pdev_path = /dev/vg/guest-volume +disk.vdev = hda +disk.backend = 0 +disk.format = 4 +disk.script = (null) +disk.removable = 0 +disk.readwrite = 1 +disk.is_cdrom = 0 +END +one 0 /dev/vg/guest-volume,,hda +one 0 /dev/vg/guest-volume,raw,hda,rw +one 0 "format=raw, vdev=hda, access=rw, target=/dev/vg/guest-volume" +one 0 format=raw vdev=hda access=rw target=/dev/vg/guest-volume +one 0 raw:/dev/vg/guest-volume,hda,w + +expected <<END +disk.backend_domid = 0 +disk.pdev_path = /root/image.iso +disk.vdev = hdc +disk.backend = 0 +disk.format = 4 +disk.script = (null) +disk.removable = 1 +disk.readwrite = 0 +disk.is_cdrom = 1 +END +one 0 /root/image.iso,,hdc,cdrom +one 0 /root/image.iso,,hdc,,cdrom +one 0 /root/image.iso,raw,hdc,devtype=cdrom +one 0 "format=raw, vdev=hdc, access=ro, devtype=cdrom, target=/root/image.iso" +one 0 format=raw vdev=hdc access=ro devtype=cdrom target=/root/image.iso +one 0 raw:/root/image.iso,hdc:cdrom,ro + +complete ^ permalink raw reply related [flat|nested] 49+ messages in thread
* Re: [PATCH 9/9] xl: new "check-xl-disk-parse" test script for disk parser 2011-06-03 14:25 ` Ian Jackson @ 2011-06-03 14:32 ` Ian Campbell 0 siblings, 0 replies; 49+ messages in thread From: Ian Campbell @ 2011-06-03 14:32 UTC (permalink / raw) To: Ian Jackson; +Cc: xen-devel On Fri, 2011-06-03 at 15:25 +0100, Ian Jackson wrote: > Ian Campbell writes ("Re: [Xen-devel] [PATCH 9/9] xl: new "check-xl-disk-parse" test script for disk parser"): > > Does this work if there is no dom1? It looks like the > > domain_qualifier_to_domid will fail before you get to produce any > > output. > > Fixed. Except the commit message, anyway: Acked-by: Ian Campbell <ian.campbell@citrix.com> > > commit d76bea783e4c4ee97a7c3f2f5862589cea134523 > Author: Ian Jackson <ian.jackson@eu.citrix.com> > Date: Fri May 27 16:50:41 2011 +0100 > > xl: new "check-xl-disk-parse" test script for disk parser > > This runs "xl block-attach -N 1 <some strings>" for various sets of > strings and checks that the output is as expected. > > Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com> > > diff --git a/tools/libxl/check-xl-disk-parse b/tools/libxl/check-xl-disk-parse > new file mode 100755 > index 0000000..8f59485 > --- /dev/null > +++ b/tools/libxl/check-xl-disk-parse > @@ -0,0 +1,82 @@ > +#!/bin/bash > + > +set -e > + > +fprefix=tmp.check-xl-disk-parse > + > +expected () { > + cat >$fprefix.expected > +} > + > +failures=0 > + > +one () { > + expected_rc=$1; shift > + printf "test case %s...\n" "$*" > + set +e > + LD_LIBRARY_PATH=.:../libxc:../xenstore \ > + ./xl block-attach -N 0 "$@" </dev/null >$fprefix.actual 2>/dev/null > + actual_rc=$? > + diff -u $fprefix.expected $fprefix.actual > + diff_rc=$? > + set -e > + if [ $actual_rc != $expected_rc ] || [ $diff_rc != 0 ]; then > + echo >&2 "test case \`$*' failed ($actual_rc $diff_rc)" > + failures=$(( $failures + 1 )) > + fi > +} > + > +complete () { > + if [ "$failures" = 0 ]; then > + echo all ok.; exit 0 > + else > + echo "$failures tests failed."; exit 1 > + fi > +} > + > +e=255 > + > + > +#---------- test data ---------- > +# > +# culled from docs/misc/xl-disk-configuration.txt > + > +expected </dev/null > +one $e foo > + > +expected <<END > +disk.backend_domid = 0 > +disk.pdev_path = /dev/vg/guest-volume > +disk.vdev = hda > +disk.backend = 0 > +disk.format = 4 > +disk.script = (null) > +disk.removable = 0 > +disk.readwrite = 1 > +disk.is_cdrom = 0 > +END > +one 0 /dev/vg/guest-volume,,hda > +one 0 /dev/vg/guest-volume,raw,hda,rw > +one 0 "format=raw, vdev=hda, access=rw, target=/dev/vg/guest-volume" > +one 0 format=raw vdev=hda access=rw target=/dev/vg/guest-volume > +one 0 raw:/dev/vg/guest-volume,hda,w > + > +expected <<END > +disk.backend_domid = 0 > +disk.pdev_path = /root/image.iso > +disk.vdev = hdc > +disk.backend = 0 > +disk.format = 4 > +disk.script = (null) > +disk.removable = 1 > +disk.readwrite = 0 > +disk.is_cdrom = 1 > +END > +one 0 /root/image.iso,,hdc,cdrom > +one 0 /root/image.iso,,hdc,,cdrom > +one 0 /root/image.iso,raw,hdc,devtype=cdrom > +one 0 "format=raw, vdev=hdc, access=ro, devtype=cdrom, target=/root/image.iso" > +one 0 format=raw vdev=hdc access=ro devtype=cdrom target=/root/image.iso > +one 0 raw:/root/image.iso,hdc:cdrom,ro > + > +complete ^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 8/9] xl: xl block-attach -N (dry run) option 2011-06-02 17:55 ` [PATCH 8/9] xl: xl block-attach -N (dry run) option Ian Jackson 2011-06-02 17:55 ` [PATCH 9/9] xl: new "check-xl-disk-parse" test script for disk parser Ian Jackson @ 2011-06-03 10:30 ` Ian Campbell 2011-06-03 11:17 ` Ian Jackson 2011-06-03 14:54 ` [PATCHES 00/08-11] xl dry run option, and disk parser test script Ian Jackson 2011-06-03 10:38 ` [PATCH 8/9] xl: xl block-attach -N (dry run) option Ian Campbell 2011-06-03 10:46 ` Ian Campbell 3 siblings, 2 replies; 49+ messages in thread From: Ian Campbell @ 2011-06-03 10:30 UTC (permalink / raw) To: Ian Jackson; +Cc: xen-devel On Thu, 2011-06-02 at 18:55 +0100, Ian Jackson wrote: > This is mainly for debugging purposes at the moment. Eventually I > hope all commands will gain this so that -N will be a global option. > > In the meantime this new option is not documented and should be > regarded as unstable. This is because it will ultimately move from after the command name to before? What about adding a dry_run flag to struct cmd_spec and handling -N at the global scope on the basis of that flag, IOW error out on xl -N <command-without-dry-run> Ian. > > Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com> > --- > tools/libxl/xl_cmdimpl.c | 34 +++++++++++++++++++++++++++++++--- > 1 files changed, 31 insertions(+), 3 deletions(-) > > diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c > index d2e343d..ac6d719 100644 > --- a/tools/libxl/xl_cmdimpl.c > +++ b/tools/libxl/xl_cmdimpl.c > @@ -4018,13 +4018,25 @@ int main_networkdetach(int argc, char **argv) > > int main_blockattach(int argc, char **argv) > { > - int opt; > + int opt, dry_run = 0; > uint32_t fe_domid, be_domid = 0; > libxl_device_disk disk = { 0 }; > XLU_Config *config = 0; > > - if ((opt = def_getopt(argc, argv, "", "block-attach", 2)) != -1) > - return opt; > + while ((opt = getopt(argc, argv, "Nh")) != -1) { > + switch (opt) { > + case 'N': > + /* fixme this should become a global option eventually */ > + dry_run = 1; > + break; > + case 'h': > + help("block-attach"); > + return 0; > + default: > + fprintf(stderr, "option `%c' not supported.\n", optopt); > + break; > + } > + } > if ((argc-optind < 2)) { > help("block-attach"); > return 2; > @@ -4041,6 +4053,22 @@ int main_blockattach(int argc, char **argv) > > disk.backend_domid = be_domid; > > + if (dry_run) { > + /* fixme: this should be generated from the idl */ > + /* fixme: enums (backend, format) should be converted to strings */ > + printf("disk.backend_domid = %"PRIx32"\n", disk.backend_domid); > + printf("disk.pdev_path = %s\n", disk.pdev_path); > + printf("disk.vdev = %s\n", disk.vdev); > + printf("disk.backend = %d\n", disk.backend); > + printf("disk.format = %d\n", disk.format); > + printf("disk.script = %s\n", disk.script); > + printf("disk.removable = %d\n", disk.removable); > + printf("disk.readwrite = %d\n", disk.readwrite); > + printf("disk.is_cdrom = %d\n", disk.is_cdrom); > + if (ferror(stdout) || fflush(stdout)) { perror("stdout"); exit(-1); } > + return 0; > + } > + > if (libxl_device_disk_add(ctx, fe_domid, &disk)) { > fprintf(stderr, "libxl_device_disk_add failed.\n"); > } ^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 8/9] xl: xl block-attach -N (dry run) option 2011-06-03 10:30 ` [PATCH 8/9] xl: xl block-attach -N (dry run) option Ian Campbell @ 2011-06-03 11:17 ` Ian Jackson 2011-06-03 14:54 ` [PATCHES 00/08-11] xl dry run option, and disk parser test script Ian Jackson 1 sibling, 0 replies; 49+ messages in thread From: Ian Jackson @ 2011-06-03 11:17 UTC (permalink / raw) To: Ian Campbell; +Cc: xen-devel Ian Campbell writes ("Re: [Xen-devel] [PATCH 8/9] xl: xl block-attach -N (dry run) option"): > On Thu, 2011-06-02 at 18:55 +0100, Ian Jackson wrote: > > This is mainly for debugging purposes at the moment. Eventually I > > hope all commands will gain this so that -N will be a global option. > > > > In the meantime this new option is not documented and should be > > regarded as unstable. > > This is because it will ultimately move from after the command name to > before? Yes. > What about adding a dry_run flag to struct cmd_spec and handling -N at > the global scope on the basis of that flag, IOW error out on > xl -N <command-without-dry-run> Good idea, I'll do that. Ian. ^ permalink raw reply [flat|nested] 49+ messages in thread
* [PATCHES 00/08-11] xl dry run option, and disk parser test script 2011-06-03 10:30 ` [PATCH 8/9] xl: xl block-attach -N (dry run) option Ian Campbell 2011-06-03 11:17 ` Ian Jackson @ 2011-06-03 14:54 ` Ian Jackson 2011-06-03 14:54 ` [PATCH 08/11] xl: new global -N option for dry run Ian Jackson 1 sibling, 1 reply; 49+ messages in thread From: Ian Jackson @ 2011-06-03 14:54 UTC (permalink / raw) To: xen-devel Ian Campbell wrote: > What about adding a dry_run flag to struct cmd_spec and handling -N at > the global scope on the basis of that flag, IOW error out on > xl -N <command-without-dry-run> I have implemented this. The results are these patches which I have numbered 08-11, and which replace patches 8-9 of my previous series. ^ permalink raw reply [flat|nested] 49+ messages in thread
* [PATCH 08/11] xl: new global -N option for dry run 2011-06-03 14:54 ` [PATCHES 00/08-11] xl dry run option, and disk parser test script Ian Jackson @ 2011-06-03 14:54 ` Ian Jackson 2011-06-03 14:54 ` [PATCH 09/11] xl: implement -N (dry run) global option for create and cpupool-create Ian Jackson 2011-06-03 15:04 ` [PATCH 08/11] xl: new global -N option for dry run Ian Campbell 0 siblings, 2 replies; 49+ messages in thread From: Ian Jackson @ 2011-06-03 14:54 UTC (permalink / raw) To: xen-devel; +Cc: Ian Jackson, Ian Jackson This sets a global dryrun_only variable, which individual commands are expected to honour. To avoid accidents, we introduce a new can_dryrun member in the command table, which is initially set to 0 for each command. Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com> --- tools/libxl/xl.c | 17 +++++-- tools/libxl/xl.h | 2 + tools/libxl/xl_cmdimpl.c | 5 +- tools/libxl/xl_cmdtable.c | 124 ++++++++++++++++++++++---------------------- 4 files changed, 80 insertions(+), 68 deletions(-) diff --git a/tools/libxl/xl.c b/tools/libxl/xl.c index 5bab2ff..1f231a8 100644 --- a/tools/libxl/xl.c +++ b/tools/libxl/xl.c @@ -34,6 +34,7 @@ #include "xl.h" xentoollog_logger_stdiostream *logger; +int dryrun_only; int autoballoon = 1; char *lockfile; char *default_vifscript = NULL; @@ -90,11 +91,14 @@ int main(int argc, char **argv) void *config_data = 0; int config_len = 0; - while ((opt = getopt(argc, argv, "+v")) >= 0) { + while ((opt = getopt(argc, argv, "+vN")) >= 0) { switch (opt) { case 'v': if (minmsglevel > 0) minmsglevel--; break; + case 'N': + dryrun_only = 1; + break; default: fprintf(stderr, "unknown global option\n"); exit(2); @@ -138,9 +142,14 @@ int main(int argc, char **argv) optind = 1; cspec = cmdtable_lookup(cmd); - if (cspec) + if (cspec) { + if (dryrun_only && !cspec->can_dryrun) { + fprintf(stderr, "command does not implement -N (dryrun) option\n"); + ret = 1; + goto xit; + } ret = cspec->cmd_impl(argc, argv); - else if (!strcmp(cmd, "help")) { + } else if (!strcmp(cmd, "help")) { help(argv[1]); ret = 0; } else { @@ -148,8 +157,8 @@ int main(int argc, char **argv) ret = 1; } + xit: libxl_ctx_free(ctx); xtl_logger_destroy((xentoollog_logger*)logger); - return ret; } diff --git a/tools/libxl/xl.h b/tools/libxl/xl.h index bce135a..04f9045 100644 --- a/tools/libxl/xl.h +++ b/tools/libxl/xl.h @@ -20,6 +20,7 @@ struct cmd_spec { char *cmd_name; int (*cmd_impl)(int argc, char **argv); + int can_dryrun; char *cmd_desc; char *cmd_usage; char *cmd_option; @@ -103,6 +104,7 @@ extern xentoollog_logger_stdiostream *logger; /* global options */ extern int autoballoon; +extern int dryrun_only; extern char *lockfile; extern char *default_vifscript; diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index d2e343d..208e745 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -1651,7 +1651,7 @@ void help(const char *command) struct cmd_spec *cmd; if (!command || !strcmp(command, "help")) { - printf("Usage xl [-v] <subcommand> [args]\n\n"); + printf("Usage xl [-vN] <subcommand> [args]\n\n"); printf("xl full list of subcommands:\n\n"); for (i = 0; i < cmdtable_len; i++) printf(" %-20s%s\n", @@ -1659,7 +1659,8 @@ void help(const char *command) } else { cmd = cmdtable_lookup(command); if (cmd) { - printf("Usage: xl [-v] %s %s\n\n%s.\n\n", + printf("Usage: xl [-v%s] %s %s\n\n%s.\n\n", + cmd->can_dryrun ? "N" : "", cmd->cmd_name, cmd->cmd_usage, cmd->cmd_desc); diff --git a/tools/libxl/xl_cmdtable.c b/tools/libxl/xl_cmdtable.c index a899803..5308288 100644 --- a/tools/libxl/xl_cmdtable.c +++ b/tools/libxl/xl_cmdtable.c @@ -19,7 +19,7 @@ struct cmd_spec cmd_table[] = { { "create", - &main_create, + &main_create, 0, "Create a domain from config file <filename>", "<ConfigFile> [options] [vars]", "-h Print this help.\n" @@ -32,7 +32,7 @@ struct cmd_spec cmd_table[] = { "-e Do not wait in the background for the death of the domain." }, { "list", - &main_list, + &main_list, 0, "List information about all/some domains", "[options] [Domain]\n", "-l, --long Output all VM details\n" @@ -40,59 +40,59 @@ struct cmd_spec cmd_table[] = { "-Z, --context Prints out security context" }, { "destroy", - &main_destroy, + &main_destroy, 0, "Terminate a domain immediately", "<Domain>", }, { "shutdown", - &main_shutdown, + &main_shutdown, 0, "Issue a shutdown signal to a domain", "<Domain>", }, { "reboot", - &main_reboot, + &main_reboot, 0, "Issue a reboot signal to a domain", "<Domain>", }, { "pci-attach", - &main_pciattach, + &main_pciattach, 0, "Insert a new pass-through pci device", "<Domain> <BDF> [Virtual Slot]", }, { "pci-detach", - &main_pcidetach, + &main_pcidetach, 0, "Remove a domain's pass-through pci device", "<Domain> <BDF>", }, { "pci-list", - &main_pcilist, + &main_pcilist, 0, "List pass-through pci devices for a domain", "<Domain>", }, { "pci-list-assignable-devices", - &main_pcilist_assignable, + &main_pcilist_assignable, 0, "List all the assignable pci devices", "", }, { "pause", - &main_pause, + &main_pause, 0, "Pause execution of a domain", "<Domain>", }, { "unpause", - &main_unpause, + &main_unpause, 0, "Unpause a paused domain", "<Domain>", }, { "console", - &main_console, + &main_console, 0, "Attach to domain's console", "[options] <Domain>\n" "-t <type> console type, pv or serial\n" "-n <number> console number" }, { "vncviewer", - &main_vncviewer, + &main_vncviewer, 0, "Attach to domain's VNC server.", "[options] <Domain>\n" "--autopass Pass VNC password to viewer via stdin and\n" @@ -100,14 +100,14 @@ struct cmd_spec cmd_table[] = { "--vncviewer-autopass (consistency alias for --autopass)" }, { "save", - &main_save, + &main_save, 0, "Save a domain state to restore later", "[options] <Domain> <CheckpointFile> [<ConfigFile>]", "-h Print this help.\n" "-c Leave domain running after creating the snapshot." }, { "migrate", - &main_migrate, + &main_migrate, 0, "Save a domain state to restore later", "[options] <Domain> <host>", "-h Print this help.\n" @@ -119,12 +119,12 @@ struct cmd_spec cmd_table[] = { " of the domain." }, { "dump-core", - &main_dump_core, + &main_dump_core, 0, "Core dump a domain", "<Domain> <filename>" }, { "restore", - &main_restore, + &main_restore, 0, "Restore a domain from a saved state", "[options] [<ConfigFile>] <CheckpointFile>", "-h Print this help.\n" @@ -133,63 +133,63 @@ struct cmd_spec cmd_table[] = { "-d Enable debug messages." }, { "migrate-receive", - &main_migrate_receive, + &main_migrate_receive, 0, "Restore a domain from a saved state", "- for internal use only", }, { "cd-insert", - &main_cd_insert, + &main_cd_insert, 0, "Insert a cdrom into a guest's cd drive", "<Domain> <VirtualDevice> <type:path>", }, { "cd-eject", - &main_cd_eject, + &main_cd_eject, 0, "Eject a cdrom from a guest's cd drive", "<Domain> <VirtualDevice>", }, { "mem-max", - &main_memmax, + &main_memmax, 0, "Set the maximum amount reservation for a domain", "<Domain> <MemMB['b'[bytes]|'k'[KB]|'m'[MB]|'g'[GB]|'t'[TB]]>", }, { "mem-set", - &main_memset, + &main_memset, 0, "Set the current memory usage for a domain", "<Domain> <MemMB['b'[bytes]|'k'[KB]|'m'[MB]|'g'[GB]|'t'[TB]]>", }, { "button-press", - &main_button_press, + &main_button_press, 0, "Indicate an ACPI button press to the domain", "<Domain> <Button>", "<Button> may be 'power' or 'sleep'." }, { "vcpu-list", - &main_vcpulist, + &main_vcpulist, 0, "List the VCPUs for all/some domains", "[Domain, ...]", }, { "vcpu-pin", - &main_vcpupin, + &main_vcpupin, 0, "Set which CPUs a VCPU can use", "<Domain> <VCPU|all> <CPUs|all>", }, { "vcpu-set", - &main_vcpuset, + &main_vcpuset, 0, "Set the number of active VCPUs allowed for the domain", "<Domain> <vCPUs>", }, { "list-vm", - &main_list_vm, + &main_list_vm, 0, "List the VMs,without DOM0", "", }, { "info", - &main_info, + &main_info, 0, "Get information about Xen host", "-n, --numa List host NUMA topology information", }, { "sched-credit", - &main_sched_credit, + &main_sched_credit, 0, "Get/set credit scheduler parameters", "[-d <Domain> [-w[=WEIGHT]|-c[=CAP]]]", "-d DOMAIN, --domain=DOMAIN Domain to modify\n" @@ -197,109 +197,109 @@ struct cmd_spec cmd_table[] = { "-c CAP, --cap=CAP Cap (int)" }, { "domid", - &main_domid, + &main_domid, 0, "Convert a domain name to domain id", "<DomainName>", }, { "domname", - &main_domname, + &main_domname, 0, "Convert a domain id to domain name", "<DomainId>", }, { "rename", - &main_rename, + &main_rename, 0, "Rename a domain", "<Domain> <NewDomainName>", }, { "trigger", - &main_trigger, + &main_trigger, 0, "Send a trigger to a domain", "<Domain> <nmi|reset|init|power|sleep> [<VCPU>]", }, { "sysrq", - &main_sysrq, + &main_sysrq, 0, "Send a sysrq to a domain", "<Domain> <letter>", }, { "debug-keys", - &main_debug_keys, + &main_debug_keys, 0, "Send debug keys to Xen", "<Keys>", }, { "dmesg", - &main_dmesg, + &main_dmesg, 0, "Read and/or clear dmesg buffer", "[-c]", " -c Clear dmesg buffer as well as printing it", }, { "top", - &main_top, + &main_top, 0, "Monitor a host and the domains in real time", "", }, { "network-attach", - &main_networkattach, + &main_networkattach, 0, "Create a new virtual network device", "<Domain> [type=<type>] [mac=<mac>] [bridge=<bridge>] " "[ip=<ip>] [script=<script>] [backend=<BackDomain>] [vifname=<name>] " "[rate=<rate>] [model=<model>] [accel=<accel>]", }, { "network-list", - &main_networklist, + &main_networklist, 0, "List virtual network interfaces for a domain", "<Domain(s)>", }, { "network-detach", - &main_networkdetach, + &main_networkdetach, 0, "Destroy a domain's virtual network device", "<Domain> <DevId|mac>", }, { "block-attach", - &main_blockattach, + &main_blockattach, 0, "Create a new virtual block device", "<Domain> <disk-spec-component(s)>...", }, { "block-list", - &main_blocklist, + &main_blocklist, 0, "List virtual block devices for a domain", "<Domain(s)>", }, { "block-detach", - &main_blockdetach, + &main_blockdetach, 0, "Destroy a domain's virtual block device", "<Domain> <DevId>", }, { "uptime", - &main_uptime, + &main_uptime, 0, "Print uptime for all/some domains", "[-s] [Domain]", }, { "tmem-list", - &main_tmem_list, + &main_tmem_list, 0, "List tmem pools", "[-l] [<Domain>|-a]", " -l List tmem stats", }, { "tmem-freeze", - &main_tmem_freeze, + &main_tmem_freeze, 0, "Freeze tmem pools", "[<Domain>|-a]", " -a Freeze all tmem", }, { "tmem-destroy", - &main_tmem_destroy, + &main_tmem_destroy, 0, "Destroy tmem pools", "[<Domain>|-a]", " -a Destroy all tmem", }, { "tmem-thaw", - &main_tmem_thaw, + &main_tmem_thaw, 0, "Thaw tmem pools", "[<Domain>|-a]", " -a Thaw all tmem", }, { "tmem-set", - &main_tmem_set, + &main_tmem_set, 0, "Change tmem settings", "[<Domain>|-a] [-w[=WEIGHT]|-c[=CAP]|-p[=COMPRESS]]", " -a Operate on all tmem\n" @@ -308,7 +308,7 @@ struct cmd_spec cmd_table[] = { " -p COMPRESS Compress (int)", }, { "tmem-shared-auth", - &main_tmem_shared_auth, + &main_tmem_shared_auth, 0, "De/authenticate shared tmem pool", "[<Domain>|-a] [-u[=UUID] [-A[=AUTH]", " -a Authenticate for all tmem pools\n" @@ -317,12 +317,12 @@ struct cmd_spec cmd_table[] = { " -A AUTH 0=auth,1=deauth", }, { "tmem-freeable", - &main_tmem_freeable, + &main_tmem_freeable, 0, "Get information about how much freeable memory (MB) is in-use by tmem", "", }, { "cpupool-create", - &main_cpupoolcreate, + &main_cpupoolcreate, 0, "Create a CPU pool based an ConfigFile", "[options] <ConfigFile> [vars]", "-h, --help Print this help.\n" @@ -330,53 +330,53 @@ struct cmd_spec cmd_table[] = { "-n, --dryrun Dry run - prints the resulting configuration." }, { "cpupool-list", - &main_cpupoollist, + &main_cpupoollist, 0, "List CPU pools on host", "[-c|--cpus] [<CPU Pool>]", "-c, --cpus Output list of CPUs used by a pool" }, { "cpupool-destroy", - &main_cpupooldestroy, + &main_cpupooldestroy, 0, "Deactivates a CPU pool", "<CPU Pool>", }, { "cpupool-rename", - &main_cpupoolrename, + &main_cpupoolrename, 0, "Renames a CPU pool", "<CPU Pool> <new name>", }, { "cpupool-cpu-add", - &main_cpupoolcpuadd, + &main_cpupoolcpuadd, 0, "Adds a CPU to a CPU pool", "<CPU Pool> <CPU nr>|node:<node nr>", }, { "cpupool-cpu-remove", - &main_cpupoolcpuremove, + &main_cpupoolcpuremove, 0, "Removes a CPU from a CPU pool", "<CPU Pool> <CPU nr>|node:<node nr>", }, { "cpupool-migrate", - &main_cpupoolmigrate, + &main_cpupoolmigrate, 0, "Moves a domain into a CPU pool", "<Domain> <CPU Pool>", }, { "cpupool-numa-split", - &main_cpupoolnumasplit, + &main_cpupoolnumasplit, 0, "Splits up the machine into one CPU pool per NUMA node", "", }, { "getenforce", - &main_getenforce, + &main_getenforce, 0, "Returns the current enforcing mode of the Flask Xen security module", "", }, { "setenforce", - &main_setenforce, + &main_setenforce, 0, "Sets the current enforcing mode of the Flask Xen security module", "<1|0|Enforcing|Permissive>", }, { "loadpolicy", - &main_loadpolicy, + &main_loadpolicy, 0, "Loads a new policy int the Flask Xen security module", "<policy file>", }, -- 1.5.6.5 ^ permalink raw reply related [flat|nested] 49+ messages in thread
* [PATCH 09/11] xl: implement -N (dry run) global option for create and cpupool-create 2011-06-03 14:54 ` [PATCH 08/11] xl: new global -N option for dry run Ian Jackson @ 2011-06-03 14:54 ` Ian Jackson 2011-06-03 14:54 ` [PATCH 10/11] xl: xl block-attach -N (dry run) option Ian Jackson 2011-06-03 15:04 ` [PATCH 09/11] xl: implement -N (dry run) global option for create and cpupool-create Ian Campbell 2011-06-03 15:04 ` [PATCH 08/11] xl: new global -N option for dry run Ian Campbell 1 sibling, 2 replies; 49+ messages in thread From: Ian Jackson @ 2011-06-03 14:54 UTC (permalink / raw) To: xen-devel; +Cc: Ian Jackson, Ian Jackson These subcommands already had "-n" dry run options. Make -N do the same thing, and deprecate those -n options. Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com> --- tools/libxl/xl_cmdimpl.c | 11 +++++------ tools/libxl/xl_cmdtable.c | 10 ++++++---- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 208e745..5c63686 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -3034,7 +3034,7 @@ int main_create(int argc, char **argv) char extra_config[1024]; struct domain_create dom_info; int paused = 0, debug = 0, daemonize = 1, console_autoconnect = 0, - dryrun = 0, quiet = 0, monitor = 1; + quiet = 0, monitor = 1; int opt, rc; int option_index = 0; static struct option long_options[] = { @@ -3079,7 +3079,7 @@ int main_create(int argc, char **argv) help("create"); return 0; case 'n': - dryrun = 1; + dryrun_only = 1; break; case 'q': quiet = 1; @@ -3108,7 +3108,7 @@ int main_create(int argc, char **argv) dom_info.daemonize = daemonize; dom_info.monitor = monitor; dom_info.paused = paused; - dom_info.dryrun = dryrun; + dom_info.dryrun = dryrun_only; dom_info.quiet = quiet; dom_info.config_file = filename; dom_info.extra_config = extra_config; @@ -4564,7 +4564,6 @@ int main_cpupoolcreate(int argc, char **argv) const char *filename = NULL; const char *p; char extra_config[1024]; - int dryrun = 0; int opt; int option_index = 0; static struct option long_options[] = { @@ -4603,7 +4602,7 @@ int main_cpupoolcreate(int argc, char **argv) help("cpupool-create"); return 0; case 'n': - dryrun = 1; + dryrun_only = 1; break; default: fprintf(stderr, "option `%c' not supported.\n", optopt); @@ -4755,7 +4754,7 @@ int main_cpupoolcreate(int argc, char **argv) printf("scheduler: %s\n", sched); printf("number of cpus: %d\n", n_cpus); - if (dryrun) + if (dryrun_only) return 0; poolid = 0; diff --git a/tools/libxl/xl_cmdtable.c b/tools/libxl/xl_cmdtable.c index 5308288..924920b 100644 --- a/tools/libxl/xl_cmdtable.c +++ b/tools/libxl/xl_cmdtable.c @@ -19,7 +19,7 @@ struct cmd_spec cmd_table[] = { { "create", - &main_create, 0, + &main_create, 1, "Create a domain from config file <filename>", "<ConfigFile> [options] [vars]", "-h Print this help.\n" @@ -27,7 +27,8 @@ struct cmd_spec cmd_table[] = { "-c Connect to the console after the domain is created.\n" "-f=FILE, --defconfig=FILE\n Use the given configuration file.\n" "-q, --quiet Quiet.\n" - "-n, --dryrun Dry run - prints the resulting configuration.\n" + "-n, --dryrun Dry run - prints the resulting configuration\n" + " (deprecated in favour of global -N option).\n" "-d Enable debug messages.\n" "-e Do not wait in the background for the death of the domain." }, @@ -322,12 +323,13 @@ struct cmd_spec cmd_table[] = { "", }, { "cpupool-create", - &main_cpupoolcreate, 0, + &main_cpupoolcreate, 1, "Create a CPU pool based an ConfigFile", "[options] <ConfigFile> [vars]", "-h, --help Print this help.\n" "-f=FILE, --defconfig=FILE Use the given configuration file.\n" - "-n, --dryrun Dry run - prints the resulting configuration." + "-n, --dryrun Dry run - prints the resulting configuration.\n" + " (deprecated in favour of global -N option)." }, { "cpupool-list", &main_cpupoollist, 0, -- 1.5.6.5 ^ permalink raw reply related [flat|nested] 49+ messages in thread
* [PATCH 10/11] xl: xl block-attach -N (dry run) option 2011-06-03 14:54 ` [PATCH 09/11] xl: implement -N (dry run) global option for create and cpupool-create Ian Jackson @ 2011-06-03 14:54 ` Ian Jackson 2011-06-03 14:54 ` [PATCH 11/11] xl: new "check-xl-disk-parse" test script for disk parser Ian Jackson ` (2 more replies) 2011-06-03 15:04 ` [PATCH 09/11] xl: implement -N (dry run) global option for create and cpupool-create Ian Campbell 1 sibling, 3 replies; 49+ messages in thread From: Ian Jackson @ 2011-06-03 14:54 UTC (permalink / raw) To: xen-devel; +Cc: Ian Jackson, Ian Jackson Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com> --- tools/libxl/xl_cmdimpl.c | 16 ++++++++++++++++ tools/libxl/xl_cmdtable.c | 2 +- 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 5c63686..d22610c 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -4042,6 +4042,22 @@ int main_blockattach(int argc, char **argv) disk.backend_domid = be_domid; + if (dryrun_only) { + /* fixme: this should be generated from the idl */ + /* fixme: enums (backend, format) should be converted to strings */ + printf("disk.backend_domid = %"PRIx32"\n", disk.backend_domid); + printf("disk.pdev_path = %s\n", disk.pdev_path); + printf("disk.vdev = %s\n", disk.vdev); + printf("disk.backend = %d\n", disk.backend); + printf("disk.format = %d\n", disk.format); + printf("disk.script = %s\n", disk.script); + printf("disk.removable = %d\n", disk.removable); + printf("disk.readwrite = %d\n", disk.readwrite); + printf("disk.is_cdrom = %d\n", disk.is_cdrom); + if (ferror(stdout) || fflush(stdout)) { perror("stdout"); exit(-1); } + return 0; + } + if (libxl_device_disk_add(ctx, fe_domid, &disk)) { fprintf(stderr, "libxl_device_disk_add failed.\n"); } diff --git a/tools/libxl/xl_cmdtable.c b/tools/libxl/xl_cmdtable.c index 924920b..e6ff877 100644 --- a/tools/libxl/xl_cmdtable.c +++ b/tools/libxl/xl_cmdtable.c @@ -256,7 +256,7 @@ struct cmd_spec cmd_table[] = { "<Domain> <DevId|mac>", }, { "block-attach", - &main_blockattach, 0, + &main_blockattach, 1, "Create a new virtual block device", "<Domain> <disk-spec-component(s)>...", }, -- 1.5.6.5 ^ permalink raw reply related [flat|nested] 49+ messages in thread
* [PATCH 11/11] xl: new "check-xl-disk-parse" test script for disk parser 2011-06-03 14:54 ` [PATCH 10/11] xl: xl block-attach -N (dry run) option Ian Jackson @ 2011-06-03 14:54 ` Ian Jackson 2011-06-03 15:09 ` Ian Campbell 2011-06-03 15:05 ` [PATCH 10/11] xl: xl block-attach -N (dry run) option Ian Campbell 2011-06-23 16:36 ` Ian Campbell 2 siblings, 1 reply; 49+ messages in thread From: Ian Jackson @ 2011-06-03 14:54 UTC (permalink / raw) To: xen-devel; +Cc: Ian Jackson, Ian Jackson This runs "xl -N block-attach 0 <some strings>" for various sets of strings and checks that the output is as expected. Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com> --- tools/libxl/check-xl-disk-parse | 82 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 82 insertions(+), 0 deletions(-) create mode 100755 tools/libxl/check-xl-disk-parse diff --git a/tools/libxl/check-xl-disk-parse b/tools/libxl/check-xl-disk-parse new file mode 100755 index 0000000..729926c --- /dev/null +++ b/tools/libxl/check-xl-disk-parse @@ -0,0 +1,82 @@ +#!/bin/bash + +set -e + +fprefix=tmp.check-xl-disk-parse + +expected () { + cat >$fprefix.expected +} + +failures=0 + +one () { + expected_rc=$1; shift + printf "test case %s...\n" "$*" + set +e + LD_LIBRARY_PATH=.:../libxc:../xenstore \ + ./xl -N block-attach 0 "$@" </dev/null >$fprefix.actual 2>/dev/null + actual_rc=$? + diff -u $fprefix.expected $fprefix.actual + diff_rc=$? + set -e + if [ $actual_rc != $expected_rc ] || [ $diff_rc != 0 ]; then + echo >&2 "test case \`$*' failed ($actual_rc $diff_rc)" + failures=$(( $failures + 1 )) + fi +} + +complete () { + if [ "$failures" = 0 ]; then + echo all ok.; exit 0 + else + echo "$failures tests failed."; exit 1 + fi +} + +e=255 + + +#---------- test data ---------- +# +# culled from docs/misc/xl-disk-configuration.txt + +expected </dev/null +one $e foo + +expected <<END +disk.backend_domid = 0 +disk.pdev_path = /dev/vg/guest-volume +disk.vdev = hda +disk.backend = 0 +disk.format = 4 +disk.script = (null) +disk.removable = 0 +disk.readwrite = 1 +disk.is_cdrom = 0 +END +one 0 /dev/vg/guest-volume,,hda +one 0 /dev/vg/guest-volume,raw,hda,rw +one 0 "format=raw, vdev=hda, access=rw, target=/dev/vg/guest-volume" +one 0 format=raw vdev=hda access=rw target=/dev/vg/guest-volume +one 0 raw:/dev/vg/guest-volume,hda,w + +expected <<END +disk.backend_domid = 0 +disk.pdev_path = /root/image.iso +disk.vdev = hdc +disk.backend = 0 +disk.format = 4 +disk.script = (null) +disk.removable = 1 +disk.readwrite = 0 +disk.is_cdrom = 1 +END +one 0 /root/image.iso,,hdc,cdrom +one 0 /root/image.iso,,hdc,,cdrom +one 0 /root/image.iso,raw,hdc,devtype=cdrom +one 0 "format=raw, vdev=hdc, access=ro, devtype=cdrom, target=/root/image.iso" +one 0 format=raw vdev=hdc access=ro devtype=cdrom target=/root/image.iso +one 0 raw:/root/image.iso,hdc:cdrom,ro + +complete -- 1.5.6.5 ^ permalink raw reply related [flat|nested] 49+ messages in thread
* Re: [PATCH 11/11] xl: new "check-xl-disk-parse" test script for disk parser 2011-06-03 14:54 ` [PATCH 11/11] xl: new "check-xl-disk-parse" test script for disk parser Ian Jackson @ 2011-06-03 15:09 ` Ian Campbell 0 siblings, 0 replies; 49+ messages in thread From: Ian Campbell @ 2011-06-03 15:09 UTC (permalink / raw) To: Ian Jackson; +Cc: xen-devel On Fri, 2011-06-03 at 15:54 +0100, Ian Jackson wrote: > This runs "xl -N block-attach 0 <some strings>" for various sets of > strings and checks that the output is as expected. > > Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com> Acked-by: Ian Campbell <ian.campbell@citrix.com> > --- > tools/libxl/check-xl-disk-parse | 82 +++++++++++++++++++++++++++++++++++++++ > 1 files changed, 82 insertions(+), 0 deletions(-) > create mode 100755 tools/libxl/check-xl-disk-parse > > diff --git a/tools/libxl/check-xl-disk-parse b/tools/libxl/check-xl-disk-parse > new file mode 100755 > index 0000000..729926c > --- /dev/null > +++ b/tools/libxl/check-xl-disk-parse > @@ -0,0 +1,82 @@ > +#!/bin/bash > + > +set -e > + > +fprefix=tmp.check-xl-disk-parse > + > +expected () { > + cat >$fprefix.expected > +} > + > +failures=0 > + > +one () { > + expected_rc=$1; shift > + printf "test case %s...\n" "$*" > + set +e > + LD_LIBRARY_PATH=.:../libxc:../xenstore \ > + ./xl -N block-attach 0 "$@" </dev/null >$fprefix.actual 2>/dev/null > + actual_rc=$? > + diff -u $fprefix.expected $fprefix.actual > + diff_rc=$? > + set -e > + if [ $actual_rc != $expected_rc ] || [ $diff_rc != 0 ]; then > + echo >&2 "test case \`$*' failed ($actual_rc $diff_rc)" > + failures=$(( $failures + 1 )) > + fi > +} > + > +complete () { > + if [ "$failures" = 0 ]; then > + echo all ok.; exit 0 > + else > + echo "$failures tests failed."; exit 1 > + fi > +} > + > +e=255 > + > + > +#---------- test data ---------- > +# > +# culled from docs/misc/xl-disk-configuration.txt > + > +expected </dev/null > +one $e foo > + > +expected <<END > +disk.backend_domid = 0 > +disk.pdev_path = /dev/vg/guest-volume > +disk.vdev = hda > +disk.backend = 0 > +disk.format = 4 > +disk.script = (null) > +disk.removable = 0 > +disk.readwrite = 1 > +disk.is_cdrom = 0 > +END > +one 0 /dev/vg/guest-volume,,hda > +one 0 /dev/vg/guest-volume,raw,hda,rw > +one 0 "format=raw, vdev=hda, access=rw, target=/dev/vg/guest-volume" > +one 0 format=raw vdev=hda access=rw target=/dev/vg/guest-volume > +one 0 raw:/dev/vg/guest-volume,hda,w > + > +expected <<END > +disk.backend_domid = 0 > +disk.pdev_path = /root/image.iso > +disk.vdev = hdc > +disk.backend = 0 > +disk.format = 4 > +disk.script = (null) > +disk.removable = 1 > +disk.readwrite = 0 > +disk.is_cdrom = 1 > +END > +one 0 /root/image.iso,,hdc,cdrom > +one 0 /root/image.iso,,hdc,,cdrom > +one 0 /root/image.iso,raw,hdc,devtype=cdrom > +one 0 "format=raw, vdev=hdc, access=ro, devtype=cdrom, target=/root/image.iso" > +one 0 format=raw vdev=hdc access=ro devtype=cdrom target=/root/image.iso > +one 0 raw:/root/image.iso,hdc:cdrom,ro > + > +complete ^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 10/11] xl: xl block-attach -N (dry run) option 2011-06-03 14:54 ` [PATCH 10/11] xl: xl block-attach -N (dry run) option Ian Jackson 2011-06-03 14:54 ` [PATCH 11/11] xl: new "check-xl-disk-parse" test script for disk parser Ian Jackson @ 2011-06-03 15:05 ` Ian Campbell 2011-06-23 16:36 ` Ian Campbell 2 siblings, 0 replies; 49+ messages in thread From: Ian Campbell @ 2011-06-03 15:05 UTC (permalink / raw) To: Ian Jackson; +Cc: xen-devel On Fri, 2011-06-03 at 15:54 +0100, Ian Jackson wrote: > Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com> Acked-by: Ian Campbell <ian.campbell@citrix.com> > --- > tools/libxl/xl_cmdimpl.c | 16 ++++++++++++++++ > tools/libxl/xl_cmdtable.c | 2 +- > 2 files changed, 17 insertions(+), 1 deletions(-) > > diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c > index 5c63686..d22610c 100644 > --- a/tools/libxl/xl_cmdimpl.c > +++ b/tools/libxl/xl_cmdimpl.c > @@ -4042,6 +4042,22 @@ int main_blockattach(int argc, char **argv) > > disk.backend_domid = be_domid; > > + if (dryrun_only) { > + /* fixme: this should be generated from the idl */ > + /* fixme: enums (backend, format) should be converted to strings */ > + printf("disk.backend_domid = %"PRIx32"\n", disk.backend_domid); > + printf("disk.pdev_path = %s\n", disk.pdev_path); > + printf("disk.vdev = %s\n", disk.vdev); > + printf("disk.backend = %d\n", disk.backend); > + printf("disk.format = %d\n", disk.format); > + printf("disk.script = %s\n", disk.script); > + printf("disk.removable = %d\n", disk.removable); > + printf("disk.readwrite = %d\n", disk.readwrite); > + printf("disk.is_cdrom = %d\n", disk.is_cdrom); > + if (ferror(stdout) || fflush(stdout)) { perror("stdout"); exit(-1); } > + return 0; > + } > + > if (libxl_device_disk_add(ctx, fe_domid, &disk)) { > fprintf(stderr, "libxl_device_disk_add failed.\n"); > } > diff --git a/tools/libxl/xl_cmdtable.c b/tools/libxl/xl_cmdtable.c > index 924920b..e6ff877 100644 > --- a/tools/libxl/xl_cmdtable.c > +++ b/tools/libxl/xl_cmdtable.c > @@ -256,7 +256,7 @@ struct cmd_spec cmd_table[] = { > "<Domain> <DevId|mac>", > }, > { "block-attach", > - &main_blockattach, 0, > + &main_blockattach, 1, > "Create a new virtual block device", > "<Domain> <disk-spec-component(s)>...", > }, ^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 10/11] xl: xl block-attach -N (dry run) option 2011-06-03 14:54 ` [PATCH 10/11] xl: xl block-attach -N (dry run) option Ian Jackson 2011-06-03 14:54 ` [PATCH 11/11] xl: new "check-xl-disk-parse" test script for disk parser Ian Jackson 2011-06-03 15:05 ` [PATCH 10/11] xl: xl block-attach -N (dry run) option Ian Campbell @ 2011-06-23 16:36 ` Ian Campbell 2 siblings, 0 replies; 49+ messages in thread From: Ian Campbell @ 2011-06-23 16:36 UTC (permalink / raw) To: Ian Jackson; +Cc: xen-devel On Fri, 2011-06-03 at 15:54 +0100, Ian Jackson wrote: > @@ -4042,6 +4042,22 @@ int main_blockattach(int argc, char **argv) > > disk.backend_domid = be_domid; > > + if (dryrun_only) { > + /* fixme: this should be generated from the idl */ > + /* fixme: enums (backend, format) should be converted to strings */ > + printf("disk.backend_domid = %"PRIx32"\n", disk.backend_domid); > [...] > + printf("disk.is_cdrom = %d\n", disk.is_cdrom); > + if (ferror(stdout) || fflush(stdout)) { perror("stdout"); exit(-1); } > + return 0; With my recent IDL JSON series the incremental patch below produces output like: # xl -N block-attach 0 phy:sda xvda r disk: { "backend_domid": 0, "pdev_path": "sda", "vdev": "xvda", "backend": "phy", "format": "unknown", "script": null, "removable": 1, "readwrite": 0, "is_cdrom": 0 } This will obviously have a knockon effect on your subsequent test harness patch. diff -r 0ab76e3fed8e tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Fri Jun 03 15:54:26 2011 +0100 +++ b/tools/libxl/xl_cmdimpl.c Thu Jun 23 17:31:09 2011 +0100 @@ -4201,17 +4201,9 @@ int main_blockattach(int argc, char **ar disk.backend_domid = be_domid; if (dryrun_only) { - /* fixme: this should be generated from the idl */ - /* fixme: enums (backend, format) should be converted to strings */ - printf("disk.backend_domid = %"PRIx32"\n", disk.backend_domid); - printf("disk.pdev_path = %s\n", disk.pdev_path); - printf("disk.vdev = %s\n", disk.vdev); - printf("disk.backend = %d\n", disk.backend); - printf("disk.format = %d\n", disk.format); - printf("disk.script = %s\n", disk.script); - printf("disk.removable = %d\n", disk.removable); - printf("disk.readwrite = %d\n", disk.readwrite); - printf("disk.is_cdrom = %d\n", disk.is_cdrom); + char *json = libxl_device_disk_to_json(ctx, &disk); + printf("disk: %s\n", json); + free(json); if (ferror(stdout) || fflush(stdout)) { perror("stdout"); exit(-1); } return 0; } ^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 09/11] xl: implement -N (dry run) global option for create and cpupool-create 2011-06-03 14:54 ` [PATCH 09/11] xl: implement -N (dry run) global option for create and cpupool-create Ian Jackson 2011-06-03 14:54 ` [PATCH 10/11] xl: xl block-attach -N (dry run) option Ian Jackson @ 2011-06-03 15:04 ` Ian Campbell 1 sibling, 0 replies; 49+ messages in thread From: Ian Campbell @ 2011-06-03 15:04 UTC (permalink / raw) To: Ian Jackson; +Cc: xen-devel On Fri, 2011-06-03 at 15:54 +0100, Ian Jackson wrote: > These subcommands already had "-n" dry run options. Make -N do the > same thing, and deprecate those -n options. > > Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com> Acked-by: Ian Campbell <ian.campbell@citrix.com> > --- > tools/libxl/xl_cmdimpl.c | 11 +++++------ > tools/libxl/xl_cmdtable.c | 10 ++++++---- > 2 files changed, 11 insertions(+), 10 deletions(-) > > diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c > index 208e745..5c63686 100644 > --- a/tools/libxl/xl_cmdimpl.c > +++ b/tools/libxl/xl_cmdimpl.c > @@ -3034,7 +3034,7 @@ int main_create(int argc, char **argv) > char extra_config[1024]; > struct domain_create dom_info; > int paused = 0, debug = 0, daemonize = 1, console_autoconnect = 0, > - dryrun = 0, quiet = 0, monitor = 1; > + quiet = 0, monitor = 1; > int opt, rc; > int option_index = 0; > static struct option long_options[] = { > @@ -3079,7 +3079,7 @@ int main_create(int argc, char **argv) > help("create"); > return 0; > case 'n': > - dryrun = 1; > + dryrun_only = 1; > break; > case 'q': > quiet = 1; > @@ -3108,7 +3108,7 @@ int main_create(int argc, char **argv) > dom_info.daemonize = daemonize; > dom_info.monitor = monitor; > dom_info.paused = paused; > - dom_info.dryrun = dryrun; > + dom_info.dryrun = dryrun_only; > dom_info.quiet = quiet; > dom_info.config_file = filename; > dom_info.extra_config = extra_config; > @@ -4564,7 +4564,6 @@ int main_cpupoolcreate(int argc, char **argv) > const char *filename = NULL; > const char *p; > char extra_config[1024]; > - int dryrun = 0; > int opt; > int option_index = 0; > static struct option long_options[] = { > @@ -4603,7 +4602,7 @@ int main_cpupoolcreate(int argc, char **argv) > help("cpupool-create"); > return 0; > case 'n': > - dryrun = 1; > + dryrun_only = 1; > break; > default: > fprintf(stderr, "option `%c' not supported.\n", optopt); > @@ -4755,7 +4754,7 @@ int main_cpupoolcreate(int argc, char **argv) > printf("scheduler: %s\n", sched); > printf("number of cpus: %d\n", n_cpus); > > - if (dryrun) > + if (dryrun_only) > return 0; > > poolid = 0; > diff --git a/tools/libxl/xl_cmdtable.c b/tools/libxl/xl_cmdtable.c > index 5308288..924920b 100644 > --- a/tools/libxl/xl_cmdtable.c > +++ b/tools/libxl/xl_cmdtable.c > @@ -19,7 +19,7 @@ > > struct cmd_spec cmd_table[] = { > { "create", > - &main_create, 0, > + &main_create, 1, > "Create a domain from config file <filename>", > "<ConfigFile> [options] [vars]", > "-h Print this help.\n" > @@ -27,7 +27,8 @@ struct cmd_spec cmd_table[] = { > "-c Connect to the console after the domain is created.\n" > "-f=FILE, --defconfig=FILE\n Use the given configuration file.\n" > "-q, --quiet Quiet.\n" > - "-n, --dryrun Dry run - prints the resulting configuration.\n" > + "-n, --dryrun Dry run - prints the resulting configuration\n" > + " (deprecated in favour of global -N option).\n" > "-d Enable debug messages.\n" > "-e Do not wait in the background for the death of the domain." > }, > @@ -322,12 +323,13 @@ struct cmd_spec cmd_table[] = { > "", > }, > { "cpupool-create", > - &main_cpupoolcreate, 0, > + &main_cpupoolcreate, 1, > "Create a CPU pool based an ConfigFile", > "[options] <ConfigFile> [vars]", > "-h, --help Print this help.\n" > "-f=FILE, --defconfig=FILE Use the given configuration file.\n" > - "-n, --dryrun Dry run - prints the resulting configuration." > + "-n, --dryrun Dry run - prints the resulting configuration.\n" > + " (deprecated in favour of global -N option)." > }, > { "cpupool-list", > &main_cpupoollist, 0, > -- > 1.5.6.5 > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xensource.com > http://lists.xensource.com/xen-devel ^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 08/11] xl: new global -N option for dry run 2011-06-03 14:54 ` [PATCH 08/11] xl: new global -N option for dry run Ian Jackson 2011-06-03 14:54 ` [PATCH 09/11] xl: implement -N (dry run) global option for create and cpupool-create Ian Jackson @ 2011-06-03 15:04 ` Ian Campbell 1 sibling, 0 replies; 49+ messages in thread From: Ian Campbell @ 2011-06-03 15:04 UTC (permalink / raw) To: Ian Jackson; +Cc: xen-devel On Fri, 2011-06-03 at 15:54 +0100, Ian Jackson wrote: > This sets a global dryrun_only variable, which individual commands are > expected to honour. To avoid accidents, we introduce a new can_dryrun > member in the command table, which is initially set to 0 for each > command. > > Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com> Acked-by: Ian Campbell <ian.campbell@citrix.com> ^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 8/9] xl: xl block-attach -N (dry run) option 2011-06-02 17:55 ` [PATCH 8/9] xl: xl block-attach -N (dry run) option Ian Jackson 2011-06-02 17:55 ` [PATCH 9/9] xl: new "check-xl-disk-parse" test script for disk parser Ian Jackson 2011-06-03 10:30 ` [PATCH 8/9] xl: xl block-attach -N (dry run) option Ian Campbell @ 2011-06-03 10:38 ` Ian Campbell 2011-06-03 11:13 ` Ian Jackson 2011-06-03 10:46 ` Ian Campbell 3 siblings, 1 reply; 49+ messages in thread From: Ian Campbell @ 2011-06-03 10:38 UTC (permalink / raw) To: Ian Jackson; +Cc: xen-devel On Thu, 2011-06-02 at 18:55 +0100, Ian Jackson wrote: > This is mainly for debugging purposes at the moment. Eventually I > hope all commands will gain this so that -N will be a global option. > > In the meantime this new option is not documented and should be > regarded as unstable. > > Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com> > --- > tools/libxl/xl_cmdimpl.c | 34 +++++++++++++++++++++++++++++++--- > 1 files changed, 31 insertions(+), 3 deletions(-) > > diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c > index d2e343d..ac6d719 100644 > --- a/tools/libxl/xl_cmdimpl.c > +++ b/tools/libxl/xl_cmdimpl.c > @@ -4018,13 +4018,25 @@ int main_networkdetach(int argc, char **argv) > > int main_blockattach(int argc, char **argv) > { > - int opt; > + int opt, dry_run = 0; > uint32_t fe_domid, be_domid = 0; > libxl_device_disk disk = { 0 }; > XLU_Config *config = 0; > > - if ((opt = def_getopt(argc, argv, "", "block-attach", 2)) != -1) > - return opt; > + while ((opt = getopt(argc, argv, "Nh")) != -1) { You've undone part of 23299:39f2942fe56b here, not on purpose? Ian. > + switch (opt) { > + case 'N': > + /* fixme this should become a global option eventually */ > + dry_run = 1; > + break; > + case 'h': > + help("block-attach"); > + return 0; > + default: > + fprintf(stderr, "option `%c' not supported.\n", optopt); > + break; > + } > + } > if ((argc-optind < 2)) { > help("block-attach"); > return 2; > @@ -4041,6 +4053,22 @@ int main_blockattach(int argc, char **argv) > > disk.backend_domid = be_domid; > > + if (dry_run) { > + /* fixme: this should be generated from the idl */ > + /* fixme: enums (backend, format) should be converted to strings */ > + printf("disk.backend_domid = %"PRIx32"\n", disk.backend_domid); > + printf("disk.pdev_path = %s\n", disk.pdev_path); > + printf("disk.vdev = %s\n", disk.vdev); > + printf("disk.backend = %d\n", disk.backend); > + printf("disk.format = %d\n", disk.format); > + printf("disk.script = %s\n", disk.script); > + printf("disk.removable = %d\n", disk.removable); > + printf("disk.readwrite = %d\n", disk.readwrite); > + printf("disk.is_cdrom = %d\n", disk.is_cdrom); > + if (ferror(stdout) || fflush(stdout)) { perror("stdout"); exit(-1); } > + return 0; > + } > + > if (libxl_device_disk_add(ctx, fe_domid, &disk)) { > fprintf(stderr, "libxl_device_disk_add failed.\n"); > } ^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 8/9] xl: xl block-attach -N (dry run) option 2011-06-03 10:38 ` [PATCH 8/9] xl: xl block-attach -N (dry run) option Ian Campbell @ 2011-06-03 11:13 ` Ian Jackson 2011-06-03 12:09 ` Ian Campbell 0 siblings, 1 reply; 49+ messages in thread From: Ian Jackson @ 2011-06-03 11:13 UTC (permalink / raw) To: Ian Campbell; +Cc: xen-devel Ian Campbell writes ("Re: [Xen-devel] [PATCH 8/9] xl: xl block-attach -N (dry run) option"): > On Thu, 2011-06-02 at 18:55 +0100, Ian Jackson wrote: > > - if ((opt = def_getopt(argc, argv, "", "block-attach", 2)) != -1) > > - return opt; > > + while ((opt = getopt(argc, argv, "Nh")) != -1) { > > You've undone part of 23299:39f2942fe56b here, not on purpose? The def_getopt only works if the command doesn't have any nonstandard options, AFAICT. But if we move -N into the global options this becomes unnecessary. Ian. ^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 8/9] xl: xl block-attach -N (dry run) option 2011-06-03 11:13 ` Ian Jackson @ 2011-06-03 12:09 ` Ian Campbell 0 siblings, 0 replies; 49+ messages in thread From: Ian Campbell @ 2011-06-03 12:09 UTC (permalink / raw) To: Ian Jackson; +Cc: xen-devel On Fri, 2011-06-03 at 12:13 +0100, Ian Jackson wrote: > Ian Campbell writes ("Re: [Xen-devel] [PATCH 8/9] xl: xl block-attach -N (dry run) option"): > > On Thu, 2011-06-02 at 18:55 +0100, Ian Jackson wrote: > > > - if ((opt = def_getopt(argc, argv, "", "block-attach", 2)) != -1) > > > - return opt; > > > + while ((opt = getopt(argc, argv, "Nh")) != -1) { > > > > You've undone part of 23299:39f2942fe56b here, not on purpose? > > The def_getopt only works if the command doesn't have any nonstandard > options, AFAICT. I think it does work, the "" above is the nonstandard options specification e.g. main_console takes -n and -t options: while ((opt = def_getopt(argc, argv, "n:t:", "console", 1)) != -1) { switch (opt) { case 0: case 2: return opt; case 't': [...] break; case 'n': [...] > But if we move -N into the global options this becomes unnecessary. Yes. Ian. ^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 8/9] xl: xl block-attach -N (dry run) option 2011-06-02 17:55 ` [PATCH 8/9] xl: xl block-attach -N (dry run) option Ian Jackson ` (2 preceding siblings ...) 2011-06-03 10:38 ` [PATCH 8/9] xl: xl block-attach -N (dry run) option Ian Campbell @ 2011-06-03 10:46 ` Ian Campbell 2011-06-03 11:16 ` Ian Jackson 3 siblings, 1 reply; 49+ messages in thread From: Ian Campbell @ 2011-06-03 10:46 UTC (permalink / raw) To: Ian Jackson; +Cc: xen-devel On Thu, 2011-06-02 at 18:55 +0100, Ian Jackson wrote: > @@ -4041,6 +4053,22 @@ int main_blockattach(int argc, char **argv) > > disk.backend_domid = be_domid; > > + if (dry_run) { > + /* fixme: this should be generated from the idl */ What capabilities do you think we want here? Does it need to be human or machine readable or both? What should the syntax be? Do you think we want functions to get a string of any field or just the entire structure? In principal making the idl generator to this is pretty easy. However if what it produces is only useful to xl because other toolstacks need e.g. xml or json output (or just human syntax which matches their style) then I'm not sure what the best answer is. We could support multiple syntaxes is in libxl (_to_string, _to_xml, _to_json etc etc), supply an IDL driven pretty-printer-printer library (so toolstacks can easily write their own) or supply a libxl function which takes a callback fn "void fn(const char *field, const char *value)" etc. What do you think? (I think I lean towards the final option, unless a single hardcoded syntax is thought to be sufficient). > + /* fixme: enums (backend, format) should be converted to strings */ > + printf("disk.backend_domid = %"PRIx32"\n", disk.backend_domid); > + printf("disk.pdev_path = %s\n", disk.pdev_path); > + printf("disk.vdev = %s\n", disk.vdev); > + printf("disk.backend = %d\n", disk.backend); > + printf("disk.format = %d\n", disk.format); > + printf("disk.script = %s\n", disk.script); > + printf("disk.removable = %d\n", disk.removable); > + printf("disk.readwrite = %d\n", disk.readwrite); > + printf("disk.is_cdrom = %d\n", disk.is_cdrom); Am I being too picky if I say I prefer right aligned ='s ? Maybe we should have two pretty print functions ;-) Ian. > + if (ferror(stdout) || fflush(stdout)) { perror("stdout"); exit(-1); } > + return 0; > + } > + > if (libxl_device_disk_add(ctx, fe_domid, &disk)) { > fprintf(stderr, "libxl_device_disk_add failed.\n"); > } ^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 8/9] xl: xl block-attach -N (dry run) option 2011-06-03 10:46 ` Ian Campbell @ 2011-06-03 11:16 ` Ian Jackson 2011-06-03 13:00 ` Ian Campbell 0 siblings, 1 reply; 49+ messages in thread From: Ian Jackson @ 2011-06-03 11:16 UTC (permalink / raw) To: Ian Campbell; +Cc: xen-devel Ian Campbell writes ("Re: [Xen-devel] [PATCH 8/9] xl: xl block-attach -N (dry run) option"): > On Thu, 2011-06-02 at 18:55 +0100, Ian Jackson wrote: > > @@ -4041,6 +4053,22 @@ int main_blockattach(int argc, char **argv) > > > > disk.backend_domid = be_domid; > > > > + if (dry_run) { > > + /* fixme: this should be generated from the idl */ > > What capabilities do you think we want here? > > Does it need to be human or machine readable or both? What should the > syntax be? It should be both human- and machine-readable, although I'm not asking right now for the machine parser to exist. I don't mind what the syntax is but one value per line is probably a good start. > Do you think we want functions to get a string of any field or just the > entire structure? Just the entire structure. > In principal making the idl generator to this is pretty easy. However if > what it produces is only useful to xl because other toolstacks need e.g. > xml or json output (or just human syntax which matches their style) then > I'm not sure what the best answer is. JSON would be a good concrete syntax. > We could support multiple syntaxes is in libxl (_to_string, _to_xml, > _to_json etc etc), supply an IDL driven pretty-printer-printer library > (so toolstacks can easily write their own) or supply a libxl function > which takes a callback fn "void fn(const char *field, const char > *value)" etc. If we had a competent JSON pretty-printer it would do as the human-readable output too. We shouldn't be encouraging XML :-). > What do you think? (I think I lean towards the final option, unless a > single hardcoded syntax is thought to be sufficient). The prototype you suggest is not sufficient because field members may be structures, so the whole thing needs to be recursive. If you want reasonable output from a recursive pretty-printer you need to pass an indent level etc. Ian. ^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 8/9] xl: xl block-attach -N (dry run) option 2011-06-03 11:16 ` Ian Jackson @ 2011-06-03 13:00 ` Ian Campbell 0 siblings, 0 replies; 49+ messages in thread From: Ian Campbell @ 2011-06-03 13:00 UTC (permalink / raw) To: Ian Jackson; +Cc: xen-devel On Fri, 2011-06-03 at 12:16 +0100, Ian Jackson wrote: [...] > Just the entire structure. [...] > JSON would be a good concrete syntax. [...] > If we had a competent JSON pretty-printer it would do as the > human-readable output too. Should be pretty easy. QMP support in libxl is also going to require a JSON library (for internal use by libxl, not exposed to libxl users), which hopefully has functions which make the pretty part trivial. > We shouldn't be encouraging XML :-). :-D > > What do you think? (I think I lean towards the final option, unless a > > single hardcoded syntax is thought to be sufficient). > > The prototype you suggest is not sufficient because field members may > be structures, so the whole thing needs to be recursive. If you want > reasonable output from a recursive pretty-printer you need to pass an > indent level etc. Oh yeah. Add more params to callback as necessary ;-) Ian. ^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 7/9] libxl: disks: allow specification of "backendtype=phy|tap|qdisk" 2011-06-02 17:55 ` [PATCH 7/9] libxl: disks: allow specification of "backendtype=phy|tap|qdisk" Ian Jackson 2011-06-02 17:55 ` [PATCH 8/9] xl: xl block-attach -N (dry run) option Ian Jackson @ 2011-06-03 10:27 ` Ian Campbell 2011-06-03 14:24 ` Ian Jackson 1 sibling, 1 reply; 49+ messages in thread From: Ian Campbell @ 2011-06-03 10:27 UTC (permalink / raw) To: Ian Jackson; +Cc: xen-devel On Thu, 2011-06-02 at 18:55 +0100, Ian Jackson wrote: > Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com> > --- > docs/misc/xl-disk-configuration.txt | 17 + > tools/libxl/libxlu_disk_l.c | 690 +++++++++++++++++++---------------- > tools/libxl/libxlu_disk_l.h | 2 +- > tools/libxl/libxlu_disk_l.l | 9 + > 4 files changed, 395 insertions(+), 323 deletions(-) > > diff --git a/docs/misc/xl-disk-configuration.txt b/docs/misc/xl-disk-configuration.txt > index de0a75e..91e0cc7 100644 > --- a/docs/misc/xl-disk-configuration.txt > +++ b/docs/misc/xl-disk-configuration.txt > @@ -139,6 +139,23 @@ cdrom > Convenience alias for "devtype=cdrom". > > > +backendtype=<backend-type> > +-------------------------- > + > +Description: Specifies the backend implementation to use > +Supported values: phy, tap, qdisk > +Mandatory: No > +Default value: Automatically determine which backend to use. > + > +This does not affect the guest's view of the device. It controls > +which software implementation of the Xen backend driver us used. > + > +Not all backend drivers support all combinations of other options. > +For example, "phy" does not support formats other than "raw". > +Normally this option should not be specified, in which case libxl will > +automatically determine the most suitable backend. The deprecated prefixes ("tapdisk:", "phy:" etc) are explicitly not aliases for any of these, right? In any case... Acked-by: Ian Campbell <ian.campbell@citrix.com> Not really related to this patch but it occurs to me that there probably ought to be backend types for the non-Linux dom0, e.g. *BSD backendd. Ian. > + > + > script=<script> > --------------- ... > diff --git a/tools/libxl/libxlu_disk_l.l b/tools/libxl/libxlu_disk_l.l > index 48a1314..e9d43c9 100644 > --- a/tools/libxl/libxlu_disk_l.l > +++ b/tools/libxl/libxlu_disk_l.l > @@ -100,6 +100,14 @@ static void setformat(DiskParseContext *dpc, const char *str) { > else xlu__disk_err(dpc,str,"unknown value for format"); > } > > +/* Sets ->backend from the string. IDL should provide something for this. */ > +static void setbackendtype(DiskParseContext *dpc, const char *str) { > + if ( !strcmp(str,"phy")) DSET(dpc,backend,BACKEND,str,PHY); > + else if (!strcmp(str,"tap")) DSET(dpc,backend,BACKEND,str,TAP); > + else if (!strcmp(str,"qdisk")) DSET(dpc,backend,BACKEND,str,QDISK); > + else xlu__disk_err(dpc,str,"unknown value for backendtype"); > +} > + > #define DEPRECATE(usewhatinstead) /* not currently reported */ > > %} > @@ -131,6 +139,7 @@ devtype=disk,? { DPC->disk->is_cdrom = 0; } > devtype=[^,]*,? { xlu__disk_err(DPC,yytext,"unknown value for type"); } > > access=[^,]*,? { STRIP(','); setaccess(DPC, FROMEQUALS); } > +backendtype=[^,]*? { STRIP(','); setbackendtype(DPC,yytext); } > > vdev=[^,]*,? { STRIP(','); SAVESTRING("vdev", vdev, FROMEQUALS); } > script=[^,]*,? { STRIP(','); SAVESTRING("script", script, FROMEQUALS); } > -- > 1.5.6.5 > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xensource.com > http://lists.xensource.com/xen-devel ^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 7/9] libxl: disks: allow specification of "backendtype=phy|tap|qdisk" 2011-06-03 10:27 ` [PATCH 7/9] libxl: disks: allow specification of "backendtype=phy|tap|qdisk" Ian Campbell @ 2011-06-03 14:24 ` Ian Jackson 2011-06-03 14:32 ` Ian Campbell 0 siblings, 1 reply; 49+ messages in thread From: Ian Jackson @ 2011-06-03 14:24 UTC (permalink / raw) To: Ian Campbell; +Cc: xen-devel Ian Campbell writes ("Re: [Xen-devel] [PATCH 7/9] libxl: disks: allow specification of "backendtype=phy|tap|qdisk""): > On Thu, 2011-06-02 at 18:55 +0100, Ian Jackson wrote: > > +Not all backend drivers support all combinations of other options. > > +For example, "phy" does not support formats other than "raw". > > +Normally this option should not be specified, in which case libxl will > > +automatically determine the most suitable backend. > > The deprecated prefixes ("tapdisk:", "phy:" etc) are explicitly not > aliases for any of these, right? Indeed. > Not really related to this patch but it occurs to me that there probably > ought to be backend types for the non-Linux dom0, e.g. *BSD backendd. Currently there isn't any support for those in libxl. Ian. ^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 7/9] libxl: disks: allow specification of "backendtype=phy|tap|qdisk" 2011-06-03 14:24 ` Ian Jackson @ 2011-06-03 14:32 ` Ian Campbell 0 siblings, 0 replies; 49+ messages in thread From: Ian Campbell @ 2011-06-03 14:32 UTC (permalink / raw) To: Ian Jackson; +Cc: xen-devel On Fri, 2011-06-03 at 15:24 +0100, Ian Jackson wrote: > Ian Campbell writes ("Re: [Xen-devel] [PATCH 7/9] libxl: disks: allow specification of "backendtype=phy|tap|qdisk""): > > On Thu, 2011-06-02 at 18:55 +0100, Ian Jackson wrote: > > > +Not all backend drivers support all combinations of other options. > > > +For example, "phy" does not support formats other than "raw". > > > +Normally this option should not be specified, in which case libxl will > > > +automatically determine the most suitable backend. > > > > The deprecated prefixes ("tapdisk:", "phy:" etc) are explicitly not > > aliases for any of these, right? > > Indeed. > > > Not really related to this patch but it occurs to me that there probably > > ought to be backend types for the non-Linux dom0, e.g. *BSD backendd. > > Currently there isn't any support for those in libxl. Oh, I bet it's triggered by the same xenbus paths as blkback, i.e. it looks like a DEVICE_VBD to libxl. Ian. ^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 6/9] xl: disks: replace block-attach disk config parser with call to xlu_parse_disk 2011-06-02 17:55 ` [PATCH 6/9] xl: disks: replace block-attach disk config parser with call to xlu_parse_disk Ian Jackson 2011-06-02 17:55 ` [PATCH 7/9] libxl: disks: allow specification of "backendtype=phy|tap|qdisk" Ian Jackson @ 2011-06-03 10:21 ` Ian Campbell 1 sibling, 0 replies; 49+ messages in thread From: Ian Campbell @ 2011-06-03 10:21 UTC (permalink / raw) To: Ian Jackson; +Cc: xen-devel On Thu, 2011-06-02 at 18:55 +0100, Ian Jackson wrote: > Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com> Acked-by: Ian Campbell <ian.campbell@citrix.com> > --- > tools/libxl/xl_cmdimpl.c | 50 ++++++-------------------------------------- > tools/libxl/xl_cmdtable.c | 2 +- > 2 files changed, 8 insertions(+), 44 deletions(-) > > diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c > index 63ac79a..d2e343d 100644 > --- a/tools/libxl/xl_cmdimpl.c > +++ b/tools/libxl/xl_cmdimpl.c > @@ -4019,62 +4019,26 @@ int main_networkdetach(int argc, char **argv) > int main_blockattach(int argc, char **argv) > { > int opt; > - const char *tok; > uint32_t fe_domid, be_domid = 0; > libxl_device_disk disk = { 0 }; > + XLU_Config *config = 0; > > if ((opt = def_getopt(argc, argv, "", "block-attach", 2)) != -1) > return opt; > - if (argc-optind > 5) { > + if ((argc-optind < 2)) { > help("block-attach"); > return 2; > } > > - tok = strtok(argv[optind+1], ":"); > - if (!strcmp(tok, "phy")) { > - disk.backend = LIBXL_DISK_BACKEND_PHY; > - } else if (!strcmp(tok, "file")) { > - disk.backend = LIBXL_DISK_BACKEND_TAP; > - } else if (!strcmp(tok, "tap")) { > - tok = strtok(NULL, ":"); > - if (!strcmp(tok, "aio")) { > - disk.backend = LIBXL_DISK_BACKEND_TAP; > - } else if (!strcmp(tok, "vhd")) { > - disk.format = LIBXL_DISK_FORMAT_VHD; > - disk.backend = LIBXL_DISK_BACKEND_TAP; > - } else if (!strcmp(tok, "qcow")) { > - disk.format = LIBXL_DISK_FORMAT_QCOW; > - disk.backend = LIBXL_DISK_BACKEND_QDISK; > - } else if (!strcmp(tok, "qcow2")) { > - disk.format = LIBXL_DISK_FORMAT_QCOW2; > - disk.backend = LIBXL_DISK_BACKEND_QDISK; > - } else { > - fprintf(stderr, "Error: `%s' is not a valid disk image.\n", tok); > - return 1; > - } > - } else { > - fprintf(stderr, "Error: `%s' is not a valid block device.\n", tok); > - return 1; > - } > - disk.pdev_path = strtok(NULL, "\0"); > - if (!disk.pdev_path) { > - fprintf(stderr, "Error: missing path to disk image.\n"); > - return 1; > - } > - disk.vdev = argv[optind+2]; > - disk.removable = 1; > - disk.readwrite = ((argc-optind <= 3) || (argv[optind+3][0] == 'w')); > - > if (domain_qualifier_to_domid(argv[optind], &fe_domid, 0) < 0) { > fprintf(stderr, "%s is an invalid domain identifier\n", argv[optind]); > return 1; > } > - if (argc-optind == 5) { > - if (domain_qualifier_to_domid(argv[optind+4], &be_domid, 0) < 0) { > - fprintf(stderr, "%s is an invalid domain identifier\n", argv[optind+4]); > - return 1; > - } > - } > + optind++; > + > + parse_disk_config_multistring > + (&config, argc-optind, (const char* const*)argv + optind, &disk); > + > disk.backend_domid = be_domid; > > if (libxl_device_disk_add(ctx, fe_domid, &disk)) { > diff --git a/tools/libxl/xl_cmdtable.c b/tools/libxl/xl_cmdtable.c > index 044c24d..a899803 100644 > --- a/tools/libxl/xl_cmdtable.c > +++ b/tools/libxl/xl_cmdtable.c > @@ -257,7 +257,7 @@ struct cmd_spec cmd_table[] = { > { "block-attach", > &main_blockattach, > "Create a new virtual block device", > - "<Domain> <BackDev> <FrontDev> [<Mode>] [BackDomain]", > + "<Domain> <disk-spec-component(s)>...", > }, > { "block-list", > &main_blocklist, ^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 5/9] xl: disks: replace config file disk spec parser with call to xlu_disk_parse 2011-06-02 17:55 ` [PATCH 5/9] xl: disks: replace config file disk spec parser with call to xlu_disk_parse Ian Jackson 2011-06-02 17:55 ` [PATCH 6/9] xl: disks: replace block-attach disk config parser with call to xlu_parse_disk Ian Jackson @ 2011-06-03 10:20 ` Ian Campbell 1 sibling, 0 replies; 49+ messages in thread From: Ian Campbell @ 2011-06-03 10:20 UTC (permalink / raw) To: Ian Jackson; +Cc: xen-devel On Thu, 2011-06-02 at 18:55 +0100, Ian Jackson wrote: > Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com> > --- > tools/libxl/xl_cmdimpl.c | 163 ++++++--------------------------------------- > 1 files changed, 22 insertions(+), 141 deletions(-) I like those stats, Acked-by: Ian Campbell <ian.campbell@citrix.com> > > diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c > index ecfcac4..63ac79a 100644 > --- a/tools/libxl/xl_cmdimpl.c > +++ b/tools/libxl/xl_cmdimpl.c > @@ -477,148 +477,31 @@ static int parse_action_on_shutdown(const char *buf, libxl_action_on_shutdown *a > #define DSTATE_RW 5 > #define DSTATE_TERMINAL 6 > > -static int parse_disk_config(libxl_device_disk *disk, char *buf2) > +static void parse_disk_config_multistring(XLU_Config **config, > + int nspecs, const char *const *specs, > + libxl_device_disk *disk) > { > - int state = DSTATE_INITIAL; > - char *p, *end, *tok; > + int e; > > memset(disk, 0, sizeof(*disk)); > > - for(tok = p = buf2, end = buf2 + strlen(buf2) + 1; p < end; p++) { > - switch(state){ > - case DSTATE_INITIAL: > - if ( *p == ':' ) { > - *p = '\0'; > - if ( !strcmp(tok, "phy") ) { > - state = DSTATE_PHYSPATH; > - disk->format = LIBXL_DISK_FORMAT_RAW; > - disk->backend = LIBXL_DISK_BACKEND_PHY; > - }else if ( !strcmp(tok, "file") ) { > - state = DSTATE_PHYSPATH; > - disk->format = LIBXL_DISK_FORMAT_RAW; > - disk->backend = LIBXL_DISK_BACKEND_TAP; > - }else if ((!strcmp(tok, "tap")) || > - (!strcmp(tok, "tap2"))) { > - state = DSTATE_TAP; > - }else{ > - fprintf(stderr, "Unknown disk type: %s\n", tok); > - return 0; > - } > - tok = p + 1; > - } else if (*p == ',') { > - state = DSTATE_VIRTPATH; > - disk->format = LIBXL_DISK_FORMAT_EMPTY; > - disk->backend = LIBXL_DISK_BACKEND_TAP; > - disk->pdev_path = strdup(""); > - tok = p + 1; > - } > - break; > - case DSTATE_TAP: > - if (*p == ',') { > - disk->format = LIBXL_DISK_FORMAT_RAW; > - disk->backend = LIBXL_DISK_BACKEND_TAP; > - state = DSTATE_PHYSPATH; > - } else if ( *p == ':' ) { > - *p = '\0'; > - if (!strcmp(tok, "aio")) { > - tok = p + 1; > - break; > - } > - if (!strcmp(tok, "vhd")) { > - disk->format = LIBXL_DISK_FORMAT_VHD; > - disk->backend = LIBXL_DISK_BACKEND_TAP; > - }else if ( !strcmp(tok, "qcow") ) { > - disk->format = LIBXL_DISK_FORMAT_QCOW; > - disk->backend = LIBXL_DISK_BACKEND_QDISK; > - }else if ( !strcmp(tok, "qcow2") ) { > - disk->format = LIBXL_DISK_FORMAT_QCOW2; > - disk->backend = LIBXL_DISK_BACKEND_QDISK; > - }else if (!strcmp(tok, "raw")) { > - disk->format = LIBXL_DISK_FORMAT_RAW; > - disk->backend = LIBXL_DISK_BACKEND_TAP; > - } > - else { > - fprintf(stderr, "Unknown tapdisk type: %s\n", tok); > - return 0; > - } > - > - tok = p + 1; > - state = DSTATE_PHYSPATH; > - break; > - } else { > - break; > - } > - case DSTATE_PHYSPATH: > - if ( *p == ',' ) { > - int ioemu_len; > - > - *p = '\0'; > - disk->pdev_path = (*tok) ? strdup(tok) : NULL; > - tok = p + 1; > - > - /* hack for ioemu disk spec */ > - ioemu_len = strlen("ioemu:"); > - state = DSTATE_VIRTPATH; > - if ( tok + ioemu_len < end && > - !strncmp(tok, "ioemu:", ioemu_len)) { > - tok += ioemu_len; > - p += ioemu_len; > - } > - } > - break; > - case DSTATE_VIRTPATH: > - if ( *p == ',' || *p == ':' || *p == '\0' ) { > - switch(*p) { > - case ':': > - state = DSTATE_VIRTTYPE; > - break; > - case ',': > - state = DSTATE_RW; > - break; > - case '\0': > - state = DSTATE_TERMINAL; > - break; > - } > - if ( tok == p ) > - goto out; > - *p = '\0'; > - disk->vdev = (*tok) ? strdup(tok) : NULL; > - tok = p + 1; > - } > - break; > - case DSTATE_VIRTTYPE: > - if ( *p == ',' || *p == '\0' ) { > - *p = '\0'; > - if ( !strcmp(tok, "cdrom") ) { > - disk->is_cdrom = 1; > - disk->removable = 1; > - }else{ > - fprintf(stderr, "Unknown virtual disk type: %s\n", tok); > - return 0; > - } > - tok = p + 1; > - state = (*p == ',') ? DSTATE_RW : DSTATE_TERMINAL; > - } > - break; > - case DSTATE_RW: > - if ( *p == '\0' ) { > - disk->readwrite = (tok[0] == 'w'); > - tok = p + 1; > - state = DSTATE_TERMINAL; > - } > - break; > - case DSTATE_TERMINAL: > - goto out; > - } > + if (!*config) { > + *config = xlu_cfg_init(stderr, "command line"); > + if (!*config) { perror("xlu_cfg_init"); exit(-1); } > } > > -out: > - if ( tok != p || state != DSTATE_TERMINAL ) { > - fprintf(stderr, "parse error in disk config near '%s'\n", tok); > - return 0; > + e = xlu_disk_parse(*config, nspecs, specs, disk); > + if (e == EINVAL) exit(-1); > + if (e) { > + fprintf(stderr,"xlu_disk_parse failed: %s\n",strerror(errno)); > + exit(-1); > } > +} > > - return 1; > +static void parse_disk_config(XLU_Config **config, const char *spec, > + libxl_device_disk *disk) > +{ > + parse_disk_config_multistring(config, 1, &spec, disk); > } > > static void parse_config_data(const char *configfile_filename_report, > @@ -835,9 +718,7 @@ static void parse_config_data(const char *configfile_filename_report, > > d_config->disks = (libxl_device_disk *) realloc(d_config->disks, sizeof (libxl_device_disk) * (d_config->num_disks + 1)); > disk = d_config->disks + d_config->num_disks; > - if ( !parse_disk_config(disk, buf2) ) { > - exit(1); > - } > + parse_disk_config(&config, buf2, disk); > > free(buf2); > d_config->num_disks++; > @@ -1919,6 +1800,7 @@ static void cd_insert(const char *dom, const char *virtdev, char *phys) > { > libxl_device_disk disk; /* we don't free disk's contents */ > char *buf = NULL; > + XLU_Config *config = 0; > > find_domain(dom); > > @@ -1926,10 +1808,9 @@ static void cd_insert(const char *dom, const char *virtdev, char *phys) > fprintf(stderr, "out of memory\n"); > return; > } > - if (!parse_disk_config(&disk, buf)) { > - fprintf(stderr, "format error\n"); > - return; > - } > + > + parse_disk_config(&config, buf, &disk); > + > disk.backend_domid = 0; > > libxl_cdrom_insert(ctx, domid, &disk); ^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 4/9] docs: update xl-disk-configuration.txt to describe new syntax 2011-06-02 17:55 ` [PATCH 4/9] docs: update xl-disk-configuration.txt to describe new syntax Ian Jackson 2011-06-02 17:55 ` [PATCH 5/9] xl: disks: replace config file disk spec parser with call to xlu_disk_parse Ian Jackson @ 2011-06-03 10:19 ` Ian Campbell 1 sibling, 0 replies; 49+ messages in thread From: Ian Campbell @ 2011-06-03 10:19 UTC (permalink / raw) To: Ian Jackson; +Cc: xen-devel On Thu, 2011-06-02 at 18:55 +0100, Ian Jackson wrote: You forgot your signed-off. Acked-by: Ian Campbell <ian.campbell@citrix.com> > --- > docs/misc/xl-disk-configuration.txt | 249 +++++++++++++++++++++-------------- > 1 files changed, 150 insertions(+), 99 deletions(-) > > diff --git a/docs/misc/xl-disk-configuration.txt b/docs/misc/xl-disk-configuration.txt > index 58332a9..de0a75e 100644 > --- a/docs/misc/xl-disk-configuration.txt > +++ b/docs/misc/xl-disk-configuration.txt > @@ -1,57 +1,98 @@ > + --------------------- > + XL DISK CONFIGURATION > + --------------------- > > +This document specifies the xl config file format disk configuration > +option. It has the following form: > > - ---------------------------- > - xl Disk Configuration Option > - ---------------------------- > + disk = [ '<diskspec>', '<diskspec>', ... ] > > -This document provides a brief description of xl disk configuration > -option, different attributes that can be passed through it and the > -format in which they need to be specified. > +where each diskspec is in this form: > + > + [<key>=<value>|<flag>,]*, > + [<target>, [<format>, [<vdev>, [<access>]]]], > + [<key>=<value>|<flag>,]* > + [target=<target>] > > -At a higher level, xl disk configuration option takes the following > -format: > > - disk = [ '[format:][path],vdev[:type],attrib', > - '[format:][path],vdev[:type],attrib', ... ] > +For example, these strings are equivalent: > > -Not all attributes are required (the attributes enclosed within square > -brackets above are optional) and some are deprecated. Following is a > -brief description of each of the attribute along with information on > -whether or not they are mandatory. > + /dev/vg/guest-volume,,hda > + /dev/vg/guest-volume,raw,hda,rw > + format=raw, vdev=hda, access=rw, target=/dev/vg/guest-volume > + raw:/dev/vg/guest-volume,hda,w (deprecated, see below) > > +As are these: > > ------------------- > -Attribute Details > ------------------- > + /root/image.iso,,hdc,cdrom > + /root/image.iso,,hdc,,cdrom > + /root/image.iso,raw,hdc,devtype=cdrom > + format=raw, vdev=hdc, access=ro, devtype=cdrom, target=/root/image.iso > + raw:/root/image.iso,hdc:cdrom,ro (deprecated, see below) > > +These might be specified in the domain config file like this: > > -format: > ------- > + disk = [ '/dev/vg/guest-volume,,hda', '/root/image.iso,,hdc,cdrom' ] > > -Description: Specifies the format of image file. > -Supported values: raw, qcow, qcow2, vhd > -Deprecated values: None > -Mandatory: No. When not specified raw format is assumed. > - For a physical block device the format must be > - raw and need not be explicitly specified. For > - an image file the format could be one of the > - supported values and when not specified assumed > - to be raw. > -path: > ----- > > -Description: Block device or image file path. For a > - physical block device a /dev will be prepended > - when not specified and when the path doesn't > - start with a '/'. > +More formally, the string is a series of comma-separated keyword/value > +pairs, flags and positional parameters. Parameters which are not bare > +keywords and which do not contain "=" symbols are assigned to the > +so-far-unspecified positional parameters, in the order below. The > +positional parameters may also be specified explicitly by name. > + > +Each parameter may be specified at most once, either as a positional > +parameter or a named parameter. Default values apply if the parameter > +is not specified, or if it is specified with an empty value (whether > +positionally or explicitly). > + > +Whitespace may appear before each parameter and will be ignored. > + > + > +===================== > +POSITIONAL PARAMETERS > +===================== > + > +target > +------ > + > +Description: Block device or image file path. When this is > + used as a path, /dev will be prepended > + if the path doesn't start with a '/'. > Supported values: N/A > Deprecated values: N/A > -Mandatory: No. While a path is provided in most cases > - there is an exception. For a cdrom device, lack > +Default value: None. While a path is provided in most cases > + there is an exception: for a cdrom device, lack > of this attribute would imply an empty cdrom > drive. > > -vdev: > +Special syntax: > + > + When this parameter is specified by name, ie with the "target=" > + syntax in the configuration file, it consumes the whole rest of the > + <diskspec>. Therefore in that case it must come last. This is > + permissible even if an empty value for the target was already > + specifed as a positional parameter. This is the only way to > + specify a target string containing metacharacters such as commas > + and (in some cases) colons, which would otherwise be > + misinterpreted. > + > + Future parameter and flag names will start with an ascii letter and > + contain only ascii alphanumerics, hyphens and underscores, and will > + not be legal as vdevs. Targets which might match that syntax > + should not be specified as positional parameters. > + > + > +format > +------ > + > +Description: Specifies the format of image file. > +Supported values: raw, qcow, qcow2, vhd > +Deprecated values: None > +Default value: raw > + > + > +vdev > ---- > > Description: Virtual device as seen by the guest (also > @@ -60,95 +101,105 @@ Description: Virtual device as seen by the guest (also > Supported values: hd[x], xvd[x], sd[x] etc. Please refer to the > above specification for further details. > Deprecated values: None > -Mandatory: Yes > +Default Value: None, this parameter is mandatory. > > -type: > ----- > - > -Description: Qualifies virtual device type. > -Supported values: cdrom > -Deprecated values: None > -Mandatory: No > > -attrib: > ------- > +access > +------- > > Description: Specified access control information. Whether > or not the block device is provided to the > guest in read-only or read-write mode depends > on this attribute. > -Supported values: 'r', 'w' > +Supported values: ro, r (specifies read-only) > + rw, w (specifies read/write) > Deprecated values: None > -Mandatory: Yes > +Default value: rw > + unless devtype=cdrom, in which case r > > > --------------- > -Example usages > --------------- > > -disk = [ 'vhd:/path/to/dev,hda,w', '/path/to/iso,hdc:cdrom,r' ] > -disk = [ 'path/to/phy/dev,hda,w', '/dev/cdrom,hdc:cdrom,r' ] > -disk = [ 'qcow:/path/to/file,hda,w' ] > -disk = [ 'qcow2:/path/to/file,hda,w', 'raw:/path/to/dev,hdc:cdrom,r' ] > +========================== > +OTHER PARAMETERS AND FLAGS > +========================== > > > -------------------------- > -Miscellaneous Information > -------------------------- > +devtype=<devtype> > +----------------- > > ---------------------- > -Deprecated Attributes > ---------------------- > +Description: Qualifies virtual device type. > +Supported values: cdrom > +Deprecated values: None > +Mandatory: No > > -Deprecated values are acceptable and will work the way they did > -earlier except with a warning message printed to the xl log or screen. > -However it's usage is supported purely for backward compatibility > -purpose and not recommended. Also, support for these deprecated > -attributes are likely to be dropped in future versions of xl. > > -The block-dev-type and access-type deprecated attributes described > -below are prepended to the format attribute. Example - tap:aio:qcow > -Further details on the deprecated attributes are below: > +cdrom > +----- > > -block-dev-type: > --------------- > +Convenience alias for "devtype=cdrom". > > -Description: Specifies the block device type. > -Supported values: phy,file, tap, tap2 > > -access-type: > ------------ > +script=<script> > +--------------- > > -Description: Backend implementation option to choose from > - while accessing block device. > - Example: tap:aio:vhd:/path/to/file > -Supported values: 'aio', 'tapdisk', 'ioemu' > +Specifies that <target> is not a normal host path, but rather > +information to be interpreted by /etc/xen/scripts/block-<script>. > > ---------------------- > -Impementation Details > ---------------------- > > -Backend Details: > ---------------- > > -For 'phy' block device type, blkback is always used as the backend. > -When the running dom0 instance does not support blkback, block device > -access will fail. For block device type 'file' with format raw or > -when no format specfied, tapdisk2 is used when present otherwise qemu > -fallback option is used. For 'file', 'tap' or 'tap2' block device > -type with format 'vhd', only tapdisk2 is used as qemu does not support > -vhd format. Absence of tapdisk2 support in this case will result in > -failure. When it comes to image format and how that affects the > -backend choice, for qcow/qcow2 qemu backend is used as tapdisk2 does > -not work with these formats. For raw format image file, tapdisk2 is > -used and when not available qemu backend is used as fallback. For vhd > -format, as mentioned earlier tapdisk2 is used and tapdisk2 > -unavailability will result in failure as qemu fallback option does not > -support vhd file format. > +================================== > +DEPRECATED PARAMETERS AND PREFIXES > +================================== > + > +Deprecated values are acceptable and are intended work compatibly with > +xend and xl from xen 4.1. In future they may print a warning. > +Support for deprecated parameters and syntaxes are likely to be > +dropped in future versions of xl. > + > +There is also support for a deprecated old syntax for <diskspec>: > + > + [<format>:][<target>],<vdev>[:<devtype>],<access> (deprecated) > + > +This syntax also supports deprecated prefixes, described below. These > +are found prepended to the format parameter - eg "tap:aio:qcow:". > + > + > +<format>: > +--------- > + > +Description: Specifies the format (deprecated) > +Supported values: raw: qcow2: vhd: > + > +In xend and old versions of libxl it was necessary to specify the > +format with a prefix. For compatibility, these three prefixes are > +recognised as specifying the corresponding format. They are > +equivalent to "format=<format>" or the specification of <format> > +(without a colon) as a positional parameter. > + > + > +<script>: > +--------- > > +Description: Specifies the script (deprecated) > +Supported values: iscsi: nbd: enbd: drbd: > > +In xend and old versions of libxl it was necessary to specify the > +"script" (see above) with a prefix. For compatibility, these four > +prefixes are recognised as specifying the corresponding script. They > +are equivalent to "script=<script>". > > > +<deprecated-prefix>: > +-------------------- > > +Description; Deprecated prefix, ignored > +Supported values: tapdisk: tap2: aio: ioemu: file: phy: > > +Various prefixes were required by xend and older versions of libxl to > +make the block devices work. In some cases these options would > +override the backend type, but in other cases they would be ignored in > +favour of "making it work"; in yet other cases it would be necessary > +to specify several of these, for example: > + "tap:aio:/some/path..." > > +All of these prefixes are now stripped and ignored. > -- > 1.5.6.5 > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xensource.com > http://lists.xensource.com/xen-devel ^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 3/9] libxl: disks: commit libxlu_disk_l.[ch] flex output 2011-06-02 17:55 ` [PATCH 3/9] libxl: disks: commit libxlu_disk_l.[ch] flex output Ian Jackson 2011-06-02 17:55 ` [PATCH 4/9] docs: update xl-disk-configuration.txt to describe new syntax Ian Jackson @ 2011-06-03 10:19 ` Ian Campbell 1 sibling, 0 replies; 49+ messages in thread From: Ian Campbell @ 2011-06-03 10:19 UTC (permalink / raw) To: Ian Jackson; +Cc: xen-devel On Thu, 2011-06-02 at 18:55 +0100, Ian Jackson wrote: > Commit the flex output into revision control, for the benefit of those > without flex or with only very old flex. This change is split into a > separate patch for ease of review. Generated with flex 2.5.35-6 on > Debian lenny i386, by running "make" in the libxl directory. No > manual changes in this commit. > > Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com> Acked-by: Ian Campbell <ian.campbell@citrix.com> ... on the basis that I can hardly ack 2/9 and not this... ^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 2/9] libxl: disks: new xlu_disk_parse function 2011-06-02 17:55 ` [PATCH 2/9] libxl: disks: new xlu_disk_parse function Ian Jackson 2011-06-02 17:55 ` [PATCH 3/9] libxl: disks: commit libxlu_disk_l.[ch] flex output Ian Jackson @ 2011-06-03 10:08 ` Ian Campbell 2011-06-03 11:10 ` Ian Jackson 2011-06-03 10:18 ` Ian Campbell 2 siblings, 1 reply; 49+ messages in thread From: Ian Campbell @ 2011-06-03 10:08 UTC (permalink / raw) To: Ian Jackson; +Cc: xen-devel On Thu, 2011-06-02 at 18:55 +0100, Ian Jackson wrote: > +/* Sets ->format from the string. IDL should provide something for this. */ (please imagine a thunderclap and cloud of smoke here...) only compile tested. I'm not sure if we need to be more flexible, e.g. allow output in both upper and lower case, accept - where the name has _ etc. 8<------------------------------------------------------------ # HG changeset patch # User Ian Campbell <ian.campbell@citrix.com> # Date 1307095416 -3600 # Node ID fcae8a56112893ac53ff04623af61793a204e555 # Parent bd110eb1481a650db3406bf2da80c76b1bfd7e7d libxl: autogenerate to_string and from_string functions for Enumerations. The generated strings are the lower case enum value names, with underscores. Accepted string for parsing are the same but are case insensitive Signed-off-by: Ian Campbell <ian.campbell@citrix.com> diff -r bd110eb1481a -r fcae8a561128 tools/libxl/gentypes.py --- a/tools/libxl/gentypes.py Fri Jun 03 10:22:22 2011 +0100 +++ b/tools/libxl/gentypes.py Fri Jun 03 11:03:36 2011 +0100 @@ -113,6 +113,40 @@ def libxl_C_type_destroy(ty, v, indent = s = indent + s return s.replace("\n", "\n%s" % indent).rstrip(indent) +def libxl_C_enum_to_string(ty, e, indent = " "): + s = "" + s += "switch(%s) {\n" % e + for v in ty.values: + s += " case %s:\n" % (v.name) + s += " return \"%s\";\n" % (v.valuename.lower()) + s += " default:\n " + s += " return NULL;\n" + s += "}\n" + + if s != "": + s = indent + s + return s.replace("\n", "\n%s" % indent).rstrip(indent) + +def libxl_C_enum_from_string(ty, str, e, indent = " "): + s = "" + s += "static struct { const char *s; %s v; } lookup[] = {\n" % ty.typename + for v in ty.values: + s += " { \"%s\", %s },\n" % (v.valuename.lower(), v.name) + s += "};\n" + s += "int i;\n" + s += "\n" + s += "for (i=0; i<(sizeof(lookup)/sizeof(lookup[0])); i++) {\n" + s += " if (!strcasecmp(lookup[i].s, %s)) {\n" % (str) + s += " %s = lookup[i].v;\n" % (e) + s += " return 0;\n" + s += " }\n" + s += "}\n" + s += "return -1;\n" + + if s != "": + s = indent + s + return s.replace("\n", "\n%s" % indent).rstrip(indent) + if __name__ == '__main__': if len(sys.argv) < 4: print >>sys.stderr, "Usage: gentypes.py <idl> <header> <implementation>" @@ -142,6 +176,9 @@ if __name__ == '__main__': f.write(libxl_C_type_define(ty) + ";\n") if ty.destructor_fn is not None: f.write("void %s(%s *p);\n" % (ty.destructor_fn, ty.typename)) + if isinstance(ty, libxltypes.Enumeration): + f.write("const char *%s_to_string(%s e);\n" % (ty.typename, ty.typename)) + f.write("int %s_from_string(const char *s, %s *e);\n" % (ty.typename, ty.typename)) f.write("\n") f.write("""#endif /* __LIBXL_TYPES_H */\n""") @@ -177,4 +214,19 @@ if __name__ == '__main__': f.write(" memset(p, LIBXL_DTOR_POISON, sizeof(*p));\n") f.write("}\n") f.write("\n") + + for ty in [t for t in types if isinstance(t,libxltypes.Enumeration)]: + f.write("const char *%s_to_string(%s e)\n" % (ty.typename, ty.typename)) + f.write("{\n") + f.write(libxl_C_enum_to_string(ty, "e")) + f.write("}\n") + f.write("\n") + + f.write("int %s_from_string(const char *s, %s *e)\n" % (ty.typename, ty.typename)) + f.write("{\n") + f.write(libxl_C_enum_from_string(ty, "s", "*e")) + f.write("}\n") + f.write("\n") + f.close() + ^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 2/9] libxl: disks: new xlu_disk_parse function 2011-06-03 10:08 ` [PATCH 2/9] libxl: disks: new xlu_disk_parse function Ian Campbell @ 2011-06-03 11:10 ` Ian Jackson 2011-06-03 12:03 ` Ian Campbell 0 siblings, 1 reply; 49+ messages in thread From: Ian Jackson @ 2011-06-03 11:10 UTC (permalink / raw) To: Ian Campbell; +Cc: xen-devel Ian Campbell writes ("Re: [Xen-devel] [PATCH 2/9] libxl: disks: new xlu_disk_parse function"): > On Thu, 2011-06-02 at 18:55 +0100, Ian Jackson wrote: > > +/* Sets ->format from the string. IDL should provide something for this. */ > > (please imagine a thunderclap and cloud of smoke here...) :-). > I'm not sure if we need to be more flexible, e.g. allow output in both > upper and lower case, accept - where the name has _ etc. Those would all be nice to have :-). But I don't think they're that important. > +def libxl_C_enum_from_string(ty, str, e, indent = " "): > + s = "" > + s += "static struct { const char *s; %s v; } lookup[] = {\n" % ty.typename > + for v in ty.values: > + s += " { \"%s\", %s },\n" % (v.valuename.lower(), v.name) > + s += "};\n" > + s += "int i;\n" > + s += "\n" > + s += "for (i=0; i<(sizeof(lookup)/sizeof(lookup[0])); i++) {\n" > + s += " if (!strcasecmp(lookup[i].s, %s)) {\n" % (str) > + s += " %s = lookup[i].v;\n" % (e) > + s += " return 0;\n" > + s += " }\n" > + s += "}\n" > + s += "return -1;\n" This is a bit mad, isn't it ? I mean, we could have a non-autogenerated "lookup string from table" function and only autogenerate the tables. I think that's a nicer interface for callers, too - for example, they can print a list of options if they want to, etc. Ian. ^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 2/9] libxl: disks: new xlu_disk_parse function 2011-06-03 11:10 ` Ian Jackson @ 2011-06-03 12:03 ` Ian Campbell 2011-06-03 14:06 ` Ian Campbell 0 siblings, 1 reply; 49+ messages in thread From: Ian Campbell @ 2011-06-03 12:03 UTC (permalink / raw) To: Ian Jackson; +Cc: xen-devel On Fri, 2011-06-03 at 12:10 +0100, Ian Jackson wrote: > Ian Campbell writes ("Re: [Xen-devel] [PATCH 2/9] libxl: disks: new xlu_disk_parse function"): > > On Thu, 2011-06-02 at 18:55 +0100, Ian Jackson wrote: > > > +/* Sets ->format from the string. IDL should provide something for this. */ > > > > (please imagine a thunderclap and cloud of smoke here...) > > :-). > > > I'm not sure if we need to be more flexible, e.g. allow output in both > > upper and lower case, accept - where the name has _ etc. > > Those would all be nice to have :-). But I don't think they're that > important. > > > +def libxl_C_enum_from_string(ty, str, e, indent = " "): > > + s = "" > > + s += "static struct { const char *s; %s v; } lookup[] = {\n" % ty.typename > > + for v in ty.values: > > + s += " { \"%s\", %s },\n" % (v.valuename.lower(), v.name) > > + s += "};\n" > > + s += "int i;\n" > > + s += "\n" > > + s += "for (i=0; i<(sizeof(lookup)/sizeof(lookup[0])); i++) {\n" > > + s += " if (!strcasecmp(lookup[i].s, %s)) {\n" % (str) > > + s += " %s = lookup[i].v;\n" % (e) > > + s += " return 0;\n" > > + s += " }\n" > > + s += "}\n" > > + s += "return -1;\n" > > This is a bit mad, isn't it ? I mean, we could have a > non-autogenerated "lookup string from table" function and only > autogenerate the tables. I think that's a nicer interface for > callers, too - for example, they can print a list of options if they > want to, etc. Yes, I agree. Ian. ^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 2/9] libxl: disks: new xlu_disk_parse function 2011-06-03 12:03 ` Ian Campbell @ 2011-06-03 14:06 ` Ian Campbell 2011-06-21 17:27 ` Ian Jackson 0 siblings, 1 reply; 49+ messages in thread From: Ian Campbell @ 2011-06-03 14:06 UTC (permalink / raw) To: Ian Jackson; +Cc: xen-devel [-- Attachment #1: Type: text/plain, Size: 6317 bytes --] On Fri, 2011-06-03 at 13:03 +0100, Ian Campbell wrote: > On Fri, 2011-06-03 at 12:10 +0100, Ian Jackson wrote: > > This is a bit mad, isn't it ? I mean, we could have a > > non-autogenerated "lookup string from table" function and only > > autogenerate the tables. I think that's a nicer interface for > > callers, too - for example, they can print a list of options if they > > want to, etc. > > Yes, I agree. I ended up providing the table and a lookup function (a wrapper around a common private implementation). I even tested this version ;-) (skanky testprog generator attached, patch not for application, avoid contact with eyes, etc) 8<-------------------------------------------------------------------- # HG changeset patch # User Ian Campbell <ian.campbell@citrix.com> # Date 1307109900 -3600 # Node ID d033fc8122931d13e4921b9a299f4c90f1146757 # Parent bd110eb1481a650db3406bf2da80c76b1bfd7e7d libxl: autogenerate to_string and from_string functions for Enumerations. The generated strings are the lower case enum value names, with underscores. Accepted string for parsing are the same but are case insensitive. We provide a table of strings->value for each Enumeration as well as a convenience function to perform a lookup. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> diff -r bd110eb1481a -r d033fc812293 tools/libxl/gentypes.py --- a/tools/libxl/gentypes.py Fri Jun 03 10:22:22 2011 +0100 +++ b/tools/libxl/gentypes.py Fri Jun 03 15:05:00 2011 +0100 @@ -113,6 +113,43 @@ def libxl_C_type_destroy(ty, v, indent = s = indent + s return s.replace("\n", "\n%s" % indent).rstrip(indent) +def libxl_C_enum_to_string(ty, e, indent = " "): + s = "" + s += "switch(%s) {\n" % e + for v in ty.values: + s += " case %s:\n" % (v.name) + s += " return \"%s\";\n" % (v.valuename.lower()) + s += " default:\n " + s += " return NULL;\n" + s += "}\n" + + if s != "": + s = indent + s + return s.replace("\n", "\n%s" % indent).rstrip(indent) + +def libxl_C_enum_strings(ty, indent=""): + s = "" + s += "libxl_enum_string_table %s_string_table[] = {\n" % (ty.typename) + for v in ty.values: + s += " { .s = \"%s\", .v = %s },\n" % (v.valuename.lower(), v.name) + s += " { NULL, -1 },\n" + s += "};\n" + s += "\n" + + if s != "": + s = indent + s + return s.replace("\n", "\n%s" % indent).rstrip(indent) + +def libxl_C_enum_from_string(ty, str, e, indent = " "): + s = "" + s += "return libxl__enum_from_string(%s_string_table,\n" % ty.typename + s += " %s, (int *)%s);\n" % (str, e) + + if s != "": + s = indent + s + return s.replace("\n", "\n%s" % indent).rstrip(indent) + + if __name__ == '__main__': if len(sys.argv) < 4: print >>sys.stderr, "Usage: gentypes.py <idl> <header> <implementation>" @@ -142,6 +179,10 @@ if __name__ == '__main__': f.write(libxl_C_type_define(ty) + ";\n") if ty.destructor_fn is not None: f.write("void %s(%s *p);\n" % (ty.destructor_fn, ty.typename)) + if isinstance(ty, libxltypes.Enumeration): + f.write("const char *%s_to_string(%s e);\n" % (ty.typename, ty.typename)) + f.write("int %s_from_string(const char *s, %s *e);\n" % (ty.typename, ty.typename)) + f.write("extern libxl_enum_string_table %s_string_table[];\n" % (ty.typename)) f.write("\n") f.write("""#endif /* __LIBXL_TYPES_H */\n""") @@ -165,6 +206,7 @@ if __name__ == '__main__': #include <string.h> #include "libxl.h" +#include "libxl_internal.h" #define LIBXL_DTOR_POISON 0xa5 @@ -177,4 +219,21 @@ if __name__ == '__main__': f.write(" memset(p, LIBXL_DTOR_POISON, sizeof(*p));\n") f.write("}\n") f.write("\n") + + for ty in [t for t in types if isinstance(t,libxltypes.Enumeration)]: + f.write("const char *%s_to_string(%s e)\n" % (ty.typename, ty.typename)) + f.write("{\n") + f.write(libxl_C_enum_to_string(ty, "e")) + f.write("}\n") + f.write("\n") + + f.write(libxl_C_enum_strings(ty)) + + f.write("int %s_from_string(const char *s, %s *e)\n" % (ty.typename, ty.typename)) + f.write("{\n") + f.write(libxl_C_enum_from_string(ty, "s", "e")) + f.write("}\n") + f.write("\n") + + f.close() diff -r bd110eb1481a -r d033fc812293 tools/libxl/libxl.h --- a/tools/libxl/libxl.h Fri Jun 03 10:22:22 2011 +0100 +++ b/tools/libxl/libxl.h Fri Jun 03 15:05:00 2011 +0100 @@ -185,6 +185,17 @@ void libxl_cpuid_destroy(libxl_cpuid_pol typedef uint32_t libxl_domid; +/* + * Formatting Enumerations. + * + * Each enumeration type libxl_E declares an associated lookup table + * libxl_E_string_table and a lookup function libxl_E_from_string. + */ +typedef struct { + const char *s; + int v; +} libxl_enum_string_table; + #include "_libxl_types.h" typedef struct libxl__ctx libxl_ctx; diff -r bd110eb1481a -r d033fc812293 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri Jun 03 10:22:22 2011 +0100 +++ b/tools/libxl/libxl_internal.h Fri Jun 03 15:05:00 2011 +0100 @@ -323,6 +323,8 @@ _hidden char *libxl__abs_path(libxl__gc _hidden char *libxl__domid_to_name(libxl__gc *gc, uint32_t domid); _hidden char *libxl__cpupoolid_to_name(libxl__gc *gc, uint32_t poolid); +_hidden int libxl__enum_from_string(const libxl_enum_string_table *t, + const char *s, int *e); /* holds the CPUID response for a single CPUID leaf * input contains the value of the EAX and ECX register, diff -r bd110eb1481a -r d033fc812293 tools/libxl/libxl_utils.c --- a/tools/libxl/libxl_utils.c Fri Jun 03 10:22:22 2011 +0100 +++ b/tools/libxl/libxl_utils.c Fri Jun 03 15:05:00 2011 +0100 @@ -639,3 +639,17 @@ int libxl_get_max_cpus(libxl_ctx *ctx) { return xc_get_max_cpus(ctx->xch); } + +int libxl__enum_from_string(const libxl_enum_string_table *t, + const char *s, int *e) +{ + if (!t) return ERROR_INVAL; + + for( ; t->s; t++) { + if (!strcasecmp(t->s, s)) { + *e = t->v; + return 0; + } + } + return ERROR_FAIL; +} [-- Attachment #2: enumtest.patch --] [-- Type: text/x-patch, Size: 3672 bytes --] # HG changeset patch # User Ian Campbell <ian.campbell@citrix.com> # Date 1307109705 -3600 # Node ID b433d9d9716fa8deccb565bc822703817768d588 # Parent 03f8d29478ef61137d318ccc3d37d938828d2bcd imported patch libxl-debug-test-enum-strings.patch diff -r 03f8d29478ef -r b433d9d9716f tools/libxl/Makefile --- a/tools/libxl/Makefile Fri Jun 03 14:59:31 2011 +0100 +++ b/tools/libxl/Makefile Fri Jun 03 15:01:45 2011 +0100 @@ -44,12 +44,17 @@ AUTOSRCS= libxlu_cfg_y.c libxlu_cfg_l.c LIBXLU_OBJS = libxlu_cfg_y.o libxlu_cfg_l.o libxlu_cfg.o $(LIBXLU_OBJS): CFLAGS += $(CFLAGS_libxenctrl) # For xentoollog.h -CLIENTS = xl +CLIENTS = xl testenum XL_OBJS = xl.o xl_cmdimpl.o xl_cmdtable.o $(XL_OBJS): CFLAGS += $(CFLAGS_libxenctrl) # For xentoollog.h $(XL_OBJS): CFLAGS += $(CFLAGS_libxenlight) +testenum.o: CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenlight) +testenum.c: libxl.idl gentest.py + $(PYTHON) gentest.py libxl.idl testenum.c.new + mv testenum.c.new testenum.c + .PHONY: all all: $(CLIENTS) libxenlight.so libxenlight.a libxlutil.so libxlutil.a \ $(AUTOSRCS) $(AUTOINCS) @@ -106,9 +111,12 @@ libxlutil.so.$(XLUMAJOR).$(XLUMINOR): $( libxlutil.a: $(LIBXLU_OBJS) $(AR) rcs libxlutil.a $^ -$(CLIENTS): $(XL_OBJS) libxlutil.so libxenlight.so +xl: $(XL_OBJS) libxlutil.so libxenlight.so $(CC) $(LDFLAGS) -o $@ $(XL_OBJS) libxlutil.so $(LDLIBS_libxenlight) $(LDLIBS_libxenctrl) +testenum: testenum.o libxlutil.so libxenlight.so + $(CC) $(LDFLAGS) -o $@ testenum.o libxlutil.so $(LDLIBS_libxenlight) $(LDLIBS_libxenctrl) + .PHONY: install install: all $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) diff -r 03f8d29478ef -r b433d9d9716f tools/libxl/gentest.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/libxl/gentest.py Fri Jun 03 15:01:45 2011 +0100 @@ -0,0 +1,63 @@ +#!/usr/bin/python + +import sys +import re +import random + +import libxltypes +def randomize_char(c): + if random.random() < 0.5: + return str.lower(c) + else: + return str.upper(c) + +def randomize_case(s): + r = [randomize_char(c) for c in s] + return "".join(r) + +if __name__ == '__main__': + if len(sys.argv) < 3: + print >>sys.stderr, "Usage: gentest.py <idl> <implementation>" + sys.exit(1) + + random.seed() + + idl = sys.argv[1] + (_,types) = libxltypes.parse(idl) + + impl = sys.argv[2] + f = open(impl, "w") + f.write(""" +#include <stdio.h> +#include \"libxl.h\" + +int main(int argc, char **argv) +{ +""") + + for ty in [t for t in types if isinstance(t,libxltypes.Enumeration)]: + f.write(" %s %s_val;\n" % (ty.typename, ty.typename)) + f.write(" int rc;\n") + f.write("\n") + + for ty in [t for t in types if isinstance(t,libxltypes.Enumeration)]: + f.write(" printf(\"%s -- to string:\\n\");\n" % (ty.typename)) + for v in ty.values: + f.write(" printf(\"\\t%s = %%d = \\\"%%s\\\"\\n\", %s, %s_to_string(%s));\n" %\ + (v.valuename, v.name, ty.typename, v.name)) + f.write("\n") + + f.write(" printf(\"%s -- from string:\\n\");\n" % (ty.typename)) + for v in [v.valuename for v in ty.values] + ["AN INVALID VALUE"]: + n = randomize_case(v) + f.write(" %s_val = -1;\n" % (ty.typename)) + f.write(" rc = %s_from_string(\"%s\", &%s_val);\n" %\ + (ty.typename, n, ty.typename)) + + f.write(" printf(\"\\t%s = \\\"%%s\\\" = %%d (rc %%d)\\n\", \"%s\", %s_val, rc);\n" %\ + (v, n, ty.typename)) + f.write("\n") + + f.write("""return 0; +} +""") [-- Attachment #3: Type: text/plain, Size: 138 bytes --] _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel ^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 2/9] libxl: disks: new xlu_disk_parse function 2011-06-03 14:06 ` Ian Campbell @ 2011-06-21 17:27 ` Ian Jackson 2011-06-22 8:19 ` Ian Campbell 0 siblings, 1 reply; 49+ messages in thread From: Ian Jackson @ 2011-06-21 17:27 UTC (permalink / raw) To: Ian Campbell; +Cc: xen-devel Ian Campbell writes ("Re: [Xen-devel] [PATCH 2/9] libxl: disks: new xlu_disk_parse function"): > libxl: autogenerate to_string and from_string functions for Enumerations. Applied, thanks. I fixed up the .hgignore which you forgot to edit. Ian. ^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 2/9] libxl: disks: new xlu_disk_parse function 2011-06-21 17:27 ` Ian Jackson @ 2011-06-22 8:19 ` Ian Campbell 2011-06-22 13:16 ` Ian Campbell 0 siblings, 1 reply; 49+ messages in thread From: Ian Campbell @ 2011-06-22 8:19 UTC (permalink / raw) To: Ian Jackson; +Cc: xen-devel On Tue, 2011-06-21 at 18:27 +0100, Ian Jackson wrote: > Ian Campbell writes ("Re: [Xen-devel] [PATCH 2/9] libxl: disks: new xlu_disk_parse function"): > > libxl: autogenerate to_string and from_string functions for Enumerations. > > Applied, thanks. Thanks but... > I fixed up the .hgignore which you forgot to edit. ...you weren't supposed to apply that bit, I said about the testenum.patch attachment: > (skanky testprog generator attached, patch not for application, avoid > contact with eyes, etc) I think you are supposed to rinse with clear running water and then consult a doctor at this point... ;-) I suppose it's not all that skanky and there is some value to it though... Ian. ^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 2/9] libxl: disks: new xlu_disk_parse function 2011-06-22 8:19 ` Ian Campbell @ 2011-06-22 13:16 ` Ian Campbell 0 siblings, 0 replies; 49+ messages in thread From: Ian Campbell @ 2011-06-22 13:16 UTC (permalink / raw) To: Ian Jackson; +Cc: xen-devel On Wed, 2011-06-22 at 09:19 +0100, Ian Campbell wrote: > On Tue, 2011-06-21 at 18:27 +0100, Ian Jackson wrote: > > Ian Campbell writes ("Re: [Xen-devel] [PATCH 2/9] libxl: disks: new xlu_disk_parse function"): > > > libxl: autogenerate to_string and from_string functions for Enumerations. > > > > Applied, thanks. > > Thanks but... > > > I fixed up the .hgignore which you forgot to edit. > > ...you weren't supposed to apply that bit, I said about the > testenum.patch attachment: > > (skanky testprog generator attached, patch not for application, avoid > > contact with eyes, etc) > > I think you are supposed to rinse with clear running water and then > consult a doctor at this point... ;-) > > I suppose it's not all that skanky and there is some value to it > though... Although tools/libxl/testenum.c shouldn't have been checked in at all, it's autogenerated.... Ian. ^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 2/9] libxl: disks: new xlu_disk_parse function 2011-06-02 17:55 ` [PATCH 2/9] libxl: disks: new xlu_disk_parse function Ian Jackson 2011-06-02 17:55 ` [PATCH 3/9] libxl: disks: commit libxlu_disk_l.[ch] flex output Ian Jackson 2011-06-03 10:08 ` [PATCH 2/9] libxl: disks: new xlu_disk_parse function Ian Campbell @ 2011-06-03 10:18 ` Ian Campbell 2 siblings, 0 replies; 49+ messages in thread From: Ian Campbell @ 2011-06-03 10:18 UTC (permalink / raw) To: Ian Jackson; +Cc: xen-devel On Thu, 2011-06-02 at 18:55 +0100, Ian Jackson wrote: > Introduce new flex/regexp-based parser for disk configuration strings. > Callers will be updated in following patches. > > The existing xm command line syntax for block-attach expects multiple > arguments containing different parameters for different parts of the > disk specification, so we supply a parser function which can take > multiple strings and scan them in sequence. > > Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com> So far as I speak enough flex to have a sensible opinion: Acked-by: Ian Campbell <ian.campbell@citrix.com> ^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 1/9] libxl: disks: Make LIBXL_DISK_BACKEND_UNKNOWN work 2011-06-02 17:55 ` [PATCH 1/9] libxl: disks: Make LIBXL_DISK_BACKEND_UNKNOWN work Ian Jackson 2011-06-02 17:55 ` [PATCH 2/9] libxl: disks: new xlu_disk_parse function Ian Jackson @ 2011-06-03 8:42 ` Ian Campbell 2011-06-03 14:24 ` Ian Jackson 1 sibling, 1 reply; 49+ messages in thread From: Ian Campbell @ 2011-06-03 8:42 UTC (permalink / raw) To: Ian Jackson; +Cc: xen-devel On Thu, 2011-06-02 at 18:55 +0100, Ian Jackson wrote: > libxl callers should not be required to specify the backend if they > don't want to. So LIBXL_DISK_BACKEND_UNKNOWN should instruct libxl to > choose the backend for itself. > > For now, we do this by simply treating it the same as BACKEND_TAP, > which itself falls back to other methods. > > More thorough fixes for the disk handling will follow. > > Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com> > --- > tools/libxl/libxl.c | 17 ++++++++++++++++- > 1 files changed, 16 insertions(+), 1 deletions(-) > > diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c > index c21cfe7..58df99c 100644 > --- a/tools/libxl/libxl.c > +++ b/tools/libxl/libxl.c > @@ -991,6 +991,21 @@ int libxl_device_disk_add(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *dis > device.domid = domid; > device.kind = DEVICE_VBD; > > + > + /* > + * Fixing the incoming backend type to try to decide on which > + * backend to use. Unfortunately at the moment this code is > + * utterly broken, but it more or less works. > + */ > + > + /* > + * Backend type UNKNOWN should mean "caller does not want to specify", > + * not "break pointlessely". (Callers should not be required to ^ no e here. > + * specify the backend if they don't want to.) > + */ > + if (disk->backend == LIBXL_DISK_BACKEND_UNKNOWN) > + disk->backend = LIBXL_DISK_BACKEND_TAP; > + > /* If blktap is not available then fallback to qdisk */ > if (disk->backend == LIBXL_DISK_BACKEND_TAP && !libxl__blktap_enabled(&gc)) > disk->backend = LIBXL_DISK_BACKEND_QDISK; > @@ -1138,6 +1153,7 @@ char * libxl_device_disk_local_attach(libxl_ctx *ctx, libxl_device_disk *disk) > dev = disk->pdev_path; > break; > case LIBXL_DISK_BACKEND_TAP: > + case LIBXL_DISK_BACKEND_UNKNOWN: I think this should be treated the same as you did above, by adding an explicit fallback before the switch statement, for clarity. Ian. > if (disk->format == LIBXL_DISK_FORMAT_VHD || > disk->format == LIBXL_DISK_FORMAT_RAW) > { > @@ -1175,7 +1191,6 @@ char * libxl_device_disk_local_attach(libxl_ctx *ctx, libxl_device_disk *disk) > disk->pdev_path); > dev = disk->pdev_path; > break; > - case LIBXL_DISK_BACKEND_UNKNOWN: > default: > LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "unrecognized disk backend " > "type: %d", disk->backend); ^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 1/9] libxl: disks: Make LIBXL_DISK_BACKEND_UNKNOWN work 2011-06-03 8:42 ` [PATCH 1/9] libxl: disks: Make LIBXL_DISK_BACKEND_UNKNOWN work Ian Campbell @ 2011-06-03 14:24 ` Ian Jackson 0 siblings, 0 replies; 49+ messages in thread From: Ian Jackson @ 2011-06-03 14:24 UTC (permalink / raw) To: Ian Campbell; +Cc: xen-devel Ian Campbell writes ("Re: [Xen-devel] [PATCH 1/9] libxl: disks: Make LIBXL_DISK_BACKEND_UNKNOWN work"): > I think this should be treated the same as you did above, by adding an > explicit fallback before the switch statement, for clarity. OK. This results in two copies of the same comment. Really we should have a common function for figuring out the correct backend, but this at least makes things no worse. Ian. commit ee4720b0f9b15be152b10656b9b3e13b83be6c55 Author: Ian Jackson <ian.jackson@eu.citrix.com> Date: Fri May 6 09:02:02 2011 +0100 libxl: disks: Make LIBXL_DISK_BACKEND_UNKNOWN work libxl callers should not be required to specify the backend if they don't want to. So LIBXL_DISK_BACKEND_UNKNOWN should instruct libxl to choose the backend for itself. For now, we do this by simply treating it the same as BACKEND_TAP, which itself falls back to other methods. More thorough fixes for the disk handling will follow. Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com> diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index c21cfe7..a36de58 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -991,6 +991,21 @@ int libxl_device_disk_add(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *dis device.domid = domid; device.kind = DEVICE_VBD; + + /* + * Fixing the incoming backend type to try to decide on which + * backend to use. Unfortunately at the moment this code is + * utterly broken, but it more or less works. + */ + + /* + * Backend type UNKNOWN should mean "caller does not want to specify", + * not "break pointlessely". (Callers should not be required to + * specify the backend if they don't want to.) + */ + if (disk->backend == LIBXL_DISK_BACKEND_UNKNOWN) + disk->backend = LIBXL_DISK_BACKEND_TAP; + /* If blktap is not available then fallback to qdisk */ if (disk->backend == LIBXL_DISK_BACKEND_TAP && !libxl__blktap_enabled(&gc)) disk->backend = LIBXL_DISK_BACKEND_QDISK; @@ -1126,6 +1141,20 @@ char * libxl_device_disk_local_attach(libxl_ctx *ctx, libxl_device_disk *disk) char *dev = NULL; char *ret = NULL; + /* + * Fixing the incoming backend type to try to decide on which + * backend to use. Unfortunately at the moment this code is + * utterly broken, but it more or less works. + */ + + /* + * Backend type UNKNOWN should mean "caller does not want to specify", + * not "break pointlessely". (Callers should not be required to + * specify the backend if they don't want to.) + */ + if (disk->backend == LIBXL_DISK_BACKEND_UNKNOWN) + disk->backend = LIBXL_DISK_BACKEND_TAP; + switch (disk->backend) { case LIBXL_DISK_BACKEND_PHY: if (disk->format != LIBXL_DISK_FORMAT_RAW) { @@ -1175,7 +1204,6 @@ char * libxl_device_disk_local_attach(libxl_ctx *ctx, libxl_device_disk *disk) disk->pdev_path); dev = disk->pdev_path; break; - case LIBXL_DISK_BACKEND_UNKNOWN: default: LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "unrecognized disk backend " "type: %d", disk->backend); ^ permalink raw reply related [flat|nested] 49+ messages in thread
end of thread, other threads:[~2011-06-23 16:36 UTC | newest] Thread overview: 49+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2011-06-02 17:55 [PATCH 0/9] libxl: disk configuration handling Ian Jackson 2011-06-02 17:55 ` [PATCH 1/9] libxl: disks: Make LIBXL_DISK_BACKEND_UNKNOWN work Ian Jackson 2011-06-02 17:55 ` [PATCH 2/9] libxl: disks: new xlu_disk_parse function Ian Jackson 2011-06-02 17:55 ` [PATCH 3/9] libxl: disks: commit libxlu_disk_l.[ch] flex output Ian Jackson 2011-06-02 17:55 ` [PATCH 4/9] docs: update xl-disk-configuration.txt to describe new syntax Ian Jackson 2011-06-02 17:55 ` [PATCH 5/9] xl: disks: replace config file disk spec parser with call to xlu_disk_parse Ian Jackson 2011-06-02 17:55 ` [PATCH 6/9] xl: disks: replace block-attach disk config parser with call to xlu_parse_disk Ian Jackson 2011-06-02 17:55 ` [PATCH 7/9] libxl: disks: allow specification of "backendtype=phy|tap|qdisk" Ian Jackson 2011-06-02 17:55 ` [PATCH 8/9] xl: xl block-attach -N (dry run) option Ian Jackson 2011-06-02 17:55 ` [PATCH 9/9] xl: new "check-xl-disk-parse" test script for disk parser Ian Jackson 2011-06-03 10:38 ` Ian Campbell 2011-06-03 11:12 ` Ian Jackson 2011-06-03 14:25 ` Ian Jackson 2011-06-03 14:32 ` Ian Campbell 2011-06-03 10:30 ` [PATCH 8/9] xl: xl block-attach -N (dry run) option Ian Campbell 2011-06-03 11:17 ` Ian Jackson 2011-06-03 14:54 ` [PATCHES 00/08-11] xl dry run option, and disk parser test script Ian Jackson 2011-06-03 14:54 ` [PATCH 08/11] xl: new global -N option for dry run Ian Jackson 2011-06-03 14:54 ` [PATCH 09/11] xl: implement -N (dry run) global option for create and cpupool-create Ian Jackson 2011-06-03 14:54 ` [PATCH 10/11] xl: xl block-attach -N (dry run) option Ian Jackson 2011-06-03 14:54 ` [PATCH 11/11] xl: new "check-xl-disk-parse" test script for disk parser Ian Jackson 2011-06-03 15:09 ` Ian Campbell 2011-06-03 15:05 ` [PATCH 10/11] xl: xl block-attach -N (dry run) option Ian Campbell 2011-06-23 16:36 ` Ian Campbell 2011-06-03 15:04 ` [PATCH 09/11] xl: implement -N (dry run) global option for create and cpupool-create Ian Campbell 2011-06-03 15:04 ` [PATCH 08/11] xl: new global -N option for dry run Ian Campbell 2011-06-03 10:38 ` [PATCH 8/9] xl: xl block-attach -N (dry run) option Ian Campbell 2011-06-03 11:13 ` Ian Jackson 2011-06-03 12:09 ` Ian Campbell 2011-06-03 10:46 ` Ian Campbell 2011-06-03 11:16 ` Ian Jackson 2011-06-03 13:00 ` Ian Campbell 2011-06-03 10:27 ` [PATCH 7/9] libxl: disks: allow specification of "backendtype=phy|tap|qdisk" Ian Campbell 2011-06-03 14:24 ` Ian Jackson 2011-06-03 14:32 ` Ian Campbell 2011-06-03 10:21 ` [PATCH 6/9] xl: disks: replace block-attach disk config parser with call to xlu_parse_disk Ian Campbell 2011-06-03 10:20 ` [PATCH 5/9] xl: disks: replace config file disk spec parser with call to xlu_disk_parse Ian Campbell 2011-06-03 10:19 ` [PATCH 4/9] docs: update xl-disk-configuration.txt to describe new syntax Ian Campbell 2011-06-03 10:19 ` [PATCH 3/9] libxl: disks: commit libxlu_disk_l.[ch] flex output Ian Campbell 2011-06-03 10:08 ` [PATCH 2/9] libxl: disks: new xlu_disk_parse function Ian Campbell 2011-06-03 11:10 ` Ian Jackson 2011-06-03 12:03 ` Ian Campbell 2011-06-03 14:06 ` Ian Campbell 2011-06-21 17:27 ` Ian Jackson 2011-06-22 8:19 ` Ian Campbell 2011-06-22 13:16 ` Ian Campbell 2011-06-03 10:18 ` Ian Campbell 2011-06-03 8:42 ` [PATCH 1/9] libxl: disks: Make LIBXL_DISK_BACKEND_UNKNOWN work Ian Campbell 2011-06-03 14:24 ` Ian Jackson
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.