# HG changeset patch
# User Wei Liu <liuw@xxxxxxxxx>
# Date 1311087756 -3600
# Node ID 548b2826293ee97d7f1e0909b7d3326dd6d8465b
# Parent 2383077a5ae68d33b4b851a2650fc2fd3ebf8aeb
libxl: clean up trailing whitespaces in code.
Commit exactly the results of running
find \! -iname '*.txt' -type f -print0 | xargs -0 perl -p -i.bak -E
's/\s+\n/\n/'
Signed-off-by: Wei Liu <liuw@xxxxxxxxx>
Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Committed: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
diff -r 2383077a5ae6 -r 548b2826293e tools/libxl/bash-completion
--- a/tools/libxl/bash-completion Tue Jul 19 15:47:14 2011 +0100
+++ b/tools/libxl/bash-completion Tue Jul 19 16:02:36 2011 +0100
@@ -9,7 +9,7 @@
COMPREPLY=()
cur="${COMP_WORDS[COMP_CWORD]}"
xl=xl
-
+
if [[ $COMP_CWORD == 1 ]] ; then
opts=`${xl} help 2>/dev/null | sed '1,4d' | awk '{print $1}' |
sed 's/$/ ,/g'` && COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
return 0
diff -r 2383077a5ae6 -r 548b2826293e tools/libxl/gentest.py
--- a/tools/libxl/gentest.py Tue Jul 19 15:47:14 2011 +0100
+++ b/tools/libxl/gentest.py Tue Jul 19 16:02:36 2011 +0100
@@ -21,10 +21,10 @@
sys.exit(1)
random.seed()
-
+
idl = sys.argv[1]
(_,types) = libxltypes.parse(idl)
-
+
impl = sys.argv[2]
f = open(impl, "w")
f.write("""
@@ -39,7 +39,7 @@
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:
@@ -53,7 +53,7 @@
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")
diff -r 2383077a5ae6 -r 548b2826293e tools/libxl/gentypes.py
--- a/tools/libxl/gentypes.py Tue Jul 19 15:47:14 2011 +0100
+++ b/tools/libxl/gentypes.py Tue Jul 19 16:02:36 2011 +0100
@@ -17,7 +17,7 @@
s += "%s */" % indent
s += "\n"
return s
-
+
def libxl_C_instance_of(ty, instancename):
if isinstance(ty, libxltypes.Aggregate) and ty.typename is None:
if instancename is None:
@@ -33,7 +33,7 @@
if isinstance(ty, libxltypes.Enumeration):
if ty.comment is not None:
s += format_comment(0, ty.comment)
-
+
if ty.typename is None:
s += "enum {\n"
else:
@@ -76,12 +76,12 @@
return s.replace("\n", "\n%s" % indent)
def libxl_C_type_destroy(ty, v, indent = " ", parent = None):
-
+
s = ""
if isinstance(ty, libxltypes.KeyedUnion):
if parent is None:
raise Exception("KeyedUnion type must have a parent")
- s += "switch (%s) {\n" % (parent + ty.keyvar_name)
+ s += "switch (%s) {\n" % (parent + ty.keyvar_name)
for f in ty.fields:
(nparent,fexpr) = ty.member(v, f, parent is None)
s += "case %s:\n" % f.enumname
@@ -95,7 +95,7 @@
else:
if ty.destructor_fn is not None:
s += "%s(%s);\n" % (ty.destructor_fn, ty.pass_arg(v, parent is
None))
-
+
if s != "":
s = indent + s
return s.replace("\n", "\n%s" % indent).rstrip(indent)
@@ -122,7 +122,7 @@
s += " { NULL, -1 },\n"
s += "};\n"
s += "\n"
-
+
if s != "":
s = indent + s
return s.replace("\n", "\n%s" % indent).rstrip(indent)
@@ -131,11 +131,11 @@
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:
@@ -145,11 +145,11 @@
(_, idl, header, impl) = sys.argv
(_,types) = libxltypes.parse(idl)
-
+
print "outputting libxl type definitions to %s" % header
f = open(header, "w")
-
+
f.write("""#ifndef __LIBXL_TYPES_H
#define __LIBXL_TYPES_H
@@ -159,9 +159,9 @@
* This file is autogenerated by
* "%s"
*/
-
+
""" % " ".join(sys.argv))
-
+
for ty in types:
f.write(libxl_C_type_define(ty) + ";\n")
if ty.destructor_fn is not None:
@@ -174,7 +174,7 @@
f.write("""#endif /* __LIBXL_TYPES_H */\n""")
f.close()
-
+
print "outputting libxl type implementations to %s" % impl
f = open(impl, "w")
@@ -213,11 +213,11 @@
f.write("}\n")
f.write("\n")
- f.write(libxl_C_enum_strings(ty))
+ 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(libxl_C_enum_from_string(ty, "s", "e"))
f.write("}\n")
f.write("\n")
diff -r 2383077a5ae6 -r 548b2826293e tools/libxl/libxl.c
--- a/tools/libxl/libxl.c Tue Jul 19 15:47:14 2011 +0100
+++ b/tools/libxl/libxl.c Tue Jul 19 16:02:36 2011 +0100
@@ -64,7 +64,7 @@
ctx->xch = xc_interface_open(lg,lg,0);
if (!ctx->xch) {
- LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, errno,
+ LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, errno,
"cannot open libxc handle");
return ERROR_FAIL;
}
@@ -73,7 +73,7 @@
if (!ctx->xsh)
ctx->xsh = xs_domain_open();
if (!ctx->xsh) {
- LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, errno,
+ LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, errno,
"cannot connect to xenstore");
xc_interface_close(ctx->xch);
return ERROR_FAIL;
@@ -88,7 +88,7 @@
if (!ctx) return 0;
if (ctx->xch) xc_interface_close(ctx->xch);
libxl_version_info_destroy(&ctx->version_info);
- if (ctx->xsh) xs_daemon_close(ctx->xsh);
+ if (ctx->xsh) xs_daemon_close(ctx->xsh);
return 0;
}
@@ -247,15 +247,15 @@
goto out;
}
if (xc_domain_resume(ctx->xch, domid, 0)) {
- LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR,
- "xc_domain_resume failed for domain %u",
+ LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR,
+ "xc_domain_resume failed for domain %u",
domid);
rc = ERROR_FAIL;
goto out;
}
if (!xs_resume_domain(ctx->xsh, domid)) {
- LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR,
- "xs_resume_domain failed for domain %u",
+ LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR,
+ "xs_resume_domain failed for domain %u",
domid);
rc = ERROR_FAIL;
}
@@ -701,7 +701,7 @@
disk->backend = LIBXL_DISK_BACKEND_QDISK;
} else {
disk->backend = LIBXL_DISK_BACKEND_UNKNOWN;
- }
+ }
disk->pdev_path = strdup("");
disk->format = LIBXL_DISK_FORMAT_EMPTY;
@@ -897,7 +897,7 @@
if ( lseek(autopass_fd, SEEK_SET, 0) ) {
LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR,
"rewind %s (autopass) failed", tmpname);
- goto x_fail;
+ goto x_fail;
}
args[2] = "-autopass";
@@ -1527,8 +1527,8 @@
} else {
pdisk->pdev_path = physpath_tmp;
}
- libxl_string_to_backend(ctx, libxl__xs_read(gc, XBT_NULL,
- libxl__sprintf(gc, "%s/%s/type", be_path, *dir)),
+ libxl_string_to_backend(ctx, libxl__xs_read(gc, XBT_NULL,
+ libxl__sprintf(gc, "%s/%s/type", be_path, *dir)),
&(pdisk->backend));
pdisk->vdev = xs_read(ctx->xsh, XBT_NULL, libxl__sprintf(gc,
"%s/%s/dev", be_path, *dir), &len);
removable = libxl__xs_read(gc, XBT_NULL, libxl__sprintf
diff -r 2383077a5ae6 -r 548b2826293e tools/libxl/libxl.h
--- a/tools/libxl/libxl.h Tue Jul 19 15:47:14 2011 +0100
+++ b/tools/libxl/libxl.h Tue Jul 19 16:02:36 2011 +0100
@@ -370,7 +370,7 @@
* if the guest is using stubdoms).
* This function can be called after creating the device model, in
* case of HVM guests, and before libxl_run_bootloader in case of PV
- * guests using pygrub. */
+ * guests using pygrub. */
int libxl_primary_console_exec(libxl_ctx *ctx, uint32_t domid_vm);
int libxl_domain_info(libxl_ctx*, libxl_dominfo *info_r,
@@ -520,7 +520,7 @@
int libxl_flask_context_to_sid(libxl_ctx *ctx, char *buf, size_t len,
uint32_t *ssidref);
-int libxl_flask_sid_to_context(libxl_ctx *ctx, uint32_t ssidref, char **buf,
+int libxl_flask_sid_to_context(libxl_ctx *ctx, uint32_t ssidref, char **buf,
size_t *len);
int libxl_flask_getenforce(libxl_ctx *ctx);
int libxl_flask_setenforce(libxl_ctx *ctx, int mode);
diff -r 2383077a5ae6 -r 548b2826293e tools/libxl/libxl.idl
--- a/tools/libxl/libxl.idl Tue Jul 19 15:47:14 2011 +0100
+++ b/tools/libxl/libxl.idl Tue Jul 19 16:02:36 2011 +0100
@@ -95,8 +95,8 @@
("paused", bool),
("shutdown", bool),
("dying", bool),
-
- ("shutdown_reason", uint8, False,
+
+ ("shutdown_reason", uint8, False,
"""Valid SHUTDOWN_* value from xen/sched.h iff (shutdown||dying).
Otherwise set to a value guaranteed not to clash with any valid
@@ -134,7 +134,7 @@
("pagesize", integer),
("commandline", string),
])
-
+
libxl_domain_create_info = Struct("domain_create_info",[
("type", libxl_domain_type),
("hap", bool),
@@ -212,19 +212,19 @@
("opengl", bool, False, "opengl enabled or disabled
(if enabled requires sdl enabled)"),
("spice", bool, False,
"spice enabled or disabled"),
- ("spiceport", integer, False,
+ ("spiceport", integer, False,
"the port that should be listened on for the spice server"),
("spicetls_port", integer, False, """the tls port
-that should be listened on for the spice server,
+that should be listened on for the spice server,
at least one of the port or tls port must be given"""),
("spicehost", string, False, """the interface
that should be listened on if given otherwise any interface"""),
- ("spicedisable_ticketing", bool, False,
+ ("spicedisable_ticketing", bool, False,
"enable client connection with no password"),
("spicepasswd", string, False, """set ticket password
witch must be used by a client for connection.
The password never expires"""),
- ("spiceagent_mouse", bool, False,
+ ("spiceagent_mouse", bool, False,
"Whether spice agent is used for client mouse mode(default is on)"),
("nographic", bool, False, "no graphics, use serial
port"),
("gfx_passthru", bool, False, "graphics passthrough
enabled or disabled"),
diff -r 2383077a5ae6 -r 548b2826293e tools/libxl/libxl_device.c
--- a/tools/libxl/libxl_device.c Tue Jul 19 15:47:14 2011 +0100
+++ b/tools/libxl/libxl_device.c Tue Jul 19 16:02:36 2011 +0100
@@ -166,7 +166,7 @@
LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "Disk vdev=%s, backend "
" %d unknown", a->disk->vdev, backend);
return 0;
-
+
}
abort(); /* notreached */
@@ -177,7 +177,7 @@
libxl_disk_backend_to_string(backend),
libxl_disk_format_to_string(a->disk->format));
return 0;
-}
+}
int libxl__device_disk_set_backend(libxl__gc *gc, libxl_device_disk *disk) {
libxl_ctx *ctx = libxl__gc_owner(gc);
@@ -240,11 +240,11 @@
{
switch (format) {
case LIBXL_DISK_FORMAT_QCOW: return "qcow";
- case LIBXL_DISK_FORMAT_QCOW2: return "qcow2";
- case LIBXL_DISK_FORMAT_VHD: return "vhd";
+ case LIBXL_DISK_FORMAT_QCOW2: return "qcow2";
+ case LIBXL_DISK_FORMAT_VHD: return "vhd";
case LIBXL_DISK_FORMAT_RAW:
- case LIBXL_DISK_FORMAT_EMPTY: return "aio";
- default: return NULL;
+ case LIBXL_DISK_FORMAT_EMPTY: return "aio";
+ default: return NULL;
}
}
@@ -474,7 +474,7 @@
if (!force) {
/* Linux-ism. Most implementations leave the timeout
* untouched after select. Linux, however, will chip
- * away the elapsed time from it, which is what we
+ * away the elapsed time from it, which is what we
* need to enforce a single time span waiting for
* device destruction. */
struct timeval tv;
diff -r 2383077a5ae6 -r 548b2826293e tools/libxl/libxl_dm.c
--- a/tools/libxl/libxl_dm.c Tue Jul 19 15:47:14 2011 +0100
+++ b/tools/libxl/libxl_dm.c Tue Jul 19 16:02:36 2011 +0100
@@ -120,7 +120,7 @@
vncarg = libxl__sprintf(gc, "%s,password", vncarg);
flexarray_append(dm_args, "-vnc");
flexarray_append(dm_args, vncarg);
-
+
if (info->vncunused) {
flexarray_append(dm_args, "-vncunused");
}
@@ -274,11 +274,11 @@
}
if (strchr(listen, ':') != NULL)
- flexarray_append(dm_args,
+ flexarray_append(dm_args,
libxl__sprintf(gc, "%s%s", listen,
info->vncunused ? ",to=99" : ""));
else
- flexarray_append(dm_args,
+ flexarray_append(dm_args,
libxl__sprintf(gc, "%s:%d%s", listen, display,
info->vncunused ? ",to=99" : ""));
}
diff -r 2383077a5ae6 -r 548b2826293e tools/libxl/libxl_flask.c
--- a/tools/libxl/libxl_flask.c Tue Jul 19 15:47:14 2011 +0100
+++ b/tools/libxl/libxl_flask.c Tue Jul 19 16:02:36 2011 +0100
@@ -22,23 +22,23 @@
int rc;
rc = xc_flask_context_to_sid(ctx->xch, buf, len, ssidref);
-
+
return rc;
}
-int libxl_flask_sid_to_context(libxl_ctx *ctx, uint32_t ssidref,
+int libxl_flask_sid_to_context(libxl_ctx *ctx, uint32_t ssidref,
char **buf, size_t *len)
{
int rc;
char tmp[XC_PAGE_SIZE];
rc = xc_flask_sid_to_context(ctx->xch, ssidref, tmp, sizeof(tmp));
-
+
if (!rc) {
*len = strlen(tmp);
- *buf = strdup(tmp);
+ *buf = strdup(tmp);
}
-
+
return rc;
}
@@ -48,7 +48,7 @@
rc = xc_flask_getenforce(ctx->xch);
- return rc;
+ return rc;
}
int libxl_flask_setenforce(libxl_ctx *ctx, int mode)
diff -r 2383077a5ae6 -r 548b2826293e tools/libxl/libxl_pci.c
--- a/tools/libxl/libxl_pci.c Tue Jul 19 15:47:14 2011 +0100
+++ b/tools/libxl/libxl_pci.c Tue Jul 19 16:02:36 2011 +0100
@@ -535,7 +535,7 @@
return 0;
}
-/*
+/*
* This function checks that all functions of a device are bound to pciback
* driver. It also initialises a bit-mask of which function numbers are present
* on that device.
@@ -598,7 +598,7 @@
return 1;
}
-
+
static int do_pci_add(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcidev,
int starting)
{
libxl_ctx *ctx = libxl__gc_owner(gc);
@@ -870,7 +870,7 @@
NULL, NULL, NULL) < 0) {
LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Device Model didn't respond
in time");
/* This depends on guest operating system acknowledging the
- * SCI, if it doesn't respond in time then we may wish to
+ * SCI, if it doesn't respond in time then we may wish to
* force the removal.
*/
return ERROR_FAIL;
diff -r 2383077a5ae6 -r 548b2826293e tools/libxl/libxl_utils.c
--- a/tools/libxl/libxl_utils.c Tue Jul 19 15:47:14 2011 +0100
+++ b/tools/libxl/libxl_utils.c Tue Jul 19 16:02:36 2011 +0100
@@ -313,7 +313,7 @@
int e;
struct stat stab;
ssize_t rs;
-
+
f = fopen(filename, "r");
if (!f) {
if (errno == ENOENT) return ENOENT;
diff -r 2383077a5ae6 -r 548b2826293e tools/libxl/libxl_utils.h
--- a/tools/libxl/libxl_utils.h Tue Jul 19 15:47:14 2011 +0100
+++ b/tools/libxl/libxl_utils.h Tue Jul 19 16:02:36 2011 +0100
@@ -48,7 +48,7 @@
* EPROTO and you have no way to tell how much was read. Errors are
* logged using filename (which is only used for logging) and what
* (which may be 0). */
-
+
pid_t libxl_fork(libxl_ctx *ctx);
int libxl_pipe(libxl_ctx *ctx, int pipes[2]);
/* Just like fork(2), pipe(2), but log errors. */
diff -r 2383077a5ae6 -r 548b2826293e tools/libxl/libxltypes.py
--- a/tools/libxl/libxltypes.py Tue Jul 19 15:47:14 2011 +0100
+++ b/tools/libxl/libxltypes.py Tue Jul 19 16:02:36 2011 +0100
@@ -44,12 +44,12 @@
def make_arg(self, n, passby=None):
if passby is None: passby = self.passby
-
+
if passby == PASS_BY_REFERENCE:
return "%s *%s" % (self.typename, n)
else:
return "%s %s" % (self.typename, n)
-
+
def pass_arg(self, n, isref=None, passby=None):
if passby is None: passby = self.passby
if isref is None: isref = self.passby == PASS_BY_REFERENCE
@@ -97,7 +97,7 @@
self.name = str.upper(enum.namespace) + self.rawname
self.value = value
self.comment = kwargs.setdefault("comment", None)
-
+
class Enumeration(Type):
def __init__(self, typename, values, **kwargs):
kwargs.setdefault('destructor_fn', None)
@@ -121,7 +121,7 @@
if v.valuename == str.upper(name):
return v
return ValueError
-
+
class Field(object):
"""An element of an Aggregate type"""
def __init__(self, type, name, **kwargs):
@@ -164,7 +164,7 @@
deref = v + "->"
else:
deref = v + "."
-
+
if f.name is None: # Anonymous
return (deref, deref)
else:
@@ -191,7 +191,7 @@
if not isinstance(keyvar_type, Enumeration):
raise ValueError
-
+
self.keyvar_name = keyvar_name
self.keyvar_type = keyvar_type
diff -r 2383077a5ae6 -r 548b2826293e tools/libxl/libxlu_cfg.c
--- a/tools/libxl/libxlu_cfg.c Tue Jul 19 15:47:14 2011 +0100
+++ b/tools/libxl/libxlu_cfg.c Tue Jul 19 16:02:36 2011 +0100
@@ -45,7 +45,7 @@
ctx->lexerrlineno= -1;
ctx->likely_python= 0;
ctx->scanner= 0;
-
+
e= xlu__cfg_yylex_init_extra(ctx, &ctx->scanner);
if (e) {
fprintf(cfg->report,"%s: unable to create scanner: %s\n",
@@ -191,7 +191,7 @@
*value_r= set->values[0];
return 0;
}
-
+
int xlu_cfg_replace_string(const XLU_Config *cfg, const char *n,
char **value_r) {
XLU_ConfigSetting *set;
@@ -231,7 +231,7 @@
*value_r= l;
return 0;
}
-
+
int xlu_cfg_get_list(const XLU_Config *cfg, const char *n,
XLU_ConfigList **list_r, int *entries_r, int dont_warn) {
@@ -269,7 +269,7 @@
set->name= 0; /* tbd */
set->avalues= alloc;
-
+
if (!alloc) {
set->nvalues= 0;
set->values= 0;
@@ -295,11 +295,11 @@
if (ctx->err) return;
assert(atom);
-
+
if (set->nvalues >= set->avalues) {
int new_avalues;
char **new_values;
-
+
if (set->avalues > INT_MAX / 100) { ctx->err= ERANGE; return; }
new_avalues= set->avalues * 4;
new_values= realloc(set->values,
@@ -324,7 +324,7 @@
char *xlu__cfgl_strdup(CfgParseContext *ctx, const char *src) {
char *result;
-
+
if (ctx->err) return 0;
result= strdup(src);
if (!result) ctx->err= errno;
@@ -380,7 +380,7 @@
goto x; \
} \
p += (ep - numbuf); \
- }while(0)
+ }while(0)
p++;
NUMERIC_CHAR(2,2,16,"hex");
diff -r 2383077a5ae6 -r 548b2826293e tools/libxl/libxlu_cfg_l.c
--- a/tools/libxl/libxlu_cfg_l.c Tue Jul 19 15:47:14 2011 +0100
+++ b/tools/libxl/libxlu_cfg_l.c Tue Jul 19 16:02:36 2011 +0100
@@ -34,7 +34,7 @@
#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.
+ * if you want the limit (max/min) macros for int types.
*/
#ifndef __STDC_LIMIT_MACROS
#define __STDC_LIMIT_MACROS 1
@@ -51,7 +51,7 @@
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 char flex_uint8_t;
typedef unsigned short int flex_uint16_t;
typedef unsigned int flex_uint32_t;
@@ -185,7 +185,7 @@
/* Note: We specifically omit the test for yy_rule_can_match_eol because
it requires
* access to the local variable yy_act. Since yyless() is a macro,
it would break
- * existing scanners that call yyless() from OUTSIDE xlu__cfg_yylex.
+ * existing scanners that call yyless() from OUTSIDE xlu__cfg_yylex.
* One obvious solution it to make yy_act a global. I tried that,
and saw
* a 5% performance hit in a non-yylineno scanner, because yy_act is
* normally declared as a register variable-- so it is not worth it.
@@ -197,7 +197,7 @@
if ( yytext[yyl] == '\n' )\
--yylineno;\
}while(0)
-
+
/* Return all but the first "n" matched characters back to the input stream. */
#define yyless(n) \
do \
@@ -259,7 +259,7 @@
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.
*/
@@ -574,9 +574,9 @@
/* This must go here because YYSTYPE and YYLTYPE are included
* from bison output in section 1.*/
# define yylval yyg->yylval_r
-
+
# define yylloc yyg->yylloc_r
-
+
int xlu__cfg_yylex_init (yyscan_t* scanner);
int xlu__cfg_yylex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner);
@@ -615,9 +615,9 @@
void xlu__cfg_yyset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner );
YYLTYPE *xlu__cfg_yyget_lloc (yyscan_t yyscanner );
-
+
void xlu__cfg_yyset_lloc (YYLTYPE * yylloc_param ,yyscan_t yyscanner );
-
+
/* Macros after this point can all be overridden by user definitions in
* section 1.
*/
@@ -845,7 +845,7 @@
int yyl;
for ( yyl = yyg->yy_more_len; yyl < yyleng; ++yyl )
if ( yytext[yyl] == '\n' )
-
+
do{ yylineno++;
yycolumn=0;
}while(0)
@@ -1377,7 +1377,7 @@
yyg->yy_hold_char = *++yyg->yy_c_buf_p;
if ( c == '\n' )
-
+
do{ yylineno++;
yycolumn=0;
}while(0)
@@ -1460,7 +1460,7 @@
YY_BUFFER_STATE xlu__cfg_yy_create_buffer (FILE * file, int size ,
yyscan_t yyscanner)
{
YY_BUFFER_STATE b;
-
+
b = (YY_BUFFER_STATE) xlu__cfg_yyalloc(sizeof( struct yy_buffer_state )
,yyscanner );
if ( ! b )
YY_FATAL_ERROR( "out of dynamic memory in
xlu__cfg_yy_create_buffer()" );
@@ -1504,7 +1504,7 @@
#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__cfg_yyrestart() or at EOF.
@@ -1530,7 +1530,7 @@
}
b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
-
+
errno = oerrno;
}
@@ -1636,9 +1636,9 @@
, yyscanner);
if ( ! yyg->yy_buffer_stack )
YY_FATAL_ERROR( "out of dynamic memory in
xlu__cfg_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;
@@ -1667,12 +1667,12 @@
* @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.
+ * @return the newly allocated buffer state object.
*/
YY_BUFFER_STATE xlu__cfg_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 )
@@ -1708,7 +1708,7 @@
*/
YY_BUFFER_STATE xlu__cfg_yy_scan_string (yyconst char * yystr , yyscan_t
yyscanner)
{
-
+
return xlu__cfg_yy_scan_bytes(yystr,strlen(yystr) ,yyscanner);
}
@@ -1725,7 +1725,7 @@
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__cfg_yyalloc(n ,yyscanner );
@@ -1793,10 +1793,10 @@
int xlu__cfg_yyget_lineno (yyscan_t yyscanner)
{
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
+
if (! YY_CURRENT_BUFFER)
return 0;
-
+
return yylineno;
}
@@ -1806,10 +1806,10 @@
int xlu__cfg_yyget_column (yyscan_t yyscanner)
{
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
+
if (! YY_CURRENT_BUFFER)
return 0;
-
+
return yycolumn;
}
@@ -1870,8 +1870,8 @@
/* lineno is only valid if an input buffer exists. */
if (! YY_CURRENT_BUFFER )
- yy_fatal_error( "xlu__cfg_yyset_lineno called with no buffer" ,
yyscanner);
-
+ yy_fatal_error( "xlu__cfg_yyset_lineno called with no buffer" ,
yyscanner);
+
yylineno = line_number;
}
@@ -1885,8 +1885,8 @@
/* column is only valid if an input buffer exists. */
if (! YY_CURRENT_BUFFER )
- yy_fatal_error( "xlu__cfg_yyset_column called with no buffer" ,
yyscanner);
-
+ yy_fatal_error( "xlu__cfg_yyset_column called with no buffer" ,
yyscanner);
+
yycolumn = column_no;
}
@@ -1939,13 +1939,13 @@
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
return yylloc;
}
-
+
void xlu__cfg_yyset_lloc (YYLTYPE * yylloc_param , yyscan_t yyscanner)
{
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
yylloc = yylloc_param;
}
-
+
/* User-visible API */
/* xlu__cfg_yylex_init is special because it creates the scanner itself, so it
is
@@ -1993,20 +1993,20 @@
errno = EINVAL;
return 1;
}
-
+
*ptr_yy_globals = (yyscan_t) xlu__cfg_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__cfg_yyset_extra (yy_user_defined, *ptr_yy_globals);
-
+
return yy_init_globals ( *ptr_yy_globals );
}
diff -r 2383077a5ae6 -r 548b2826293e tools/libxl/libxlu_cfg_l.h
--- a/tools/libxl/libxlu_cfg_l.h Tue Jul 19 15:47:14 2011 +0100
+++ b/tools/libxl/libxlu_cfg_l.h Tue Jul 19 16:02:36 2011 +0100
@@ -38,7 +38,7 @@
#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.
+ * if you want the limit (max/min) macros for int types.
*/
#ifndef __STDC_LIMIT_MACROS
#define __STDC_LIMIT_MACROS 1
@@ -55,7 +55,7 @@
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 char flex_uint8_t;
typedef unsigned short int flex_uint16_t;
typedef unsigned int flex_uint32_t;
@@ -193,7 +193,7 @@
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.
*/
@@ -281,9 +281,9 @@
void xlu__cfg_yyset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner );
YYLTYPE *xlu__cfg_yyget_lloc (yyscan_t yyscanner );
-
+
void xlu__cfg_yyset_lloc (YYLTYPE * yylloc_param ,yyscan_t yyscanner );
-
+
/* Macros after this point can all be overridden by user definitions in
* section 1.
*/
diff -r 2383077a5ae6 -r 548b2826293e tools/libxl/libxlu_cfg_y.c
--- a/tools/libxl/libxlu_cfg_y.c Tue Jul 19 15:47:14 2011 +0100
+++ b/tools/libxl/libxlu_cfg_y.c Tue Jul 19 16:02:36 2011 +0100
@@ -819,7 +819,7 @@
# define YYMAXDEPTH 10000
#endif
-
+
#if YYERROR_VERBOSE
@@ -1030,7 +1030,7 @@
}
}
#endif /* YYERROR_VERBOSE */
-
+
/*-----------------------------------------------.
| Release the memory associated to this symbol. |
@@ -1101,7 +1101,7 @@
break;
}
}
-
+
/* Prevent warnings from -Wmissing-prototypes. */
diff -r 2383077a5ae6 -r 548b2826293e tools/libxl/libxlu_cfg_y.y
--- a/tools/libxl/libxlu_cfg_y.y Tue Jul 19 15:47:14 2011 +0100
+++ b/tools/libxl/libxlu_cfg_y.y Tue Jul 19 16:02:36 2011 +0100
@@ -45,7 +45,7 @@
%%
file: /* empty */
- | file setting
+ | file setting
setting: IDENT '=' value { xlu__cfg_set_store(ctx,$1,$3,@3.first_line); }
endstmt
diff -r 2383077a5ae6 -r 548b2826293e tools/libxl/libxlu_disk.c
--- a/tools/libxl/libxlu_disk.c Tue Jul 19 15:47:14 2011 +0100
+++ b/tools/libxl/libxlu_disk.c Tue Jul 19 16:02:36 2011 +0100
@@ -19,7 +19,7 @@
int e;
dpc->spec = spec;
-
+
e = xlu__disk_yylex_init_extra(dpc, &dpc->scanner);
if (e) goto fail;
diff -r 2383077a5ae6 -r 548b2826293e tools/libxl/libxlu_disk_l.c
--- a/tools/libxl/libxlu_disk_l.c Tue Jul 19 15:47:14 2011 +0100
+++ b/tools/libxl/libxlu_disk_l.c Tue Jul 19 16:02:36 2011 +0100
@@ -34,7 +34,7 @@
#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.
+ * if you want the limit (max/min) macros for int types.
*/
#ifndef __STDC_LIMIT_MACROS
#define __STDC_LIMIT_MACROS 1
@@ -51,7 +51,7 @@
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 char flex_uint8_t;
typedef unsigned short int flex_uint16_t;
typedef unsigned int flex_uint32_t;
@@ -184,7 +184,7 @@
#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 \
@@ -246,7 +246,7 @@
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.
*/
@@ -846,7 +846,7 @@
else if (!strcmp(str,"vhd")) DSET(dpc,format,FORMAT,str,VHD);
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);
@@ -854,7 +854,7 @@
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 */
@@ -1869,7 +1869,7 @@
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()" );
@@ -1913,7 +1913,7 @@
#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.
@@ -1939,7 +1939,7 @@
}
b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
-
+
errno = oerrno;
}
@@ -2045,9 +2045,9 @@
, 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;
@@ -2076,12 +2076,12 @@
* @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.
+ * @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 )
@@ -2117,7 +2117,7 @@
*/
YY_BUFFER_STATE xlu__disk_yy_scan_string (yyconst char * yystr , yyscan_t
yyscanner)
{
-
+
return xlu__disk_yy_scan_bytes(yystr,strlen(yystr) ,yyscanner);
}
@@ -2134,7 +2134,7 @@
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 );
@@ -2202,10 +2202,10 @@
int xlu__disk_yyget_lineno (yyscan_t yyscanner)
{
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
+
if (! YY_CURRENT_BUFFER)
return 0;
-
+
return yylineno;
}
@@ -2215,10 +2215,10 @@
int xlu__disk_yyget_column (yyscan_t yyscanner)
{
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
+
if (! YY_CURRENT_BUFFER)
return 0;
-
+
return yycolumn;
}
@@ -2279,8 +2279,8 @@
/* 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);
-
+ yy_fatal_error( "xlu__disk_yyset_lineno called with no buffer" ,
yyscanner);
+
yylineno = line_number;
}
@@ -2294,8 +2294,8 @@
/* 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);
-
+ yy_fatal_error( "xlu__disk_yyset_column called with no buffer" ,
yyscanner);
+
yycolumn = column_no;
}
@@ -2378,20 +2378,20 @@
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 );
}
diff -r 2383077a5ae6 -r 548b2826293e tools/libxl/libxlu_disk_l.h
--- a/tools/libxl/libxlu_disk_l.h Tue Jul 19 15:47:14 2011 +0100
+++ b/tools/libxl/libxlu_disk_l.h Tue Jul 19 16:02:36 2011 +0100
@@ -38,7 +38,7 @@
#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.
+ * if you want the limit (max/min) macros for int types.
*/
#ifndef __STDC_LIMIT_MACROS
#define __STDC_LIMIT_MACROS 1
@@ -55,7 +55,7 @@
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 char flex_uint8_t;
typedef unsigned short int flex_uint16_t;
typedef unsigned int flex_uint32_t;
@@ -193,7 +193,7 @@
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.
*/
diff -r 2383077a5ae6 -r 548b2826293e tools/libxl/libxlu_disk_l.l
--- a/tools/libxl/libxlu_disk_l.l Tue Jul 19 15:47:14 2011 +0100
+++ b/tools/libxl/libxlu_disk_l.l Tue Jul 19 16:02:36 2011 +0100
@@ -99,7 +99,7 @@
else if (!strcmp(str,"vhd")) DSET(dpc,format,FORMAT,str,VHD);
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);
@@ -107,7 +107,7 @@
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 */
%}
diff -r 2383077a5ae6 -r 548b2826293e tools/libxl/libxlutil.h
--- a/tools/libxl/libxlutil.h Tue Jul 19 15:47:14 2011 +0100
+++ b/tools/libxl/libxlutil.h Tue Jul 19 16:02:36 2011 +0100
@@ -33,7 +33,7 @@
int xlu_cfg_readdata(XLU_Config*, const char *data, int length);
/* If these fail, then it is undefined behaviour to call xlu_cfg_get_...
* functions. You have to just xlu_cfg_destroy. */
-
+
void xlu_cfg_destroy(XLU_Config*);
diff -r 2383077a5ae6 -r 548b2826293e tools/libxl/xl.c
--- a/tools/libxl/xl.c Tue Jul 19 15:47:14 2011 +0100
+++ b/tools/libxl/xl.c Tue Jul 19 16:02:36 2011 +0100
@@ -80,7 +80,7 @@
xlu_cfg_destroy(config);
}
-
+
int main(int argc, char **argv)
{
int opt = 0;
diff -r 2383077a5ae6 -r 548b2826293e tools/libxl/xl_cmdimpl.c
--- a/tools/libxl/xl_cmdimpl.c Tue Jul 19 15:47:14 2011 +0100
+++ b/tools/libxl/xl_cmdimpl.c Tue Jul 19 16:02:36 2011 +0100
@@ -586,7 +586,7 @@
}else{
libxl_uuid_generate(&c_info->uuid);
}
-
+
if (!xlu_cfg_get_long(config, "oos", &l))
c_info->oos = l;
@@ -1472,7 +1472,7 @@
/* when we receive a domain we get its name from the config
* file; and we receive it to a temporary name */
assert(!common_domname);
-
+
common_domname = d_config.c_info.name;
d_config.c_info.name = 0; /* steals allocation from config */
@@ -1655,7 +1655,7 @@
/* Some settings only make sense on first boot. */
paused = 0;
- if (common_domname
+ if (common_domname
&& strcmp(d_config.c_info.name, common_domname)) {
d_config.c_info.name = strdup(common_domname);
}
@@ -2267,8 +2267,8 @@
int rc;
size_t size;
char *buf;
- rc = libxl_flask_sid_to_context(ctx, info[i].ssidref, &buf,
- &size);
+ rc = libxl_flask_sid_to_context(ctx, info[i].ssidref, &buf,
+ &size);
if (rc < 0)
printf(" -");
else {
@@ -3657,7 +3657,7 @@
rc = libxl_sched_credit_domain_get(ctx, domid, scinfo);
if (rc)
fprintf(stderr, "libxl_sched_credit_domain_get failed.\n");
-
+
return rc;
}
@@ -5254,7 +5254,7 @@
else if (ret == 0)
printf("Permissive\n");
- return ret;
+ return ret;
}
int main_setenforce(int argc, char **argv)
@@ -5281,14 +5281,14 @@
help("setenforce");
return 2;
}
-
+
ret = libxl_flask_setenforce(ctx, mode);
if (ret) {
if (errno == ENOSYS) {
fprintf(stderr, "Flask XSM disabled\n");
- }
- else
+ }
+ else
fprintf(stderr, "error occured while setting enforcing mode
(%i)\n", ret);
}
@@ -5316,7 +5316,7 @@
ret = -1;
goto done;
}
-
+
ret = stat(polFName, &info);
if ( ret < 0 ) {
fprintf(stderr, "Error occurred retrieving information about"
@@ -5325,7 +5325,7 @@
}
polMemCp = malloc(info.st_size);
-
+
ret = read(polFd, polMemCp, info.st_size);
if ( ret < 0 ) {
fprintf(stderr, "Unable to read new Flask policy file: %s\n",
diff -r 2383077a5ae6 -r 548b2826293e tools/libxl/xl_cmdtable.c
--- a/tools/libxl/xl_cmdtable.c Tue Jul 19 15:47:14 2011 +0100
+++ b/tools/libxl/xl_cmdtable.c Tue Jul 19 16:02:36 2011 +0100
@@ -54,7 +54,7 @@
&main_reboot, 0,
"Issue a reboot signal to a domain",
"<Domain>",
- },
+ },
{ "pci-attach",
&main_pciattach, 0,
"Insert a new pass-through pci device",
@@ -393,7 +393,7 @@
size_t len;
int i, count = 0;
- if (!s)
+ if (!s)
return NULL;
len = strlen(s);
for (i = 0; i < cmdtable_len; i++) {
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home