From xen-changelog-bounces@lists.xensource.com Tue Nov 01 16:55:16 2011 Return-path: Envelope-to: www-data@lists.xensource.com Delivery-date: Tue, 01 Nov 2011 16:55:16 -0700 Received: from localhost ([127.0.0.1] helo=lists.colo.xensource.com) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOAl-0000Pp-TF; Tue, 01 Nov 2011 16:55:15 -0700 Received: from mail182.messagelabs.com ([85.158.139.83]) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOAj-0000Ot-DM for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 16:55:13 -0700 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-182.messagelabs.com!1320191710!1590576!1 X-Originating-IP: [93.93.131.152] X-StarScan-Version: 6.4.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21584 invoked from network); 1 Nov 2011 23:55:10 -0000 Received: from xenbits.xen.org (HELO xenbits.xen.org) (93.93.131.152) by server-15.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2011 23:55:10 -0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RLOAf-0007Yo-Md for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 23:55:09 +0000 Message-Id: Date: Tue, 01 Nov 2011 23:55:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: remove generated file testidl.c on clean X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.5 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1318930555 -3600 # Node ID 03850b2653066066e21522ed54fbd5f8c2743048 # Parent 0fea1ad50ce32173a5c9e7ebf5a6adbc4c351ee4 libxl: remove generated file testidl.c on clean Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 0fea1ad50ce3 -r 03850b265306 tools/libxl/Makefile --- a/tools/libxl/Makefile Fri Oct 28 17:23:51 2011 +0100 +++ b/tools/libxl/Makefile Tue Oct 18 10:35:55 2011 +0100 @@ -150,6 +150,7 @@ clean: $(RM) -f _*.h *.o *.so* *.a $(CLIENTS) $(DEPS) $(RM) -f _*.c *.pyc _libxl_paths.*.tmp + $(RM) -f testidl.c.new testidl.c # $(RM) -f $(AUTOSRCS) $(AUTOINCS) distclean: clean _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Tue Nov 01 16:55:30 2011 Return-path: Envelope-to: www-data@lists.xensource.com Delivery-date: Tue, 01 Nov 2011 16:55:30 -0700 Received: from localhost ([127.0.0.1] helo=lists.colo.xensource.com) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOAy-0000Uq-TZ; Tue, 01 Nov 2011 16:55:29 -0700 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOAj-0000Ou-EP for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 16:55:14 -0700 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-27.messagelabs.com!1320191697!44021861!1 X-Originating-IP: [93.93.131.152] X-StarScan-Version: 6.4.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18020 invoked from network); 1 Nov 2011 23:54:57 -0000 Received: from xenbits.xen.org (HELO xenbits.xen.org) (93.93.131.152) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2011 23:54:57 -0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RLOAg-0007Z3-By for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 23:55:10 +0000 Message-Id: Date: Tue, 01 Nov 2011 23:55:09 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: idl: use "dispose" rather than "destroy" for function to free IDL types X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.5 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1318930555 -3600 # Node ID 224359634904e327a73941d613551f00232ac777 # Parent 03850b2653066066e21522ed54fbd5f8c2743048 libxl: idl: use "dispose" rather than "destroy" for function to free IDL types Destroy is an overloaded term which would commonly like to be used for actual destructive operations, such as destroying a domain etc. Dispose isn't a great term but it does the job. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 03850b265306 -r 224359634904 tools/libxl/gentest.py --- a/tools/libxl/gentest.py Tue Oct 18 10:35:55 2011 +0100 +++ b/tools/libxl/gentest.py Tue Oct 18 10:35:55 2011 +0100 @@ -256,8 +256,8 @@ f.write(" printf(\"%%s: %%s\\n\", \"%s\", s);\n" % ty.typename) f.write(" if (s == NULL) abort();\n") f.write(" free(s);\n") - if ty.destructor_fn is not None: - f.write(" %s(&%s_val);\n" % (ty.destructor_fn, ty.typename)) + if ty.dispose_fn is not None: + f.write(" %s(&%s_val);\n" % (ty.dispose_fn, ty.typename)) f.write("\n") f.write(" printf(\"Testing Enumerations\\n\");\n") diff -r 03850b265306 -r 224359634904 tools/libxl/gentypes.py --- a/tools/libxl/gentypes.py Tue Oct 18 10:35:55 2011 +0100 +++ b/tools/libxl/gentypes.py Tue Oct 18 10:35:55 2011 +0100 @@ -74,7 +74,7 @@ raise NotImplementedError("%s" % type(ty)) return s.replace("\n", "\n%s" % indent) -def libxl_C_type_destroy(ty, v, indent = " ", parent = None): +def libxl_C_type_dispose(ty, v, indent = " ", parent = None): s = "" if isinstance(ty, libxltypes.KeyedUnion): if parent is None: @@ -83,16 +83,16 @@ for f in ty.fields: (nparent,fexpr) = ty.member(v, f, parent is None) s += "case %s:\n" % f.enumname - s += libxl_C_type_destroy(f.type, fexpr, indent + " ", nparent) + s += libxl_C_type_dispose(f.type, fexpr, indent + " ", nparent) s += " break;\n" s += "}\n" - elif isinstance(ty, libxltypes.Struct) and (parent is None or ty.destructor_fn is None): + elif isinstance(ty, libxltypes.Struct) and (parent is None or ty.dispose_fn is None): for f in [f for f in ty.fields if not f.const]: (nparent,fexpr) = ty.member(v, f, parent is None) - s += libxl_C_type_destroy(f.type, fexpr, "", nparent) + s += libxl_C_type_dispose(f.type, fexpr, "", nparent) else: - if ty.destructor_fn is not None: - s += "%s(%s);\n" % (ty.destructor_fn, ty.pass_arg(v, parent is None)) + if ty.dispose_fn is not None: + s += "%s(%s);\n" % (ty.dispose_fn, ty.pass_arg(v, parent is None)) if s != "": s = indent + s @@ -217,8 +217,8 @@ for ty in types: f.write(libxl_C_type_define(ty) + ";\n") - if ty.destructor_fn is not None: - f.write("void %s(%s);\n" % (ty.destructor_fn, ty.make_arg("p"))) + if ty.dispose_fn is not None: + f.write("void %s(%s);\n" % (ty.dispose_fn, ty.make_arg("p"))) if ty.json_fn is not None: f.write("char *%s_to_json(libxl_ctx *ctx, %s);\n" % (ty.typename, ty.make_arg("p"))) if isinstance(ty, libxltypes.Enumeration): @@ -277,10 +277,10 @@ """ % " ".join(sys.argv)) - for ty in [t for t in types if t.destructor_fn is not None and t.autogenerate_destructor]: - f.write("void %s(%s)\n" % (ty.destructor_fn, ty.make_arg("p"))) + for ty in [t for t in types if t.dispose_fn is not None and t.autogenerate_dispose_fn]: + f.write("void %s(%s)\n" % (ty.dispose_fn, ty.make_arg("p"))) f.write("{\n") - f.write(libxl_C_type_destroy(ty, "p")) + f.write(libxl_C_type_dispose(ty, "p")) f.write(" memset(p, LIBXL_DTOR_POISON, sizeof(*p));\n") f.write("}\n") f.write("\n") diff -r 03850b265306 -r 224359634904 tools/libxl/idl.txt --- a/tools/libxl/idl.txt Tue Oct 18 10:35:55 2011 +0100 +++ b/tools/libxl/idl.txt Tue Oct 18 10:35:55 2011 +0100 @@ -39,14 +39,14 @@ libxltypes.PASS_BY_VALUE libxltypes.PASS_BY_REFERENCE -Type.destructor_fn: (default: typename + "_destroy" or None if type == None) +Type.dispose_fn: (default: typename + "_dispose" or None if type == None) The name of the C function which will free all dynamically allocated memory contained within this type (but not the type itself). -Type.autogenerate_destructor: (default: True) +Type.autogenerate_dispose_fn: (default: True) - Indicates if the above named Type.destructor_fn should be + Indicates if the above named Type.dispose_fn should be autogenerated. Type.json_fn: (default: typename + "_gen_json" or None if type == None) diff -r 03850b265306 -r 224359634904 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Tue Oct 18 10:35:55 2011 +0100 +++ b/tools/libxl/libxl.c Tue Oct 18 10:35:55 2011 +0100 @@ -87,12 +87,12 @@ { if (!ctx) return 0; if (ctx->xch) xc_interface_close(ctx->xch); - libxl_version_info_destroy(&ctx->version_info); + libxl_version_info_dispose(&ctx->version_info); if (ctx->xsh) xs_daemon_close(ctx->xsh); return 0; } -void libxl_string_list_destroy(libxl_string_list *psl) +void libxl_string_list_dispose(libxl_string_list *psl) { int i; libxl_string_list sl = *psl; @@ -105,7 +105,7 @@ free(sl); } -void libxl_key_value_list_destroy(libxl_key_value_list *pkvl) +void libxl_key_value_list_dispose(libxl_key_value_list *pkvl) { int i; libxl_key_value_list kvl = *pkvl; @@ -767,7 +767,7 @@ libxl__qmp_cleanup(&gc, domid); } if (libxl__devices_destroy(&gc, domid, force) < 0) - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "libxl_destroy_devices failed for %d", domid); + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "libxl_devices_dispose failed for %d", domid); vm_path = libxl__xs_read(&gc, XBT_NULL, libxl__sprintf(&gc, "%s/vm", dom_path)); if (vm_path) @@ -1641,7 +1641,7 @@ } out: for (i = 0; i < num; i++) - libxl_device_disk_destroy(&disks[i]); + libxl_device_disk_dispose(&disks[i]); free(disks); return ret; } @@ -2241,7 +2241,7 @@ xc_hypercall_buffer_free(ctx->xch, coremap); xc_hypercall_buffer_free(ctx->xch, socketmap); xc_hypercall_buffer_free(ctx->xch, nodemap); - libxl_topologyinfo_destroy(info); + libxl_topologyinfo_dispose(info); return ERROR_FAIL; } @@ -2722,7 +2722,7 @@ return rc; } -void libxl_file_reference_destroy(libxl_file_reference *f) +void libxl_file_reference_dispose(libxl_file_reference *f) { libxl__file_reference_unmap(f); free(f->path); @@ -2852,7 +2852,7 @@ rc = 0; out1: - libxl_cpumap_destroy(&cpumap); + libxl_cpumap_dispose(&cpumap); out: xc_cpupool_infofree(ctx->xch, info); libxl__free_all(&gc); @@ -2941,10 +2941,10 @@ } } - libxl_topologyinfo_destroy(&topology); + libxl_topologyinfo_dispose(&topology); out: - libxl_cpumap_destroy(&freemap); + libxl_cpumap_dispose(&freemap); return rc; } @@ -2993,11 +2993,11 @@ } } - libxl_topologyinfo_destroy(&topology); + libxl_topologyinfo_dispose(&topology); out: for (p = 0; p < n_pools; p++) { - libxl_cpupoolinfo_destroy(poolinfo + p); + libxl_cpupoolinfo_dispose(poolinfo + p); } return ret; diff -r 03850b265306 -r 224359634904 tools/libxl/libxl.h --- a/tools/libxl/libxl.h Tue Oct 18 10:35:55 2011 +0100 +++ b/tools/libxl/libxl.h Tue Oct 18 10:35:55 2011 +0100 @@ -144,10 +144,10 @@ #define LIBXL_MAC_BYTES(mac) mac[0], mac[1], mac[2], mac[3], mac[4], mac[5] typedef char **libxl_string_list; -void libxl_string_list_destroy(libxl_string_list *sl); +void libxl_string_list_dispose(libxl_string_list *sl); typedef char **libxl_key_value_list; -void libxl_key_value_list_destroy(libxl_key_value_list *kvl); +void libxl_key_value_list_dispose(libxl_key_value_list *kvl); typedef uint32_t libxl_hwcap[8]; @@ -155,14 +155,14 @@ uint32_t size; /* number of bytes in map */ uint8_t *map; } libxl_cpumap; -void libxl_cpumap_destroy(libxl_cpumap *map); +void libxl_cpumap_dispose(libxl_cpumap *map); typedef struct { uint32_t entries; uint32_t *array; } libxl_cpuarray; #define LIBXL_CPUARRAY_INVALID_ENTRY ~0 -void libxl_cpuarray_destroy(libxl_cpuarray *array); +void libxl_cpuarray_dispose(libxl_cpuarray *array); typedef struct { /* @@ -174,7 +174,7 @@ void * data; size_t size; } libxl_file_reference; -void libxl_file_reference_destroy(libxl_file_reference *p); +void libxl_file_reference_dispose(libxl_file_reference *p); /* libxl_cpuid_policy_list is a dynamic array storing CPUID policies * for multiple leafs. It is terminated with an entry holding @@ -182,7 +182,7 @@ */ typedef struct libxl__cpuid_policy libxl_cpuid_policy; typedef libxl_cpuid_policy * libxl_cpuid_policy_list; -void libxl_cpuid_destroy(libxl_cpuid_policy_list *cpuid_list); +void libxl_cpuid_dispose(libxl_cpuid_policy_list *cpuid_list); #define LIBXL_PCI_FUNC_ALL (~0U) @@ -261,7 +261,7 @@ typedef int (*libxl_console_ready)(libxl_ctx *ctx, uint32_t domid, void *priv); int libxl_domain_create_new(libxl_ctx *ctx, libxl_domain_config *d_config, libxl_console_ready cb, void *priv, uint32_t *domid); int libxl_domain_create_restore(libxl_ctx *ctx, libxl_domain_config *d_config, libxl_console_ready cb, void *priv, uint32_t *domid, int restore_fd); -void libxl_domain_config_destroy(libxl_domain_config *d_config); +void libxl_domain_config_dispose(libxl_domain_config *d_config); int libxl_domain_suspend(libxl_ctx *ctx, libxl_domain_suspend_info *info, uint32_t domid, int fd); int libxl_domain_resume(libxl_ctx *ctx, uint32_t domid); diff -r 03850b265306 -r 224359634904 tools/libxl/libxl_cpuid.c --- a/tools/libxl/libxl_cpuid.c Tue Oct 18 10:35:55 2011 +0100 +++ b/tools/libxl/libxl_cpuid.c Tue Oct 18 10:35:55 2011 +0100 @@ -16,7 +16,7 @@ #include "libxl_osdeps.h" #include "libxl_internal.h" -void libxl_cpuid_destroy(libxl_cpuid_policy_list *p_cpuid_list) +void libxl_cpuid_dispose(libxl_cpuid_policy_list *p_cpuid_list) { int i, j; libxl_cpuid_policy_list cpuid_list = *p_cpuid_list; diff -r 03850b265306 -r 224359634904 tools/libxl/libxl_create.c --- a/tools/libxl/libxl_create.c Tue Oct 18 10:35:55 2011 +0100 +++ b/tools/libxl/libxl_create.c Tue Oct 18 10:35:55 2011 +0100 @@ -31,33 +31,33 @@ #include "libxl_internal.h" #include "flexarray.h" -void libxl_domain_config_destroy(libxl_domain_config *d_config) +void libxl_domain_config_dispose(libxl_domain_config *d_config) { int i; for (i=0; inum_disks; i++) - libxl_device_disk_destroy(&d_config->disks[i]); + libxl_device_disk_dispose(&d_config->disks[i]); free(d_config->disks); for (i=0; inum_vifs; i++) - libxl_device_nic_destroy(&d_config->vifs[i]); + libxl_device_nic_dispose(&d_config->vifs[i]); free(d_config->vifs); for (i=0; inum_pcidevs; i++) - libxl_device_pci_destroy(&d_config->pcidevs[i]); + libxl_device_pci_dispose(&d_config->pcidevs[i]); free(d_config->pcidevs); for (i=0; inum_vfbs; i++) - libxl_device_vfb_destroy(&d_config->vfbs[i]); + libxl_device_vfb_dispose(&d_config->vfbs[i]); free(d_config->vfbs); for (i=0; inum_vkbs; i++) - libxl_device_vkb_destroy(&d_config->vkbs[i]); + libxl_device_vkb_dispose(&d_config->vkbs[i]); free(d_config->vkbs); - libxl_domain_create_info_destroy(&d_config->c_info); - libxl_domain_build_info_destroy(&d_config->b_info); - libxl_device_model_info_destroy(&d_config->dm_info); + libxl_domain_create_info_dispose(&d_config->c_info); + libxl_domain_build_info_dispose(&d_config->b_info); + libxl_device_model_info_dispose(&d_config->dm_info); } int libxl_init_create_info(libxl_ctx *ctx, libxl_domain_create_info *c_info) @@ -512,7 +512,7 @@ if ( ret ) goto error_out; libxl__device_console_add(gc, domid, &console, &state); - libxl_device_console_destroy(&console); + libxl_device_console_dispose(&console); dm_info->domid = domid; ret = libxl__create_device_model(gc, dm_info, @@ -549,7 +549,7 @@ console.consback = LIBXL_CONSOLE_BACKEND_IOEMU; libxl__device_console_add(gc, domid, &console, &state); - libxl_device_console_destroy(&console); + libxl_device_console_dispose(&console); if (need_qemu) { /* only copy those useful configs */ diff -r 03850b265306 -r 224359634904 tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Tue Oct 18 10:35:55 2011 +0100 +++ b/tools/libxl/libxl_types.idl Tue Oct 18 10:35:55 2011 +0100 @@ -8,13 +8,13 @@ libxl_domid = Builtin("domid", json_fn = "yajl_gen_integer", autogenerate_json = False) libxl_uuid = Builtin("uuid", passby=PASS_BY_REFERENCE) libxl_mac = Builtin("mac", passby=PASS_BY_REFERENCE) -libxl_cpumap = Builtin("cpumap", destructor_fn="libxl_cpumap_destroy", passby=PASS_BY_REFERENCE) -libxl_cpuarray = Builtin("cpuarray", destructor_fn="libxl_cpuarray_destroy", passby=PASS_BY_REFERENCE) -libxl_cpuid_policy_list = Builtin("cpuid_policy_list", destructor_fn="libxl_cpuid_destroy", passby=PASS_BY_REFERENCE) +libxl_cpumap = Builtin("cpumap", dispose_fn="libxl_cpumap_dispose", passby=PASS_BY_REFERENCE) +libxl_cpuarray = Builtin("cpuarray", dispose_fn="libxl_cpuarray_dispose", passby=PASS_BY_REFERENCE) +libxl_cpuid_policy_list = Builtin("cpuid_policy_list", dispose_fn="libxl_cpuid_dispose", passby=PASS_BY_REFERENCE) -libxl_string_list = Builtin("string_list", destructor_fn="libxl_string_list_destroy", passby=PASS_BY_REFERENCE) -libxl_key_value_list = Builtin("key_value_list", destructor_fn="libxl_key_value_list_destroy", passby=PASS_BY_REFERENCE) -libxl_file_reference = Builtin("file_reference", destructor_fn="libxl_file_reference_destroy", passby=PASS_BY_REFERENCE) +libxl_string_list = Builtin("string_list", dispose_fn="libxl_string_list_dispose", passby=PASS_BY_REFERENCE) +libxl_key_value_list = Builtin("key_value_list", dispose_fn="libxl_key_value_list_dispose", passby=PASS_BY_REFERENCE) +libxl_file_reference = Builtin("file_reference", dispose_fn="libxl_file_reference_dispose", passby=PASS_BY_REFERENCE) libxl_hwcap = Builtin("hwcap", passby=PASS_BY_REFERENCE) @@ -109,7 +109,7 @@ ("cpu_time", uint64), ("vcpu_max_id", uint32), ("vcpu_online", uint32), - ], destructor_fn=None) + ], dispose_fn=None) libxl_cpupoolinfo = Struct("cpupoolinfo", [ ("poolid", uint32), @@ -121,7 +121,7 @@ libxl_vminfo = Struct("vminfo", [ ("uuid", libxl_uuid), ("domid", libxl_domid), - ], destructor_fn=None) + ], dispose_fn=None) libxl_version_info = Struct("version_info", [ ("xen_version_major", integer), @@ -362,7 +362,7 @@ ("nr_nodes", uint32), ("hw_cap", libxl_hwcap), ("phys_cap", uint32), - ], destructor_fn=None, dir=DIR_OUT) + ], dispose_fn=None, dir=DIR_OUT) libxl_topologyinfo = Struct("topologyinfo", [ ("coremap", libxl_cpuarray, False, "cpu to core map"), @@ -373,4 +373,4 @@ libxl_sched_credit = Struct("sched_credit", [ ("weight", integer), ("cap", integer), - ], destructor_fn=None) + ], dispose_fn=None) diff -r 03850b265306 -r 224359634904 tools/libxl/libxl_utils.c --- a/tools/libxl/libxl_utils.c Tue Oct 18 10:35:55 2011 +0100 +++ b/tools/libxl/libxl_utils.c Tue Oct 18 10:35:55 2011 +0100 @@ -157,7 +157,7 @@ } free(poolname); } - libxl_cpupoolinfo_destroy(poolinfo + i); + libxl_cpupoolinfo_dispose(poolinfo + i); } free(poolinfo); return ret; @@ -478,7 +478,7 @@ } for (i=0; imap); } @@ -624,7 +624,7 @@ return 0; } -void libxl_cpuarray_destroy(libxl_cpuarray *array) +void libxl_cpuarray_dispose(libxl_cpuarray *array) { free(array->array); } diff -r 03850b265306 -r 224359634904 tools/libxl/libxltypes.py --- a/tools/libxl/libxltypes.py Tue Oct 18 10:35:55 2011 +0100 +++ b/tools/libxl/libxltypes.py Tue Oct 18 10:35:55 2011 +0100 @@ -44,11 +44,11 @@ self.rawname = typename if self.typename is not None: - self.destructor_fn = kwargs.setdefault('destructor_fn', self.typename + "_destroy") + self.dispose_fn = kwargs.setdefault('dispose_fn', self.typename + "_dispose") else: - self.destructor_fn = kwargs.setdefault('destructor_fn', None) + self.dispose_fn = kwargs.setdefault('dispose_fn', None) - self.autogenerate_destructor = kwargs.setdefault('autogenerate_destructor', True) + self.autogenerate_dispose_fn = kwargs.setdefault('autogenerate_dispose_fn', True) if self.typename is not None: self.json_fn = kwargs.setdefault('json_fn', self.typename + "_gen_json") @@ -88,15 +88,15 @@ class Builtin(Type): """Builtin type""" def __init__(self, typename, **kwargs): - kwargs.setdefault('destructor_fn', None) - kwargs.setdefault('autogenerate_destructor', False) + kwargs.setdefault('dispose_fn', None) + kwargs.setdefault('autogenerate_dispose_fn', False) kwargs.setdefault('autogenerate_json', False) Type.__init__(self, typename, **kwargs) class Number(Builtin): def __init__(self, ctype, **kwargs): kwargs.setdefault('namespace', None) - kwargs.setdefault('destructor_fn', None) + kwargs.setdefault('dispose_fn', None) kwargs.setdefault('signed', False) kwargs.setdefault('json_fn', "yajl_gen_integer") self.signed = kwargs['signed'] @@ -105,7 +105,7 @@ class UInt(Number): def __init__(self, w, **kwargs): kwargs.setdefault('namespace', None) - kwargs.setdefault('destructor_fn', None) + kwargs.setdefault('dispose_fn', None) Number.__init__(self, "uint%d_t" % w, **kwargs) self.width = w @@ -122,7 +122,7 @@ class Enumeration(Type): def __init__(self, typename, values, **kwargs): - kwargs.setdefault('destructor_fn', None) + kwargs.setdefault('dispose_fn', None) Type.__init__(self, typename, **kwargs) self.values = [] @@ -205,7 +205,7 @@ # union therefore any specific instance of this class will # need to provide an explicit destructor function. kwargs.setdefault('passby', PASS_BY_REFERENCE) - kwargs.setdefault('destructor_fn', None) + kwargs.setdefault('dispose_fn', None) Aggregate.__init__(self, "union", name, fields, **kwargs) class KeyedUnion(Aggregate): @@ -244,7 +244,7 @@ uint32 = UInt(32) uint64 = UInt(64) -string = Builtin("char *", namespace = None, destructor_fn = "free", +string = Builtin("char *", namespace = None, dispose_fn = "free", json_fn = "libxl__string_gen_json", autogenerate_json = False) diff -r 03850b265306 -r 224359634904 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Tue Oct 18 10:35:55 2011 +0100 +++ b/tools/libxl/xl_cmdimpl.c Tue Oct 18 10:35:55 2011 +0100 @@ -1685,7 +1685,7 @@ case LIBXL_EVENT_TYPE_DISK_EJECT: if (libxl_event_get_disk_eject_info(ctx, domid, &event, &disk)) { libxl_cdrom_insert(ctx, domid, &disk); - libxl_device_disk_destroy(&disk); + libxl_device_disk_dispose(&disk); } break; } @@ -1701,7 +1701,7 @@ if (logfile != 2) close(logfile); - libxl_domain_config_destroy(&d_config); + libxl_domain_config_dispose(&d_config); free(config_data); @@ -2047,7 +2047,7 @@ printf("%02x.%01x %04x:%02x:%02x.%01x\n", (pcidevs[i].vdevfn >> 3) & 0x1f, pcidevs[i].vdevfn & 0x7, pcidevs[i].domain, pcidevs[i].bus, pcidevs[i].dev, pcidevs[i].func); - libxl_device_pci_destroy(&pcidevs[i]); + libxl_device_pci_dispose(&pcidevs[i]); } free(pcidevs); } @@ -2078,7 +2078,7 @@ exit(2); } libxl_device_pci_remove(ctx, domid, &pcidev, force); - libxl_device_pci_destroy(&pcidev); + libxl_device_pci_dispose(&pcidev); } int main_pcidetach(int argc, char **argv) @@ -2115,7 +2115,7 @@ exit(2); } libxl_device_pci_add(ctx, domid, &pcidev); - libxl_device_pci_destroy(&pcidev); + libxl_device_pci_dispose(&pcidev); } int main_pciattach(int argc, char **argv) @@ -2231,7 +2231,7 @@ memset(&d_config, 0x00, sizeof(d_config)); parse_config_data(config_file, (char *)data, len, &d_config, &dm_info); printf_info(info[i].domid, &d_config, &dm_info); - libxl_domain_config_destroy(&d_config); + libxl_domain_config_dispose(&d_config); free(data); free(config_file); } @@ -3323,7 +3323,7 @@ for (i = 0; i < nb_vcpu; i++) { print_vcpuinfo(domid, &vcpuinfo[i], nr_cpus); - libxl_vcpuinfo_destroy(&vcpuinfo[i]); + libxl_vcpuinfo_dispose(&vcpuinfo[i]); } free(vcpuinfo); @@ -3445,7 +3445,7 @@ } } vcpupin_out1: - libxl_cpumap_destroy(&cpumap); + libxl_cpumap_dispose(&cpumap); vcpupin_out: ; } @@ -3485,7 +3485,7 @@ if (libxl_set_vcpuonline(ctx, domid, &cpumap) < 0) fprintf(stderr, "libxl_set_vcpuonline failed domid=%d max_vcpus=%d\n", domid, max_vcpus); - libxl_cpumap_destroy(&cpumap); + libxl_cpumap_dispose(&cpumap); } int main_vcpuset(int argc, char **argv) @@ -3609,7 +3609,7 @@ printf("numa_info : none\n"); - libxl_topologyinfo_destroy(&info); + libxl_topologyinfo_dispose(&info); return; } @@ -4018,7 +4018,7 @@ fprintf(stderr, "libxl_device_nic_add failed.\n"); return 1; } - libxl_device_nic_destroy(&nic); + libxl_device_nic_dispose(&nic); return 0; } @@ -4051,7 +4051,7 @@ printf("%6d %5d %6d %5d/%-11d %-30s\n", nics[i].devid, nics[i].state, nics[i].evtch, nics[i].rref_tx, nics[i].rref_rx, nics[i].backend); - libxl_nicinfo_destroy(&nics[i]); + libxl_nicinfo_dispose(&nics[i]); } free(nics); } @@ -4086,7 +4086,7 @@ fprintf(stderr, "libxl_device_nic_del failed.\n"); return 1; } - libxl_device_nic_destroy(&nic); + libxl_device_nic_dispose(&nic); return 0; } @@ -4152,9 +4152,9 @@ printf("%-5d %-3d %-6d %-5d %-6d %-8d %-30s\n", diskinfo.devid, diskinfo.backend_id, diskinfo.frontend_id, diskinfo.state, diskinfo.evtch, diskinfo.rref, diskinfo.backend); - libxl_diskinfo_destroy(&diskinfo); + libxl_diskinfo_dispose(&diskinfo); } - libxl_device_disk_destroy(&disks[i]); + libxl_device_disk_dispose(&disks[i]); } free(disks); } @@ -4791,7 +4791,7 @@ n_nodes++; } - libxl_topologyinfo_destroy(&topology); + libxl_topologyinfo_dispose(&topology); if (n_cpus == 0) { fprintf(stderr, "no free cpu found\n"); @@ -4931,7 +4931,7 @@ printf("\n"); } } - libxl_cpupoolinfo_destroy(poolinfo + p); + libxl_cpupoolinfo_dispose(poolinfo + p); } return ret; @@ -5132,7 +5132,7 @@ poolid = poolinfo[0].poolid; schedid = poolinfo[0].sched_id; for (p = 0; p < n_pools; p++) { - libxl_cpupoolinfo_destroy(poolinfo + p); + libxl_cpupoolinfo_dispose(poolinfo + p); } if (n_pools > 1) { fprintf(stderr, "splitting not possible, already cpupools in use\n"); @@ -5146,7 +5146,7 @@ if (libxl_cpumap_alloc(ctx, &cpumap)) { fprintf(stderr, "Failed to allocate cpumap\n"); - libxl_topologyinfo_destroy(&topology); + libxl_topologyinfo_dispose(&topology); return -ERROR_FAIL; } @@ -5229,8 +5229,8 @@ } out: - libxl_topologyinfo_destroy(&topology); - libxl_cpumap_destroy(&cpumap); + libxl_topologyinfo_dispose(&topology); + libxl_cpumap_dispose(&cpumap); return ret; } diff -r 03850b265306 -r 224359634904 tools/python/genwrap.py --- a/tools/python/genwrap.py Tue Oct 18 10:35:55 2011 +0100 +++ b/tools/python/genwrap.py Tue Oct 18 10:35:55 2011 +0100 @@ -100,8 +100,8 @@ def py_object_def(ty): l = [] - if ty.destructor_fn is not None: - dtor = ' %s(&self->obj);\n'%ty.destructor_fn + if ty.dispose_fn is not None: + dtor = ' %s(&self->obj);\n'%ty.dispose_fn else: dtor = '' diff -r 03850b265306 -r 224359634904 tools/python/xen/lowlevel/xl/xl.c --- a/tools/python/xen/lowlevel/xl/xl.c Tue Oct 18 10:35:55 2011 +0100 +++ b/tools/python/xen/lowlevel/xl/xl.c Tue Oct 18 10:35:55 2011 +0100 @@ -246,7 +246,7 @@ int attrib__libxl_key_value_list_set(PyObject *v, libxl_key_value_list *pptr) { if ( *pptr ) { - libxl_key_value_list_destroy(pptr); + libxl_key_value_list_dispose(pptr); *pptr = NULL; } if ( v == Py_None ) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Tue Nov 01 16:55:38 2011 Return-path: Envelope-to: www-data@lists.xensource.com Delivery-date: Tue, 01 Nov 2011 16:55:38 -0700 Received: from localhost ([127.0.0.1] helo=lists.colo.xensource.com) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOB8-0000Yx-9F; Tue, 01 Nov 2011 16:55:38 -0700 Received: from mail216.messagelabs.com ([85.158.143.99]) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOAk-0000P0-JI for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 16:55:14 -0700 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-216.messagelabs.com!1320191711!1933748!1 X-Originating-IP: [93.93.131.152] X-StarScan-Version: 6.4.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31216 invoked from network); 1 Nov 2011 23:55:11 -0000 Received: from xenbits.xen.org (HELO xenbits.xen.org) (93.93.131.152) by server-13.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2011 23:55:11 -0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RLOAg-0007ZI-TF for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 23:55:10 +0000 Message-Id: Date: Tue, 01 Nov 2011 23:55:10 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: libxl_destroy_cpumap becomes libxl_cpumap_destroy X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.5 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1318930555 -3600 # Node ID b9fd399d614b0ebdd153a65f28f91dc0dbb6325e # Parent 224359634904e327a73941d613551f00232ac777 libxl: libxl_destroy_cpumap becomes libxl_cpumap_destroy Now that IDL type destructors are no longer libxl_*_destroy we can use the more common libxl_NOUN_VERB structure here. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 224359634904 -r b9fd399d614b tools/libxl/libxl.c --- a/tools/libxl/libxl.c Tue Oct 18 10:35:55 2011 +0100 +++ b/tools/libxl/libxl.c Tue Oct 18 10:35:55 2011 +0100 @@ -2775,7 +2775,7 @@ if (rc) { LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, "Error moving cpu to cpupool"); - libxl_destroy_cpupool(ctx, *poolid); + libxl_cpupool_destroy(ctx, *poolid); libxl__free_all(&gc); return ERROR_FAIL; } @@ -2799,7 +2799,7 @@ } } -int libxl_destroy_cpupool(libxl_ctx *ctx, uint32_t poolid) +int libxl_cpupool_destroy(libxl_ctx *ctx, uint32_t poolid) { libxl__gc gc = LIBXL_INIT_GC(ctx); int rc, i; diff -r 224359634904 -r b9fd399d614b tools/libxl/libxl.h --- a/tools/libxl/libxl.h Tue Oct 18 10:35:55 2011 +0100 +++ b/tools/libxl/libxl.h Tue Oct 18 10:35:55 2011 +0100 @@ -503,7 +503,7 @@ int libxl_create_cpupool(libxl_ctx *ctx, const char *name, int schedid, libxl_cpumap cpumap, libxl_uuid *uuid, uint32_t *poolid); -int libxl_destroy_cpupool(libxl_ctx *ctx, uint32_t poolid); +int libxl_cpupool_destroy(libxl_ctx *ctx, uint32_t poolid); int libxl_cpupool_rename(libxl_ctx *ctx, const char *name, uint32_t poolid); int libxl_cpupool_cpuadd(libxl_ctx *ctx, uint32_t poolid, int cpu); int libxl_cpupool_cpuadd_node(libxl_ctx *ctx, uint32_t poolid, int node, int *cpus); diff -r 224359634904 -r b9fd399d614b tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Tue Oct 18 10:35:55 2011 +0100 +++ b/tools/libxl/xl_cmdimpl.c Tue Oct 18 10:35:55 2011 +0100 @@ -4954,7 +4954,7 @@ return -ERROR_FAIL; } - return -libxl_destroy_cpupool(ctx, poolid); + return -libxl_cpupool_destroy(ctx, poolid); } int main_cpupoolrename(int argc, char **argv) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Tue Nov 01 16:55:48 2011 Return-path: Envelope-to: www-data@lists.xensource.com Delivery-date: Tue, 01 Nov 2011 16:55:48 -0700 Received: from localhost ([127.0.0.1] helo=lists.colo.xensource.com) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOBI-0000cm-A9; Tue, 01 Nov 2011 16:55:48 -0700 Received: from mail21.messagelabs.com ([85.158.143.35]) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOAk-0000P1-RN for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 16:55:15 -0700 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-21.messagelabs.com!1320191711!2577217!1 X-Originating-IP: [93.93.131.152] X-StarScan-Version: 6.4.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1120 invoked from network); 1 Nov 2011 23:55:11 -0000 Received: from xenbits.xen.org (HELO xenbits.xen.org) (93.93.131.152) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2011 23:55:11 -0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RLOAh-0007ZX-Cw for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 23:55:11 +0000 Message-Id: Date: Tue, 01 Nov 2011 23:55:10 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: add a comment describing the device interfaces. X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.5 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1318930555 -3600 # Node ID c4f7fd30c0b8f6bdc9b07466c1b46c3260a1631a # Parent b9fd399d614b0ebdd153a65f28f91dc0dbb6325e libxl: add a comment describing the device interfaces. Subsequent patches will endeavour to make reality match this defined interface. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r b9fd399d614b -r c4f7fd30c0b8 tools/libxl/libxl.h --- a/tools/libxl/libxl.h Tue Oct 18 10:35:55 2011 +0100 +++ b/tools/libxl/libxl.h Tue Oct 18 10:35:55 2011 +0100 @@ -379,6 +379,65 @@ libxl_cpupoolinfo * libxl_list_cpupool(libxl_ctx*, int *nb_pool); libxl_vminfo * libxl_list_vm(libxl_ctx *ctx, int *nb_vm); +/* + * Devices + * ======= + * + * Each device is represented by a libxl_device_ data structure + * which is defined via the IDL. In addition some devices have an + * additional data type libxl_device__getinfo which contains + * further runtime information about the device. + * + * A common set of methods are available for each device type. These + * are described below. + * + * Querying + * -------- + * + * libxl_device__list(ctx, domid, nr): + * + * Returns an array of libxl_device_ length nr representing + * the devices attached to the specified domain. + * + * libxl_device__getinfo(ctx, domid, device, info): + * + * Initialises info with details of the given device which must be + * attached to the specified domain. + * + * Creation / Control + * ------------------ + * + * libxl_device__init(ctx, device): + * + * Initalises device to a default configuration. + * + * libxl_device__add(ctx, domid, device): + * + * Adds the given device to the specified domain. This can be called + * while the guest is running (hotplug) or before boot (coldplug). + * + * This function only sets up the device but does not wait for the + * domain to connect to the device and therefore cannot block on the + * guest. + * + * libxl_device__remove(ctx, domid, device): + * + * Removes the given device from the specified domain by performing + * an orderly unplug with guest co-operation. This requires that the + * guest is running. + * + * This method is currently synchronous and therefore can block + * while interacting with the guest. + * + * libxl_device__destroy(ctx, domid, device): + * + * Removes the given device from the specified domain without guest + * co-operation. It is guest specific what affect this will have on + * a running guest. + * + * This function does not interact with the guest and therefore + * cannot block on the guest. + */ int libxl_device_disk_add(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk); int libxl_device_disk_del(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk, int wait); libxl_device_disk *libxl_device_disk_list(libxl_ctx *ctx, uint32_t domid, int *num); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Tue Nov 01 16:55:55 2011 Return-path: Envelope-to: www-data@lists.xensource.com Delivery-date: Tue, 01 Nov 2011 16:55:55 -0700 Received: from localhost ([127.0.0.1] helo=lists.colo.xensource.com) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOBP-0000fr-Iv; Tue, 01 Nov 2011 16:55:55 -0700 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOAl-0000P3-F0 for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 16:55:15 -0700 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-27.messagelabs.com!1320191689!50611630!1 X-Originating-IP: [93.93.131.152] X-StarScan-Version: 6.4.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12406 invoked from network); 1 Nov 2011 23:54:50 -0000 Received: from xenbits.xen.org (HELO xenbits.xen.org) (93.93.131.152) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2011 23:54:50 -0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RLOAi-0007a2-DP for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 23:55:12 +0000 Message-Id: Date: Tue, 01 Nov 2011 23:55:11 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: refactor code to construct disk from xenstore backend X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.5 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1318930556 -3600 # Node ID f2a50026376cb070df4f2023520395ebb722b41c # Parent 444fb1a6e8036108aaf7e2dfbe927752a22a525d libxl: refactor code to construct disk from xenstore backend Temporarily retain unsafe behaviour of reading f.e. directory. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 444fb1a6e803 -r f2a50026376c tools/libxl/libxl.c --- a/tools/libxl/libxl.c Tue Oct 18 10:35:55 2011 +0100 +++ b/tools/libxl/libxl.c Tue Oct 18 10:35:56 2011 +0100 @@ -1505,24 +1505,69 @@ return ERROR_NI; } +static void libxl__device_disk_from_xs_be(libxl__gc *gc, + const char *be_path, + libxl_device_disk *disk) +{ + libxl_ctx *ctx = libxl__gc_owner(gc); + unsigned int len; + char *tmp; + const char *fe_path; /* XXX unsafe */ + + memset(disk, 0, sizeof(*disk)); + + tmp = xs_read(ctx->xsh, XBT_NULL, + libxl__sprintf(gc, "%s/params", be_path), &len); + if (tmp && strchr(tmp, ':')) { + disk->pdev_path = strdup(strchr(tmp, ':') + 1); + free(tmp); + } else { + disk->pdev_path = tmp; + } + libxl_string_to_backend(ctx, + libxl__xs_read(gc, XBT_NULL, + libxl__sprintf(gc, "%s/type", be_path)), + &(disk->backend)); + disk->vdev = xs_read(ctx->xsh, XBT_NULL, + libxl__sprintf(gc, "%s/dev", be_path), &len); + tmp = libxl__xs_read(gc, XBT_NULL, libxl__sprintf + (gc, "%s/removable", be_path)); + + if (tmp) + disk->removable = atoi(tmp); + else + disk->removable = 0; + + tmp = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "%s/mode", be_path)); + if (!strcmp(tmp, "w")) + disk->readwrite = 1; + else + disk->readwrite = 0; + + fe_path = libxl__xs_read(gc, XBT_NULL, + libxl__sprintf(gc, "%s/frontend", be_path)); + tmp = libxl__xs_read(gc, XBT_NULL, + libxl__sprintf(gc, "%s/device-type", fe_path)); + disk->is_cdrom = !strcmp(tmp, "cdrom"); + + disk->format = LIBXL_DISK_FORMAT_UNKNOWN; +} + static int libxl__append_disk_list_of_type(libxl__gc *gc, uint32_t domid, const char *type, libxl_device_disk **disks, int *ndisks) { - libxl_ctx *ctx = libxl__gc_owner(gc); char *be_path = NULL; char **dir = NULL; - unsigned int n = 0, len = 0; + unsigned int n = 0; libxl_device_disk *pdisk = NULL, *pdisk_end = NULL; - char *physpath_tmp = NULL; be_path = libxl__sprintf(gc, "%s/backend/%s/%d", libxl__xs_get_dompath(gc, 0), type, domid); dir = libxl__xs_directory(gc, XBT_NULL, be_path, &n); if (dir) { - char *removable; libxl_device_disk *tmp; tmp = realloc(*disks, sizeof (libxl_device_disk) * (*ndisks + n)); if (tmp == NULL) @@ -1532,32 +1577,10 @@ *ndisks += n; pdisk_end = *disks + *ndisks; for (; pdisk < pdisk_end; pdisk++, dir++) { - memset(pdisk, 0, sizeof(*pdisk)); + const char *p; + p = libxl__sprintf(gc, "%s/%s", be_path, *dir); + libxl__device_disk_from_xs_be(gc, p, pdisk); pdisk->backend_domid = 0; - physpath_tmp = xs_read(ctx->xsh, XBT_NULL, libxl__sprintf(gc, "%s/%s/params", be_path, *dir), &len); - if (physpath_tmp && strchr(physpath_tmp, ':')) { - pdisk->pdev_path = strdup(strchr(physpath_tmp, ':') + 1); - free(physpath_tmp); - } 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)), - &(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 - (gc, "%s/%s/removable", be_path, *dir)); - if (removable) - pdisk->removable = atoi(removable); - else - pdisk->removable = 0; - if (!strcmp(libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "%s/%s/mode", be_path, *dir)), "w")) - pdisk->readwrite = 1; - else - pdisk->readwrite = 0; - type = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "%s/device-type", libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "%s/%s/frontend", be_path, *dir)))); - pdisk->is_cdrom = !strcmp(type, "cdrom"); - pdisk->format = LIBXL_DISK_FORMAT_UNKNOWN; } } return 0; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Tue Nov 01 16:56:02 2011 Return-path: Envelope-to: www-data@lists.xensource.com Delivery-date: Tue, 01 Nov 2011 16:56:02 -0700 Received: from localhost ([127.0.0.1] helo=lists.colo.xensource.com) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOBW-0000jT-0x; Tue, 01 Nov 2011 16:56:02 -0700 Received: from mail182.messagelabs.com ([85.158.139.83]) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOAl-0000P2-BF for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 16:55:15 -0700 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-182.messagelabs.com!1320191712!1589117!1 X-Originating-IP: [93.93.131.152] X-StarScan-Version: 6.4.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29636 invoked from network); 1 Nov 2011 23:55:12 -0000 Received: from xenbits.xen.org (HELO xenbits.xen.org) (93.93.131.152) by server-9.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2011 23:55:12 -0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RLOAh-0007Zm-TG for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 23:55:11 +0000 Message-Id: Date: Tue, 01 Nov 2011 23:55:11 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: various fixes to libxl_device_disk_list (and internals) X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.5 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1318930555 -3600 # Node ID 444fb1a6e8036108aaf7e2dfbe927752a22a525d # Parent c4f7fd30c0b8f6bdc9b07466c1b46c3260a1631a libxl: various fixes to libxl_device_disk_list (and internals) - handle realloc errors - remove redundancy of libxl__append_disk_list_of_type return value and ndisks paramter. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r c4f7fd30c0b8 -r 444fb1a6e803 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Tue Oct 18 10:35:55 2011 +0100 +++ b/tools/libxl/libxl.c Tue Oct 18 10:35:55 2011 +0100 @@ -1505,11 +1505,11 @@ return ERROR_NI; } -static unsigned int libxl__append_disk_list_of_type(libxl__gc *gc, - uint32_t domid, - const char *type, - libxl_device_disk **disks, - unsigned int *ndisks) +static int libxl__append_disk_list_of_type(libxl__gc *gc, + uint32_t domid, + const char *type, + libxl_device_disk **disks, + int *ndisks) { libxl_ctx *ctx = libxl__gc_owner(gc); char *be_path = NULL; @@ -1523,11 +1523,16 @@ dir = libxl__xs_directory(gc, XBT_NULL, be_path, &n); if (dir) { char *removable; - *disks = realloc(*disks, sizeof (libxl_device_disk) * (*ndisks + n)); + libxl_device_disk *tmp; + tmp = realloc(*disks, sizeof (libxl_device_disk) * (*ndisks + n)); + if (tmp == NULL) + return ERROR_NOMEM; + *disks = tmp; pdisk = *disks + *ndisks; *ndisks += n; pdisk_end = *disks + *ndisks; for (; pdisk < pdisk_end; pdisk++, dir++) { + memset(pdisk, 0, sizeof(*pdisk)); pdisk->backend_domid = 0; physpath_tmp = xs_read(ctx->xsh, XBT_NULL, libxl__sprintf(gc, "%s/%s/params", be_path, *dir), &len); if (physpath_tmp && strchr(physpath_tmp, ':')) { @@ -1555,22 +1560,37 @@ pdisk->format = LIBXL_DISK_FORMAT_UNKNOWN; } } - - return n; + return 0; } libxl_device_disk *libxl_device_disk_list(libxl_ctx *ctx, uint32_t domid, int *num) { libxl__gc gc = LIBXL_INIT_GC(ctx); libxl_device_disk *disks = NULL; - unsigned int ndisks = 0; - - *num = libxl__append_disk_list_of_type(&gc, domid, "vbd", &disks, &ndisks); - *num += libxl__append_disk_list_of_type(&gc, domid, "tap", &disks, &ndisks); - *num += libxl__append_disk_list_of_type(&gc, domid, "qdisk", &disks, &ndisks); + int rc; + + *num = 0; + + rc = libxl__append_disk_list_of_type(&gc, domid, "vbd", &disks, num); + if (rc) goto out_err; + + rc = libxl__append_disk_list_of_type(&gc, domid, "tap", &disks, num); + if (rc) goto out_err; + + rc = libxl__append_disk_list_of_type(&gc, domid, "qdisk", &disks, num); + if (rc) goto out_err; libxl__free_all(&gc); return disks; + +out_err: + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Unable to list disks"); + while (disks && *num) { + (*num)--; + libxl_device_disk_dispose(&disks[*num]); + } + free(disks); + return NULL; } int libxl_device_disk_getinfo(libxl_ctx *ctx, uint32_t domid, _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Tue Nov 01 16:56:07 2011 Return-path: Envelope-to: www-data@lists.xensource.com Delivery-date: Tue, 01 Nov 2011 16:56:07 -0700 Received: from localhost ([127.0.0.1] helo=lists.colo.xensource.com) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOBb-0000mD-BV; Tue, 01 Nov 2011 16:56:07 -0700 Received: from mail182.messagelabs.com ([85.158.139.83]) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOAm-0000P4-9j for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 16:55:17 -0700 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-182.messagelabs.com!1320191713!1590875!1 X-Originating-IP: [93.93.131.152] X-StarScan-Version: 6.4.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32302 invoked from network); 1 Nov 2011 23:55:13 -0000 Received: from xenbits.xen.org (HELO xenbits.xen.org) (93.93.131.152) by server-10.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2011 23:55:13 -0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RLOAi-0007aH-Tg for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 23:55:12 +0000 Message-Id: Date: Tue, 01 Nov 2011 23:55:12 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: do not read f.e. xenstore dir in disk list function X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.5 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1318941375 -3600 # Node ID 2b6d3f4b78fc3be33e40826769bbc719cd6f907b # Parent f2a50026376cb070df4f2023520395ebb722b41c libxl: do not read f.e. xenstore dir in disk list function Instead store a duplicate of the "device-type" node in the backend dir and use that instead. This maintains the invariant that the list function is always "safe". Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r f2a50026376c -r 2b6d3f4b78fc tools/libxl/libxl.c --- a/tools/libxl/libxl.c Tue Oct 18 10:35:56 2011 +0100 +++ b/tools/libxl/libxl.c Tue Oct 18 13:36:15 2011 +0100 @@ -1018,6 +1018,8 @@ flexarray_append(back, libxl__device_disk_string_of_backend(disk->backend)); flexarray_append(back, "mode"); flexarray_append(back, disk->readwrite ? "w" : "r"); + flexarray_append(back, "device-type"); + flexarray_append(back, disk->is_cdrom ? "cdrom" : "disk"); flexarray_append(front, "backend-id"); flexarray_append(front, libxl__sprintf(&gc, "%d", disk->backend_domid)); @@ -1512,7 +1514,6 @@ libxl_ctx *ctx = libxl__gc_owner(gc); unsigned int len; char *tmp; - const char *fe_path; /* XXX unsafe */ memset(disk, 0, sizeof(*disk)); @@ -1544,10 +1545,8 @@ else disk->readwrite = 0; - fe_path = libxl__xs_read(gc, XBT_NULL, - libxl__sprintf(gc, "%s/frontend", be_path)); tmp = libxl__xs_read(gc, XBT_NULL, - libxl__sprintf(gc, "%s/device-type", fe_path)); + libxl__sprintf(gc, "%s/device-type", be_path)); disk->is_cdrom = !strcmp(tmp, "cdrom"); disk->format = LIBXL_DISK_FORMAT_UNKNOWN; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Tue Nov 01 16:56:14 2011 Return-path: Envelope-to: www-data@lists.xensource.com Delivery-date: Tue, 01 Nov 2011 16:56:14 -0700 Received: from localhost ([127.0.0.1] helo=lists.colo.xensource.com) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOBi-0000pZ-0q; Tue, 01 Nov 2011 16:56:14 -0700 Received: from mail216.messagelabs.com ([85.158.143.99]) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOAm-0000P9-Pu for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 16:55:17 -0700 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-216.messagelabs.com!1320191713!1941239!1 X-Originating-IP: [93.93.131.152] X-StarScan-Version: 6.4.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5326 invoked from network); 1 Nov 2011 23:55:13 -0000 Received: from xenbits.xen.org (HELO xenbits.xen.org) (93.93.131.152) by server-8.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2011 23:55:13 -0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RLOAj-0007aW-Ej for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 23:55:13 +0000 Message-Id: Date: Tue, 01 Nov 2011 23:55:12 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: update nic list API to use common device API style X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.5 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1318941402 -3600 # Node ID 8b9ec0ab3aae22c9683e90d28c8862248195b518 # Parent 2b6d3f4b78fc3be33e40826769bbc719cd6f907b libxl: update nic list API to use common device API style libxl_device_nic_list returns an array of libxl_device_nic and libxl_device_nic_getinfo retrieves further information. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 2b6d3f4b78fc -r 8b9ec0ab3aae tools/libxl/libxl.c --- a/tools/libxl/libxl.c Tue Oct 18 13:36:15 2011 +0100 +++ b/tools/libxl/libxl.c Tue Oct 18 13:36:42 2011 +0100 @@ -1291,60 +1291,138 @@ return rc; } -libxl_nicinfo *libxl_list_nics(libxl_ctx *ctx, uint32_t domid, unsigned int *nb) +static void libxl__device_nic_from_xs_be(libxl__gc *gc, + const char *be_path, + libxl_device_nic *nic) +{ + libxl_ctx *ctx = libxl__gc_owner(gc); + unsigned int len; + char *tmp; + int rc; + + memset(nic, 0, sizeof(*nic)); + + tmp = xs_read(ctx->xsh, XBT_NULL, + libxl__sprintf(gc, "%s/handle", be_path), &len); + if ( tmp ) + nic->devid = atoi(tmp); + else + nic->devid = 0; + + /* nic->mtu = */ + + tmp = xs_read(ctx->xsh, XBT_NULL, + libxl__sprintf(gc, "%s/mac", be_path), &len); + rc = libxl__parse_mac(tmp, nic->mac); + if (rc) + memset(nic->mac, 0, sizeof(nic->mac)); + + nic->ip = xs_read(ctx->xsh, XBT_NULL, + libxl__sprintf(gc, "%s/ip", be_path), &len); + + nic->bridge = xs_read(ctx->xsh, XBT_NULL, + libxl__sprintf(gc, "%s/bridge", be_path), &len); + + nic->script = xs_read(ctx->xsh, XBT_NULL, + libxl__sprintf(gc, "%s/script", be_path), &len); + + /* XXX ioemu nics are not in xenstore at all? */ + nic->nictype = LIBXL_NIC_TYPE_VIF; + nic->model = NULL; /* XXX Only for TYPE_IOEMU */ + nic->ifname = NULL; /* XXX Only for TYPE_IOEMU */ +} + +static int libxl__append_nic_list_of_type(libxl__gc *gc, + uint32_t domid, + const char *type, + libxl_device_nic **nics, + int *nnics) +{ + char *be_path = NULL; + char **dir = NULL; + unsigned int n = 0; + libxl_device_nic *pnic = NULL, *pnic_end = NULL; + + be_path = libxl__sprintf(gc, "%s/backend/%s/%d", + libxl__xs_get_dompath(gc, 0), type, domid); + dir = libxl__xs_directory(gc, XBT_NULL, be_path, &n); + if (dir) { + libxl_device_nic *tmp; + tmp = realloc(*nics, sizeof (libxl_device_nic) * (*nnics + n)); + if (tmp == NULL) + return ERROR_NOMEM; + *nics = tmp; + pnic = *nics + *nnics; + *nnics += n; + pnic_end = *nics + *nnics; + for (; pnic < pnic_end; pnic++, dir++) { + const char *p; + p = libxl__sprintf(gc, "%s/%s", be_path, *dir); + libxl__device_nic_from_xs_be(gc, p, pnic); + pnic->backend_domid = 0; + } + } + return 0; +} + +libxl_device_nic *libxl_device_nic_list(libxl_ctx *ctx, uint32_t domid, int *num) { libxl__gc gc = LIBXL_INIT_GC(ctx); - char *dompath, *nic_path_fe; - char **l, **list; - char *val, *tok; - unsigned int nb_nics, i; - libxl_nicinfo *res, *nics; + libxl_device_nic *nics = NULL; + int rc; + + *num = 0; + + rc = libxl__append_nic_list_of_type(&gc, domid, "vif", &nics, num); + if (rc) goto out_err; + + libxl__free_all(&gc); + return nics; + +out_err: + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Unable to list nics"); + while (*num) { + (*num)--; + libxl_device_nic_dispose(&nics[*num]); + } + free(nics); + return NULL; +} + +int libxl_device_nic_getinfo(libxl_ctx *ctx, uint32_t domid, + libxl_device_nic *nic, libxl_nicinfo *nicinfo) +{ + libxl__gc gc = LIBXL_INIT_GC(ctx); + char *dompath, *nicpath; + char *val; dompath = libxl__xs_get_dompath(&gc, domid); - if (!dompath) - goto err; - list = l = libxl__xs_directory(&gc, XBT_NULL, - libxl__sprintf(&gc, "%s/device/vif", dompath), &nb_nics); - if (!l) - goto err; - nics = res = calloc(nb_nics, sizeof (libxl_nicinfo)); - if (!res) - goto err; - for (*nb = nb_nics; nb_nics > 0; --nb_nics, ++l, ++nics) { - nic_path_fe = libxl__sprintf(&gc, "%s/device/vif/%s", dompath, *l); - - nics->backend = xs_read(ctx->xsh, XBT_NULL, - libxl__sprintf(&gc, "%s/backend", nic_path_fe), NULL); - val = libxl__xs_read(&gc, XBT_NULL, libxl__sprintf(&gc, "%s/backend-id", nic_path_fe)); - nics->backend_id = val ? strtoul(val, NULL, 10) : -1; - - nics->devid = strtoul(*l, NULL, 10); - val = libxl__xs_read(&gc, XBT_NULL, libxl__sprintf(&gc, "%s/state", nic_path_fe)); - nics->state = val ? strtoul(val, NULL, 10) : -1; - val = libxl__xs_read(&gc, XBT_NULL, libxl__sprintf(&gc, "%s/mac", nic_path_fe)); - for (i = 0, tok = strtok(val, ":"); tok && (i < 6); - ++i, tok = strtok(NULL, ":")) { - nics->mac[i] = strtoul(tok, NULL, 16); - } - val = libxl__xs_read(&gc, XBT_NULL, libxl__sprintf(&gc, "%s/event-channel", nic_path_fe)); - nics->evtch = val ? strtol(val, NULL, 10) : -1; - val = libxl__xs_read(&gc, XBT_NULL, libxl__sprintf(&gc, "%s/tx-ring-ref", nic_path_fe)); - nics->rref_tx = val ? strtol(val, NULL, 10) : -1; - val = libxl__xs_read(&gc, XBT_NULL, libxl__sprintf(&gc, "%s/rx-ring-ref", nic_path_fe)); - nics->rref_rx = val ? strtol(val, NULL, 10) : -1; - nics->frontend = xs_read(ctx->xsh, XBT_NULL, - libxl__sprintf(&gc, "%s/frontend", nics->backend), NULL); - val = libxl__xs_read(&gc, XBT_NULL, libxl__sprintf(&gc, "%s/frontend-id", nics->backend)); - nics->frontend_id = val ? strtoul(val, NULL, 10) : -1; - nics->script = xs_read(ctx->xsh, XBT_NULL, - libxl__sprintf(&gc, "%s/script", nics->backend), NULL); + nicinfo->devid = nic->devid; + + nicpath = libxl__sprintf(&gc, "%s/device/vif/%d", dompath, nicinfo->devid); + nicinfo->backend = xs_read(ctx->xsh, XBT_NULL, + libxl__sprintf(&gc, "%s/backend", nicpath), NULL); + if (!nicinfo->backend) { + libxl__free_all(&gc); + return ERROR_FAIL; } + val = libxl__xs_read(&gc, XBT_NULL, libxl__sprintf(&gc, "%s/backend-id", nicpath)); + nicinfo->backend_id = val ? strtoul(val, NULL, 10) : -1; + val = libxl__xs_read(&gc, XBT_NULL, libxl__sprintf(&gc, "%s/state", nicpath)); + nicinfo->state = val ? strtoul(val, NULL, 10) : -1; + val = libxl__xs_read(&gc, XBT_NULL, libxl__sprintf(&gc, "%s/event-channel", nicpath)); + nicinfo->evtch = val ? strtoul(val, NULL, 10) : -1; + val = libxl__xs_read(&gc, XBT_NULL, libxl__sprintf(&gc, "%s/tx-ring-ref", nicpath)); + nicinfo->rref_tx = val ? strtoul(val, NULL, 10) : -1; + val = libxl__xs_read(&gc, XBT_NULL, libxl__sprintf(&gc, "%s/rx-ring-ref", nicpath)); + nicinfo->rref_rx = val ? strtoul(val, NULL, 10) : -1; + nicinfo->frontend = xs_read(ctx->xsh, XBT_NULL, + libxl__sprintf(&gc, "%s/frontend", nicinfo->backend), NULL); + val = libxl__xs_read(&gc, XBT_NULL, libxl__sprintf(&gc, "%s/frontend-id", nicinfo->backend)); + nicinfo->frontend_id = val ? strtoul(val, NULL, 10) : -1; libxl__free_all(&gc); - return res; -err: - libxl__free_all(&gc); - return NULL; + return 0; } /******************************************************************************/ diff -r 2b6d3f4b78fc -r 8b9ec0ab3aae tools/libxl/libxl.h --- a/tools/libxl/libxl.h Tue Oct 18 13:36:15 2011 +0100 +++ b/tools/libxl/libxl.h Tue Oct 18 13:36:42 2011 +0100 @@ -454,7 +454,9 @@ int libxl_device_nic_init(libxl_device_nic *nic, int dev_num); int libxl_device_nic_add(libxl_ctx *ctx, uint32_t domid, libxl_device_nic *nic); int libxl_device_nic_del(libxl_ctx *ctx, uint32_t domid, libxl_device_nic *nic, int wait); -libxl_nicinfo *libxl_list_nics(libxl_ctx *ctx, uint32_t domid, unsigned int *nb); +libxl_device_nic *libxl_device_nic_list(libxl_ctx *ctx, uint32_t domid, int *num); +int libxl_device_nic_getinfo(libxl_ctx *ctx, uint32_t domid, + libxl_device_nic *nic, libxl_nicinfo *nicinfo); int libxl_device_console_add(libxl_ctx *ctx, uint32_t domid, libxl_device_console *console); diff -r 2b6d3f4b78fc -r 8b9ec0ab3aae tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Tue Oct 18 13:36:15 2011 +0100 +++ b/tools/libxl/libxl_types.idl Tue Oct 18 13:36:42 2011 +0100 @@ -330,8 +330,6 @@ ("frontend_id", uint32), ("devid", integer), ("state", integer), - ("script", string), - ("mac", libxl_mac), ("evtch", integer), ("rref_tx", integer), ("rref_rx", integer), diff -r 2b6d3f4b78fc -r 8b9ec0ab3aae tools/libxl/libxl_utils.c --- a/tools/libxl/libxl_utils.c Tue Oct 18 13:36:15 2011 +0100 +++ b/tools/libxl/libxl_utils.c Tue Oct 18 13:36:42 2011 +0100 @@ -451,15 +451,15 @@ int libxl_mac_to_device_nic(libxl_ctx *ctx, uint32_t domid, const char *mac, libxl_device_nic *nic) { - libxl_nicinfo *nics; - unsigned int nb, rc, i; + libxl_device_nic *nics; + int nb, rc, i; libxl_mac mac_n; rc = libxl__parse_mac(mac, mac_n); if (rc) return rc; - nics = libxl_list_nics(ctx, domid, &nb); + nics = libxl_device_nic_list(ctx, domid, &nb); if (!nics) return ERROR_FAIL; @@ -468,17 +468,17 @@ rc = ERROR_INVAL; for (i = 0; i < nb; ++i) { if (!libxl__compare_macs(&mac_n, &nics[i].mac)) { - nic->backend_domid = nics[i].backend_id; - nic->devid = nics[i].devid; - memcpy(nic->mac, nics[i].mac, sizeof (nic->mac)); - nic->script = strdup(nics[i].script); + *nic = nics[i]; rc = 0; + i++; /* Do not dispose this NIC on exit path */ break; } + libxl_device_nic_dispose(&nics[i]); } - for (i=0; i Envelope-to: www-data@lists.xensource.com Delivery-date: Tue, 01 Nov 2011 16:56:22 -0700 Received: from localhost ([127.0.0.1] helo=lists.colo.xensource.com) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOBq-0000tR-0L; Tue, 01 Nov 2011 16:56:22 -0700 Received: from mail182.messagelabs.com ([85.158.139.83]) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOAn-0000PO-H8 for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 16:55:17 -0700 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-182.messagelabs.com!1320191714!1587527!1 X-Originating-IP: [93.93.131.152] X-StarScan-Version: 6.4.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14857 invoked from network); 1 Nov 2011 23:55:14 -0000 Received: from xenbits.xen.org (HELO xenbits.xen.org) (93.93.131.152) by server-4.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2011 23:55:14 -0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RLOAj-0007am-VG for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 23:55:13 +0000 Message-Id: Date: Tue, 01 Nov 2011 23:55:13 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: reimplement devid->nic in terms of from_xs_be function. X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.5 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1318941402 -3600 # Node ID cb040b65b10880d38d40fe254008259fb195e95a # Parent 8b9ec0ab3aae22c9683e90d28c8862248195b518 libxl: reimplement devid->nic in terms of from_xs_be function. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 8b9ec0ab3aae -r cb040b65b108 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Tue Oct 18 13:36:42 2011 +0100 +++ b/tools/libxl/libxl.c Tue Oct 18 13:36:42 2011 +0100 @@ -1315,7 +1315,7 @@ libxl__sprintf(gc, "%s/mac", be_path), &len); rc = libxl__parse_mac(tmp, nic->mac); if (rc) - memset(nic->mac, 0, sizeof(nic->mac)); + memset(nic->mac, 0, sizeof(nic->mac)); nic->ip = xs_read(ctx->xsh, XBT_NULL, libxl__sprintf(gc, "%s/ip", be_path), &len); @@ -1332,6 +1332,32 @@ nic->ifname = NULL; /* XXX Only for TYPE_IOEMU */ } +int libxl_devid_to_device_nic(libxl_ctx *ctx, uint32_t domid, + const char *devid, libxl_device_nic *nic) +{ + libxl__gc gc = LIBXL_INIT_GC(ctx); + char *dompath, *path; + int rc = ERROR_FAIL; + + memset(nic, 0, sizeof (libxl_device_nic)); + dompath = libxl__xs_get_dompath(&gc, domid); + if (!dompath) + goto out; + + path = libxl__xs_read(&gc, XBT_NULL, + libxl__sprintf(&gc, "%s/device/vif/%s/backend", + dompath, devid)); + if (!path) + goto out; + + libxl__device_nic_from_xs_be(&gc, path, nic); + + rc = 0; +out: + libxl__free_all(&gc); + return rc; +} + static int libxl__append_nic_list_of_type(libxl__gc *gc, uint32_t domid, const char *type, diff -r 8b9ec0ab3aae -r cb040b65b108 tools/libxl/libxl_utils.c --- a/tools/libxl/libxl_utils.c Tue Oct 18 13:36:42 2011 +0100 +++ b/tools/libxl/libxl_utils.c Tue Oct 18 13:36:42 2011 +0100 @@ -483,41 +483,6 @@ return rc; } -int libxl_devid_to_device_nic(libxl_ctx *ctx, uint32_t domid, - const char *devid, libxl_device_nic *nic) -{ - libxl__gc gc = LIBXL_INIT_GC(ctx); - char *val; - char *dompath, *nic_path_fe, *nic_path_be; - int rc = ERROR_FAIL; - - memset(nic, 0, sizeof (libxl_device_nic)); - dompath = libxl__xs_get_dompath(&gc, domid); - if (!dompath) { - goto out; - } - nic_path_fe = libxl__sprintf(&gc, "%s/device/vif/%s", dompath, devid); - nic_path_be = libxl__xs_read(&gc, XBT_NULL, - libxl__sprintf(&gc, "%s/backend", nic_path_fe)); - val = libxl__xs_read(&gc, XBT_NULL, libxl__sprintf(&gc, "%s/backend-id", nic_path_fe)); - if ( NULL == val ) { - goto out; - } - nic->backend_domid = strtoul(val, NULL, 10); - nic->devid = strtoul(devid, NULL, 10); - - val = libxl__xs_read(&gc, XBT_NULL, libxl__sprintf(&gc, "%s/mac", nic_path_fe)); - rc = libxl__parse_mac(val, nic->mac); - if (rc) - goto out; - - nic->script = xs_read(ctx->xsh, XBT_NULL, libxl__sprintf(&gc, "%s/script", nic_path_be), NULL); - rc = 0; -out: - libxl__free_all(&gc); - return rc; -} - int libxl_devid_to_device_disk(libxl_ctx *ctx, uint32_t domid, const char *devid, libxl_device_disk *disk) { _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Tue Nov 01 16:56:28 2011 Return-path: Envelope-to: www-data@lists.xensource.com Delivery-date: Tue, 01 Nov 2011 16:56:28 -0700 Received: from localhost ([127.0.0.1] helo=lists.colo.xensource.com) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOBw-0000we-NM; Tue, 01 Nov 2011 16:56:28 -0700 Received: from mail216.messagelabs.com ([85.158.143.99]) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOAn-0000Pf-Rd for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 16:55:18 -0700 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-216.messagelabs.com!1320191714!1941240!1 X-Originating-IP: [93.93.131.152] X-StarScan-Version: 6.4.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5334 invoked from network); 1 Nov 2011 23:55:14 -0000 Received: from xenbits.xen.org (HELO xenbits.xen.org) (93.93.131.152) by server-8.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2011 23:55:14 -0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RLOAk-0007b2-FP for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 23:55:14 +0000 Message-Id: Date: Tue, 01 Nov 2011 23:55:13 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: reimplement devid->disk in terms of from_xs_be function. X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.5 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1318941402 -3600 # Node ID a0af8f2ccb7e8c9e36ca6352c3b7f8e3f4bc557b # Parent cb040b65b10880d38d40fe254008259fb195e95a libxl: reimplement devid->disk in terms of from_xs_be function. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r cb040b65b108 -r a0af8f2ccb7e tools/libxl/libxl.c --- a/tools/libxl/libxl.c Tue Oct 18 13:36:42 2011 +0100 +++ b/tools/libxl/libxl.c Tue Oct 18 13:36:42 2011 +0100 @@ -1656,6 +1656,33 @@ disk->format = LIBXL_DISK_FORMAT_UNKNOWN; } +int libxl_devid_to_device_disk(libxl_ctx *ctx, uint32_t domid, + const char *devid, libxl_device_disk *disk) +{ + libxl__gc gc = LIBXL_INIT_GC(ctx); + char *dompath, *path; + int rc = ERROR_FAIL; + + memset(disk, 0, sizeof (libxl_device_disk)); + dompath = libxl__xs_get_dompath(&gc, domid); + if (!dompath) { + goto out; + } + path = libxl__xs_read(&gc, XBT_NULL, + libxl__sprintf(&gc, "%s/device/vbd/%s/backend", + dompath, devid)); + if (!path) + goto out; + + libxl__device_disk_from_xs_be(&gc, path, disk); + + rc = 0; +out: + libxl__free_all(&gc); + return rc; +} + + static int libxl__append_disk_list_of_type(libxl__gc *gc, uint32_t domid, const char *type, diff -r cb040b65b108 -r a0af8f2ccb7e tools/libxl/libxl_utils.c --- a/tools/libxl/libxl_utils.c Tue Oct 18 13:36:42 2011 +0100 +++ b/tools/libxl/libxl_utils.c Tue Oct 18 13:36:42 2011 +0100 @@ -483,50 +483,6 @@ return rc; } -int libxl_devid_to_device_disk(libxl_ctx *ctx, uint32_t domid, - const char *devid, libxl_device_disk *disk) -{ - libxl__gc gc = LIBXL_INIT_GC(ctx); - char *val; - char *dompath, *diskpath, *be_path; - unsigned int devid_n; - int rc = ERROR_INVAL; - - devid_n = libxl__device_disk_dev_number(devid, NULL, NULL); - if (devid_n < 0) { - goto out; - } - rc = ERROR_FAIL; - dompath = libxl__xs_get_dompath(&gc, domid); - diskpath = libxl__sprintf(&gc, "%s/device/vbd/%d", dompath, devid_n); - if (!diskpath) { - goto out; - } - - val = libxl__xs_read(&gc, XBT_NULL, libxl__sprintf(&gc, "%s/backend-id", diskpath)); - if (!val) - goto out; - disk->backend_domid = strtoul(val, NULL, 10); - be_path = libxl__xs_read(&gc, XBT_NULL, libxl__sprintf(&gc, "%s/backend", diskpath)); - disk->pdev_path = xs_read(ctx->xsh, XBT_NULL, - libxl__sprintf(&gc, "%s/params", be_path), NULL); - val = libxl__xs_read(&gc, XBT_NULL, libxl__sprintf(&gc, "%s/type", be_path)); - libxl_string_to_backend(ctx, val, &(disk->backend)); - disk->vdev = xs_read(ctx->xsh, XBT_NULL, - libxl__sprintf(&gc, "%s/dev", be_path), NULL); - val = libxl__xs_read(&gc, XBT_NULL, libxl__sprintf(&gc, "%s/removable", be_path)); - disk->removable = !strcmp(val, "1"); - val = libxl__xs_read(&gc, XBT_NULL, libxl__sprintf(&gc, "%s/mode", be_path)); - disk->readwrite = !!strcmp(val, "w"); - val = libxl__xs_read(&gc, XBT_NULL, libxl__sprintf(&gc, "%s/device-type", diskpath)); - disk->is_cdrom = !strcmp(val, "cdrom"); - rc = 0; - -out: - libxl__free_all(&gc); - return rc; -} - int libxl_cpumap_alloc(libxl_ctx *ctx, libxl_cpumap *cpumap) { int max_cpus; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Tue Nov 01 16:56:34 2011 Return-path: Envelope-to: www-data@lists.xensource.com Delivery-date: Tue, 01 Nov 2011 16:56:34 -0700 Received: from localhost ([127.0.0.1] helo=lists.colo.xensource.com) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOC2-0000zU-9s; Tue, 01 Nov 2011 16:56:34 -0700 Received: from mail216.messagelabs.com ([85.158.143.99]) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOAo-0000Q4-DD for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 16:55:18 -0700 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-216.messagelabs.com!1320191715!3272389!1 X-Originating-IP: [93.93.131.152] X-StarScan-Version: 6.4.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12052 invoked from network); 1 Nov 2011 23:55:15 -0000 Received: from xenbits.xen.org (HELO xenbits.xen.org) (93.93.131.152) by server-2.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2011 23:55:15 -0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RLOAl-0007bH-07 for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 23:55:15 +0000 Message-Id: Date: Tue, 01 Nov 2011 23:55:14 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: libxl_devid_to_* should take an integer device id X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.5 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1318941402 -3600 # Node ID 90b21171c8c0e25ff7d1648dcd55c7e806b88e11 # Parent a0af8f2ccb7e8c9e36ca6352c3b7f8e3f4bc557b libxl: libxl_devid_to_* should take an integer device id Currently takes a string. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r a0af8f2ccb7e -r 90b21171c8c0 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Tue Oct 18 13:36:42 2011 +0100 +++ b/tools/libxl/libxl.c Tue Oct 18 13:36:42 2011 +0100 @@ -1333,7 +1333,7 @@ } int libxl_devid_to_device_nic(libxl_ctx *ctx, uint32_t domid, - const char *devid, libxl_device_nic *nic) + int devid, libxl_device_nic *nic) { libxl__gc gc = LIBXL_INIT_GC(ctx); char *dompath, *path; @@ -1345,7 +1345,7 @@ goto out; path = libxl__xs_read(&gc, XBT_NULL, - libxl__sprintf(&gc, "%s/device/vif/%s/backend", + libxl__sprintf(&gc, "%s/device/vif/%d/backend", dompath, devid)); if (!path) goto out; @@ -1657,7 +1657,7 @@ } int libxl_devid_to_device_disk(libxl_ctx *ctx, uint32_t domid, - const char *devid, libxl_device_disk *disk) + int devid, libxl_device_disk *disk) { libxl__gc gc = LIBXL_INIT_GC(ctx); char *dompath, *path; @@ -1669,7 +1669,7 @@ goto out; } path = libxl__xs_read(&gc, XBT_NULL, - libxl__sprintf(&gc, "%s/device/vbd/%s/backend", + libxl__sprintf(&gc, "%s/device/vbd/%d/backend", dompath, devid)); if (!path) goto out; diff -r a0af8f2ccb7e -r 90b21171c8c0 tools/libxl/libxl_utils.h --- a/tools/libxl/libxl_utils.h Tue Oct 18 13:36:42 2011 +0100 +++ b/tools/libxl/libxl_utils.h Tue Oct 18 13:36:42 2011 +0100 @@ -60,11 +60,11 @@ int libxl_mac_to_device_nic(libxl_ctx *ctx, uint32_t domid, const char *mac, libxl_device_nic *nic); -int libxl_devid_to_device_nic(libxl_ctx *ctx, uint32_t domid, - const char *devid, libxl_device_nic *nic); +int libxl_devid_to_device_nic(libxl_ctx *ctx, uint32_t domid, int devid, + libxl_device_nic *nic); -int libxl_devid_to_device_disk(libxl_ctx *ctx, uint32_t domid, - const char *devid, libxl_device_disk *disk); +int libxl_devid_to_device_disk(libxl_ctx *ctx, uint32_t domid, int devid, + libxl_device_disk *disk); int libxl_cpumap_alloc(libxl_ctx *ctx, libxl_cpumap *cpumap); int libxl_cpumap_test(libxl_cpumap *cpumap, int cpu); diff -r a0af8f2ccb7e -r 90b21171c8c0 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Tue Oct 18 13:36:42 2011 +0100 +++ b/tools/libxl/xl_cmdimpl.c Tue Oct 18 13:36:42 2011 +0100 @@ -4077,7 +4077,7 @@ } if (!strchr(argv[optind+1], ':')) { - if (libxl_devid_to_device_nic(ctx, domid, argv[optind+1], &nic)) { + if (libxl_devid_to_device_nic(ctx, domid, atoi(argv[optind+1]), &nic)) { fprintf(stderr, "Unknown device %s.\n", argv[optind+1]); return 1; } @@ -4178,7 +4178,7 @@ fprintf(stderr, "%s is an invalid domain identifier\n", argv[optind]); return 1; } - if (libxl_devid_to_device_disk(ctx, domid, argv[optind+1], &disk)) { + if (libxl_devid_to_device_disk(ctx, domid, atoi(argv[optind+1]), &disk)) { fprintf(stderr, "Error: Device %s not connected.\n", argv[optind+1]); return 1; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Tue Nov 01 16:56:41 2011 Return-path: Envelope-to: www-data@lists.xensource.com Delivery-date: Tue, 01 Nov 2011 16:56:41 -0700 Received: from localhost ([127.0.0.1] helo=lists.colo.xensource.com) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOC9-00012Z-6o; Tue, 01 Nov 2011 16:56:41 -0700 Received: from mail216.messagelabs.com ([85.158.143.99]) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOAp-0000QT-08 for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 16:55:19 -0700 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-216.messagelabs.com!1320191715!1935072!1 X-Originating-IP: [93.93.131.152] X-StarScan-Version: 6.4.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11723 invoked from network); 1 Nov 2011 23:55:15 -0000 Received: from xenbits.xen.org (HELO xenbits.xen.org) (93.93.131.152) by server-5.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2011 23:55:15 -0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RLOAl-0007bW-Gi for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 23:55:15 +0000 Message-Id: Date: Tue, 01 Nov 2011 23:55:15 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: separate forced and non-forced device remove. X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.5 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1318941402 -3600 # Node ID 18505ddad997630e6696089c6fc6fe2b0e35014a # Parent 90b21171c8c0e25ff7d1648dcd55c7e806b88e11 libxl: separate forced and non-forced device remove. The function libxl__device_destroy currently takes a force parameter however: * in the forced case we initiate a graceful shutdown and then immediately nuke the backend directory, quite likely before anyone got a chance to react. * the callers all have a "wait" variable and pass in "!wait" as the force argument which is confusing since not waiting is not really the same thing as forcing the destroy. Therefore split the function into libxl__device_remove and libxl__device_destroy. The former initiates a graceful shutdown which the latter simply nukes the backend directory. This makes some of the callers look a bit odd but that should fall out as I continue to pull this piece of string. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 90b21171c8c0 -r 18505ddad997 tools/libxl/libxl_device.c --- a/tools/libxl/libxl_device.c Tue Oct 18 13:36:42 2011 +0100 +++ b/tools/libxl/libxl_device.c Tue Oct 18 13:36:42 2011 +0100 @@ -365,7 +365,7 @@ return -1; } -int libxl__device_destroy(libxl__gc *gc, char *be_path, int force) +int libxl__device_remove(libxl__gc *gc, char *be_path) { libxl_ctx *ctx = libxl__gc_owner(gc); xs_transaction_t t; @@ -393,17 +393,22 @@ goto out; } } - if (!force) { - xs_watch(ctx->xsh, state_path, be_path); - rc = 1; - } else { - xs_rm(ctx->xsh, XBT_NULL, be_path); - } + + xs_watch(ctx->xsh, state_path, be_path); libxl__device_destroy_tapdisk(gc, be_path); + rc = 1; out: return rc; } +int libxl__device_destroy(libxl__gc *gc, char *be_path) +{ + libxl_ctx *ctx = libxl__gc_owner(gc); + xs_rm(ctx->xsh, XBT_NULL, be_path); + libxl__device_destroy_tapdisk(gc, be_path); + return 0; +} + static int wait_for_dev_destroy(libxl__gc *gc, struct timeval *tv) { libxl_ctx *ctx = libxl__gc_owner(gc); @@ -461,7 +466,9 @@ fe_path = libxl__sprintf(gc, "/local/domain/%d/device/%s/%s", domid, l1[i], l2[j]); be_path = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "%s/backend", fe_path)); if (be_path != NULL) { - if (libxl__device_destroy(gc, be_path, force) > 0) + int rc = force ? libxl__device_destroy(gc, be_path) + : libxl__device_remove(gc, be_path); + if (rc > 0) n_watches++; } else { xs_rm(ctx->xsh, XBT_NULL, path); @@ -473,7 +480,9 @@ fe_path = libxl__sprintf(gc, "/local/domain/%d/console", domid); be_path = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "%s/backend", fe_path)); if (be_path && strcmp(be_path, "")) { - if (libxl__device_destroy(gc, be_path, force) > 0) + int rc = force ? libxl__device_destroy(gc, be_path) + : libxl__device_remove(gc, be_path); + if (rc > 0) n_watches++; } @@ -506,7 +515,10 @@ backend_path = libxl__device_backend_path(gc, dev); - rc = libxl__device_destroy(gc, backend_path, !wait); + if (wait) + rc = libxl__device_remove(gc, backend_path); + else + rc = libxl__device_destroy(gc, backend_path); if (rc == -1) { rc = ERROR_FAIL; goto out; diff -r 90b21171c8c0 -r 18505ddad997 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Tue Oct 18 13:36:42 2011 +0100 +++ b/tools/libxl/libxl_internal.h Tue Oct 18 13:36:42 2011 +0100 @@ -253,7 +253,8 @@ _hidden char *libxl__device_backend_path(libxl__gc *gc, libxl__device *device); _hidden char *libxl__device_frontend_path(libxl__gc *gc, libxl__device *device); _hidden int libxl__device_del(libxl__gc *gc, libxl__device *dev, int wait); -_hidden int libxl__device_destroy(libxl__gc *gc, char *be_path, int force); +_hidden int libxl__device_remove(libxl__gc *gc, char *be_path); +_hidden int libxl__device_destroy(libxl__gc *gc, char *be_path); _hidden int libxl__devices_destroy(libxl__gc *gc, uint32_t domid, int force); _hidden int libxl__wait_for_backend(libxl__gc *gc, char *be_path, char *state); diff -r 90b21171c8c0 -r 18505ddad997 tools/libxl/libxl_pci.c --- a/tools/libxl/libxl_pci.c Tue Oct 18 13:36:42 2011 +0100 +++ b/tools/libxl/libxl_pci.c Tue Oct 18 13:36:42 2011 +0100 @@ -411,8 +411,7 @@ if (num == 1) { char *fe_path = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "%s/frontend", be_path)); - libxl__device_destroy(gc, be_path, 1); - xs_rm(ctx->xsh, XBT_NULL, be_path); + libxl__device_destroy(gc, be_path); xs_rm(ctx->xsh, XBT_NULL, fe_path); return 0; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Tue Nov 01 16:56:48 2011 Return-path: Envelope-to: www-data@lists.xensource.com Delivery-date: Tue, 01 Nov 2011 16:56:48 -0700 Received: from localhost ([127.0.0.1] helo=lists.colo.xensource.com) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOCG-00016L-KD; Tue, 01 Nov 2011 16:56:48 -0700 Received: from mail21.messagelabs.com ([85.158.143.35]) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOAq-0000R8-ED for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 16:55:21 -0700 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-21.messagelabs.com!1320191717!2532813!1 X-Originating-IP: [93.93.131.152] X-StarScan-Version: 6.4.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2197 invoked from network); 1 Nov 2011 23:55:17 -0000 Received: from xenbits.xen.org (HELO xenbits.xen.org) (93.93.131.152) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2011 23:55:17 -0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RLOAn-0007cG-1U for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 23:55:17 +0000 Message-Id: Date: Tue, 01 Nov 2011 23:55:16 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: do not remove unidentified frontend paths in libxl__devices_destroy X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.5 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1318941402 -3600 # Node ID b26fc82addde34fc36e95e21dc566a1104e5042a # Parent 2d999cdc37f71521ee1fdb8ecaa7aca4a159faa6 libxl: do not remove unidentified frontend paths in libxl__devices_destroy Currently this appears to only include "/local/domain//device/suspend". Ultimately the caller will nuke the whole guest directory anyway but not having this function remove things which don't look like devices seems less surprising. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 2d999cdc37f7 -r b26fc82addde tools/libxl/libxl_device.c --- a/tools/libxl/libxl_device.c Tue Oct 18 13:36:42 2011 +0100 +++ b/tools/libxl/libxl_device.c Tue Oct 18 13:36:42 2011 +0100 @@ -463,8 +463,6 @@ if (libxl__device_remove(gc, be_path) > 0) n_watches++; } - } else { - xs_rm(ctx->xsh, XBT_NULL, path); } } } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Tue Nov 01 16:56:55 2011 Return-path: Envelope-to: www-data@lists.xensource.com Delivery-date: Tue, 01 Nov 2011 16:56:55 -0700 Received: from localhost ([127.0.0.1] helo=lists.colo.xensource.com) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOCN-00019Z-2U; Tue, 01 Nov 2011 16:56:55 -0700 Received: from mail182.messagelabs.com ([85.158.139.83]) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOAp-0000Qc-GQ for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 16:55:21 -0700 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-182.messagelabs.com!1320191716!1053206!1 X-Originating-IP: [93.93.131.152] X-StarScan-Version: 6.4.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23067 invoked from network); 1 Nov 2011 23:55:16 -0000 Received: from xenbits.xen.org (HELO xenbits.xen.org) (93.93.131.152) by server-13.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2011 23:55:16 -0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RLOAm-0007bm-19 for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 23:55:16 +0000 Message-Id: Date: Tue, 01 Nov 2011 23:55:15 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: split forced and non-forced uses of libxl__device_del X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.5 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1318941402 -3600 # Node ID 781c6672a25394a57b4c1eeaae40de9d05e5b9b6 # Parent 18505ddad997630e6696089c6fc6fe2b0e35014a libxl: split forced and non-forced uses of libxl__device_del Most forced users can now simply call libxl__device_destroy directly. libxl__devices_destroy is something of a special case, it is really just iterating over an opaque set of xenstore directories and removing them. Until this can be refactored just do the force-remove case manually, doing otherwise led to too much entanglement with the other callers of libxl__device_destroy which do know about specific device types. For the time being do the same in libxl__device_pci_remove_xenstore. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 18505ddad997 -r 781c6672a253 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Tue Oct 18 13:36:42 2011 +0100 +++ b/tools/libxl/libxl.c Tue Oct 18 13:36:42 2011 +0100 @@ -1074,7 +1074,10 @@ device.domid = domid; device.devid = devid; device.kind = DEVICE_VBD; - rc = libxl__device_del(&gc, &device, wait); + if (wait) + rc = libxl__device_del(&gc, &device); + else + rc = libxl__device_destroy(&gc, &device); out_free: libxl__free_all(&gc); return rc; @@ -1286,7 +1289,11 @@ device.domid = domid; device.kind = DEVICE_VIF; - rc = libxl__device_del(&gc, &device, wait); + if (wait) + rc = libxl__device_del(&gc, &device); + else + rc = libxl__device_destroy(&gc, &device); + libxl__free_all(&gc); return rc; } diff -r 18505ddad997 -r 781c6672a253 tools/libxl/libxl_device.c --- a/tools/libxl/libxl_device.c Tue Oct 18 13:36:42 2011 +0100 +++ b/tools/libxl/libxl_device.c Tue Oct 18 13:36:42 2011 +0100 @@ -401,11 +401,17 @@ return rc; } -int libxl__device_destroy(libxl__gc *gc, char *be_path) +int libxl__device_destroy(libxl__gc *gc, libxl__device *dev) { libxl_ctx *ctx = libxl__gc_owner(gc); + char *be_path = libxl__device_backend_path(gc, dev); + char *fe_path = libxl__device_frontend_path(gc, dev); + xs_rm(ctx->xsh, XBT_NULL, be_path); + xs_rm(ctx->xsh, XBT_NULL, fe_path); + libxl__device_destroy_tapdisk(gc, be_path); + return 0; } @@ -466,10 +472,14 @@ fe_path = libxl__sprintf(gc, "/local/domain/%d/device/%s/%s", domid, l1[i], l2[j]); be_path = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "%s/backend", fe_path)); if (be_path != NULL) { - int rc = force ? libxl__device_destroy(gc, be_path) - : libxl__device_remove(gc, be_path); - if (rc > 0) - n_watches++; + if (force) { + xs_rm(ctx->xsh, XBT_NULL, be_path); + xs_rm(ctx->xsh, XBT_NULL, fe_path); + libxl__device_destroy_tapdisk(gc, be_path); + } else { + if (libxl__device_remove(gc, be_path) > 0) + n_watches++; + } } else { xs_rm(ctx->xsh, XBT_NULL, path); } @@ -480,10 +490,13 @@ fe_path = libxl__sprintf(gc, "/local/domain/%d/console", domid); be_path = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "%s/backend", fe_path)); if (be_path && strcmp(be_path, "")) { - int rc = force ? libxl__device_destroy(gc, be_path) - : libxl__device_remove(gc, be_path); - if (rc > 0) - n_watches++; + if (force) { + xs_rm(ctx->xsh, XBT_NULL, be_path); + xs_rm(ctx->xsh, XBT_NULL, fe_path); + } else { + if (libxl__device_remove(gc, be_path) > 0) + n_watches++; + } } if (!force) { @@ -507,29 +520,24 @@ return 0; } -int libxl__device_del(libxl__gc *gc, libxl__device *dev, int wait) +int libxl__device_del(libxl__gc *gc, libxl__device *dev) { libxl_ctx *ctx = libxl__gc_owner(gc); + struct timeval tv; char *backend_path; int rc; backend_path = libxl__device_backend_path(gc, dev); - if (wait) - rc = libxl__device_remove(gc, backend_path); - else - rc = libxl__device_destroy(gc, backend_path); + rc = libxl__device_remove(gc, backend_path); if (rc == -1) { rc = ERROR_FAIL; goto out; } - if (wait) { - struct timeval tv; - tv.tv_sec = LIBXL_DESTROY_TIMEOUT; - tv.tv_usec = 0; - (void)wait_for_dev_destroy(gc, &tv); - } + tv.tv_sec = LIBXL_DESTROY_TIMEOUT; + tv.tv_usec = 0; + (void)wait_for_dev_destroy(gc, &tv); xs_rm(ctx->xsh, XBT_NULL, libxl__device_frontend_path(gc, dev)); rc = 0; diff -r 18505ddad997 -r 781c6672a253 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Tue Oct 18 13:36:42 2011 +0100 +++ b/tools/libxl/libxl_internal.h Tue Oct 18 13:36:42 2011 +0100 @@ -252,9 +252,9 @@ char **bents, char **fents); _hidden char *libxl__device_backend_path(libxl__gc *gc, libxl__device *device); _hidden char *libxl__device_frontend_path(libxl__gc *gc, libxl__device *device); -_hidden int libxl__device_del(libxl__gc *gc, libxl__device *dev, int wait); +_hidden int libxl__device_del(libxl__gc *gc, libxl__device *dev); _hidden int libxl__device_remove(libxl__gc *gc, char *be_path); -_hidden int libxl__device_destroy(libxl__gc *gc, char *be_path); +_hidden int libxl__device_destroy(libxl__gc *gc, libxl__device *dev); _hidden int libxl__devices_destroy(libxl__gc *gc, uint32_t domid, int force); _hidden int libxl__wait_for_backend(libxl__gc *gc, char *be_path, char *state); diff -r 18505ddad997 -r 781c6672a253 tools/libxl/libxl_pci.c --- a/tools/libxl/libxl_pci.c Tue Oct 18 13:36:42 2011 +0100 +++ b/tools/libxl/libxl_pci.c Tue Oct 18 13:36:42 2011 +0100 @@ -411,7 +411,7 @@ if (num == 1) { char *fe_path = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "%s/frontend", be_path)); - libxl__device_destroy(gc, be_path); + xs_rm(ctx->xsh, XBT_NULL, be_path); xs_rm(ctx->xsh, XBT_NULL, fe_path); return 0; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Tue Nov 01 16:57:03 2011 Return-path: Envelope-to: www-data@lists.xensource.com Delivery-date: Tue, 01 Nov 2011 16:57:03 -0700 Received: from localhost ([127.0.0.1] helo=lists.colo.xensource.com) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOCV-0001Ct-9z; Tue, 01 Nov 2011 16:57:03 -0700 Received: from mail21.messagelabs.com ([85.158.143.35]) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOAq-0000RN-WC for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 16:55:21 -0700 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-21.messagelabs.com!1320191717!2577224!1 X-Originating-IP: [93.93.131.152] X-StarScan-Version: 6.4.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1223 invoked from network); 1 Nov 2011 23:55:17 -0000 Received: from xenbits.xen.org (HELO xenbits.xen.org) (93.93.131.152) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2011 23:55:17 -0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RLOAn-0007cV-Hd for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 23:55:17 +0000 Message-Id: Date: Tue, 01 Nov 2011 23:55:17 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: use libxl__device in libxl_devices_destroy etc. X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.5 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1318941402 -3600 # Node ID 3d4e9f0daad6f6c6b5f18672ca6534bc5a56ceda # Parent b26fc82addde34fc36e95e21dc566a1104e5042a libxl: use libxl__device in libxl_devices_destroy etc. Use libxl__device in libxl_devices_destroy and libxl__device_pci_remove_xenstore. Doing this allows us to use the common functions for removing devices. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r b26fc82addde -r 3d4e9f0daad6 tools/libxl/libxl_device.c --- a/tools/libxl/libxl_device.c Tue Oct 18 13:36:42 2011 +0100 +++ b/tools/libxl/libxl_device.c Tue Oct 18 13:36:42 2011 +0100 @@ -49,6 +49,25 @@ device->domid, device->devid); } +int libxl__parse_backend_path(libxl__gc *gc, + const char *path, + libxl__device *dev) +{ + /* /local/domain//backend/// */ + char strkind[16]; /* Longest is actually "console" */ + uint32_t domain; + int rc = sscanf(path, "/local/domain/%d/backend/%15[^/]/%d/%d", + &dev->backend_domid, + strkind, + &domain, + &dev->backend_devid); + + if (rc != 4) + return ERROR_FAIL; + + return libxl__device_kind_from_string(strkind, &dev->backend_kind); +} + int libxl__device_generic_add(libxl__gc *gc, libxl__device *device, char **bents, char **fents) { @@ -348,10 +367,11 @@ return -1; } -int libxl__device_remove(libxl__gc *gc, char *be_path) +int libxl__device_remove(libxl__gc *gc, libxl__device *dev) { libxl_ctx *ctx = libxl__gc_owner(gc); xs_transaction_t t; + char *be_path = libxl__device_backend_path(gc, dev); char *state_path = libxl__sprintf(gc, "%s/state", be_path); char *state = libxl__xs_read(gc, XBT_NULL, state_path); int rc = 0; @@ -429,10 +449,12 @@ int libxl__devices_destroy(libxl__gc *gc, uint32_t domid, int force) { libxl_ctx *ctx = libxl__gc_owner(gc); - char *path, *be_path, *fe_path; + char *path; unsigned int num1, num2; char **l1 = NULL, **l2 = NULL; int i, j, n_watches = 0; + libxl__device dev; + libxl__device_kind kind; path = libxl__sprintf(gc, "/local/domain/%d/device", domid); l1 = libxl__xs_directory(gc, XBT_NULL, path, &num1); @@ -445,22 +467,25 @@ num1 = 0; } for (i = 0; i < num1; i++) { - if (!strcmp("vfs", l1[i])) + if (libxl__device_kind_from_string(l1[i], &kind)) continue; path = libxl__sprintf(gc, "/local/domain/%d/device/%s", domid, l1[i]); l2 = libxl__xs_directory(gc, XBT_NULL, path, &num2); if (!l2) continue; for (j = 0; j < num2; j++) { - fe_path = libxl__sprintf(gc, "/local/domain/%d/device/%s/%s", domid, l1[i], l2[j]); - be_path = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "%s/backend", fe_path)); - if (be_path != NULL) { + path = libxl__sprintf(gc, "/local/domain/%d/device/%s/%s/backend", + domid, l1[i], l2[j]); + path = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, path)); + if (path && libxl__parse_backend_path(gc, path, &dev) == 0) { + dev.domid = domid; + dev.kind = kind; + dev.devid = atoi(l2[j]); + if (force) { - xs_rm(ctx->xsh, XBT_NULL, be_path); - xs_rm(ctx->xsh, XBT_NULL, fe_path); - libxl__device_destroy_tapdisk(gc, be_path); + libxl__device_destroy(gc, &dev); } else { - if (libxl__device_remove(gc, be_path) > 0) + if (libxl__device_remove(gc, &dev) > 0) n_watches++; } } @@ -468,14 +493,18 @@ } /* console 0 frontend directory is not under /local/domain//device */ - fe_path = libxl__sprintf(gc, "/local/domain/%d/console", domid); - be_path = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "%s/backend", fe_path)); - if (be_path && strcmp(be_path, "")) { + path = libxl__sprintf(gc, "/local/domain/%d/console/backend", domid); + path = libxl__xs_read(gc, XBT_NULL, path); + if (path && strcmp(path, "") && + libxl__parse_backend_path(gc, path, &dev) == 0) { + dev.domid = domid; + dev.kind = LIBXL__DEVICE_KIND_CONSOLE; + dev.devid = 0; + if (force) { - xs_rm(ctx->xsh, XBT_NULL, be_path); - xs_rm(ctx->xsh, XBT_NULL, fe_path); + libxl__device_destroy(gc, &dev); } else { - if (libxl__device_remove(gc, be_path) > 0) + if (libxl__device_remove(gc, &dev) > 0) n_watches++; } } @@ -505,12 +534,9 @@ { libxl_ctx *ctx = libxl__gc_owner(gc); struct timeval tv; - char *backend_path; int rc; - backend_path = libxl__device_backend_path(gc, dev); - - rc = libxl__device_remove(gc, backend_path); + rc = libxl__device_remove(gc, dev); if (rc == -1) { rc = ERROR_FAIL; goto out; diff -r b26fc82addde -r 3d4e9f0daad6 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Tue Oct 18 13:36:42 2011 +0100 +++ b/tools/libxl/libxl_internal.h Tue Oct 18 13:36:42 2011 +0100 @@ -240,8 +240,10 @@ char **bents, char **fents); _hidden char *libxl__device_backend_path(libxl__gc *gc, libxl__device *device); _hidden char *libxl__device_frontend_path(libxl__gc *gc, libxl__device *device); +_hidden int libxl__parse_backend_path(libxl__gc *gc, const char *path, + libxl__device *dev); _hidden int libxl__device_del(libxl__gc *gc, libxl__device *dev); -_hidden int libxl__device_remove(libxl__gc *gc, char *be_path); +_hidden int libxl__device_remove(libxl__gc *gc, libxl__device *dev); _hidden int libxl__device_destroy(libxl__gc *gc, libxl__device *dev); _hidden int libxl__devices_destroy(libxl__gc *gc, uint32_t domid, int force); _hidden int libxl__wait_for_backend(libxl__gc *gc, char *be_path, char *state); diff -r b26fc82addde -r 3d4e9f0daad6 tools/libxl/libxl_pci.c --- a/tools/libxl/libxl_pci.c Tue Oct 18 13:36:42 2011 +0100 +++ b/tools/libxl/libxl_pci.c Tue Oct 18 13:36:42 2011 +0100 @@ -410,9 +410,15 @@ goto retry_transaction2; if (num == 1) { - char *fe_path = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "%s/frontend", be_path)); - xs_rm(ctx->xsh, XBT_NULL, be_path); - xs_rm(ctx->xsh, XBT_NULL, fe_path); + libxl__device dev; + if (libxl__parse_backend_path(gc, be_path, &dev) != 0) + return ERROR_FAIL; + + dev.domid = domid; + dev.kind = LIBXL__DEVICE_KIND_PCI; + dev.devid = 0; + + libxl__device_destroy(gc, &dev); return 0; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Tue Nov 01 16:57:16 2011 Return-path: Envelope-to: www-data@lists.xensource.com Delivery-date: Tue, 01 Nov 2011 16:57:16 -0700 Received: from localhost ([127.0.0.1] helo=lists.colo.xensource.com) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOCi-0001IQ-2n; Tue, 01 Nov 2011 16:57:16 -0700 Received: from mail21.messagelabs.com ([85.158.143.35]) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOAp-0000Qm-Vp for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 16:55:21 -0700 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-21.messagelabs.com!1320191716!2454506!1 X-Originating-IP: [93.93.131.152] X-StarScan-Version: 6.4.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31226 invoked from network); 1 Nov 2011 23:55:16 -0000 Received: from xenbits.xen.org (HELO xenbits.xen.org) (93.93.131.152) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2011 23:55:16 -0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RLOAm-0007c1-Hs for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 23:55:16 +0000 Message-Id: Date: Tue, 01 Nov 2011 23:55:16 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: use IDL to define device front- and back-end kinds X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.5 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1318941402 -3600 # Node ID 2d999cdc37f71521ee1fdb8ecaa7aca4a159faa6 # Parent 781c6672a25394a57b4c1eeaae40de9d05e5b9b6 libxl: use IDL to define device front- and back-end kinds I'd like to use the from_string functionality... Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 781c6672a253 -r 2d999cdc37f7 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Tue Oct 18 13:36:42 2011 +0100 +++ b/tools/libxl/libxl.c Tue Oct 18 13:36:42 2011 +0100 @@ -962,7 +962,7 @@ device.backend_domid = disk->backend_domid; device.devid = devid; device.domid = domid; - device.kind = DEVICE_VBD; + device.kind = LIBXL__DEVICE_KIND_VBD; switch (disk->backend) { case LIBXL_DISK_BACKEND_PHY: @@ -975,7 +975,7 @@ flexarray_append(back, "params"); flexarray_append(back, dev); - device.backend_kind = DEVICE_VBD; + device.backend_kind = LIBXL__DEVICE_KIND_VBD; break; case LIBXL_DISK_BACKEND_TAP: dev = libxl__blktap_devpath(&gc, disk->pdev_path, disk->format); @@ -994,7 +994,7 @@ flexarray_append(back, "params"); flexarray_append(back, libxl__sprintf(&gc, "%s:%s", libxl__device_disk_string_of_format(disk->format), disk->pdev_path)); - device.backend_kind = DEVICE_QDISK; + device.backend_kind = LIBXL__DEVICE_KIND_QDISK; break; default: LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "unrecognized disk backend type: %d\n", disk->backend); @@ -1057,13 +1057,13 @@ switch (disk->backend) { case LIBXL_DISK_BACKEND_PHY: - device.backend_kind = DEVICE_VBD; + device.backend_kind = LIBXL__DEVICE_KIND_VBD; break; case LIBXL_DISK_BACKEND_TAP: - device.backend_kind = DEVICE_VBD; + device.backend_kind = LIBXL__DEVICE_KIND_VBD; break; case LIBXL_DISK_BACKEND_QDISK: - device.backend_kind = DEVICE_QDISK; + device.backend_kind = LIBXL__DEVICE_KIND_QDISK; break; default: LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "unrecognized disk backend type: %d\n", @@ -1073,7 +1073,7 @@ } device.domid = domid; device.devid = devid; - device.kind = DEVICE_VBD; + device.kind = LIBXL__DEVICE_KIND_VBD; if (wait) rc = libxl__device_del(&gc, &device); else @@ -1221,10 +1221,10 @@ device.backend_devid = nic->devid; device.backend_domid = nic->backend_domid; - device.backend_kind = DEVICE_VIF; + device.backend_kind = LIBXL__DEVICE_KIND_VIF; device.devid = nic->devid; device.domid = domid; - device.kind = DEVICE_VIF; + device.kind = LIBXL__DEVICE_KIND_VIF; flexarray_append(back, "frontend-id"); flexarray_append(back, libxl__sprintf(&gc, "%d", domid)); @@ -1284,10 +1284,10 @@ device.backend_devid = nic->devid; device.backend_domid = nic->backend_domid; - device.backend_kind = DEVICE_VIF; + device.backend_kind = LIBXL__DEVICE_KIND_VIF; device.devid = nic->devid; device.domid = domid; - device.kind = DEVICE_VIF; + device.kind = LIBXL__DEVICE_KIND_VIF; if (wait) rc = libxl__device_del(&gc, &device); @@ -1486,10 +1486,10 @@ device.backend_devid = console->devid; device.backend_domid = console->backend_domid; - device.backend_kind = DEVICE_CONSOLE; + device.backend_kind = LIBXL__DEVICE_KIND_CONSOLE; device.devid = console->devid; device.domid = domid; - device.kind = DEVICE_CONSOLE; + device.kind = LIBXL__DEVICE_KIND_CONSOLE; flexarray_append(back, "frontend-id"); flexarray_append(back, libxl__sprintf(gc, "%d", domid)); @@ -1577,10 +1577,10 @@ device.backend_devid = vkb->devid; device.backend_domid = vkb->backend_domid; - device.backend_kind = DEVICE_VKBD; + device.backend_kind = LIBXL__DEVICE_KIND_VKBD; device.devid = vkb->devid; device.domid = domid; - device.kind = DEVICE_VKBD; + device.kind = LIBXL__DEVICE_KIND_VKBD; flexarray_append(back, "frontend-id"); flexarray_append(back, libxl__sprintf(&gc, "%d", domid)); @@ -1864,10 +1864,10 @@ device.backend_devid = vfb->devid; device.backend_domid = vfb->backend_domid; - device.backend_kind = DEVICE_VFB; + device.backend_kind = LIBXL__DEVICE_KIND_VFB; device.devid = vfb->devid; device.domid = domid; - device.kind = DEVICE_VFB; + device.kind = LIBXL__DEVICE_KIND_VFB; flexarray_append_pair(back, "frontend-id", libxl__sprintf(&gc, "%d", domid)); flexarray_append_pair(back, "online", "1"); diff -r 781c6672a253 -r 2d999cdc37f7 tools/libxl/libxl_device.c --- a/tools/libxl/libxl_device.c Tue Oct 18 13:36:42 2011 +0100 +++ b/tools/libxl/libxl_device.c Tue Oct 18 13:36:42 2011 +0100 @@ -24,30 +24,20 @@ #include #include - #include "libxl.h" #include "libxl_internal.h" -static const char *string_of_kinds[] = { - [DEVICE_VIF] = "vif", - [DEVICE_VBD] = "vbd", - [DEVICE_QDISK] = "qdisk", - [DEVICE_PCI] = "pci", - [DEVICE_VFB] = "vfb", - [DEVICE_VKBD] = "vkbd", - [DEVICE_CONSOLE] = "console", -}; - char *libxl__device_frontend_path(libxl__gc *gc, libxl__device *device) { char *dom_path = libxl__xs_get_dompath(gc, device->domid); /* Console 0 is a special case */ - if (device->kind == DEVICE_CONSOLE && device->devid == 0) + if (device->kind == LIBXL__DEVICE_KIND_CONSOLE && device->devid == 0) return libxl__sprintf(gc, "%s/console", dom_path); return libxl__sprintf(gc, "%s/device/%s/%d", dom_path, - string_of_kinds[device->kind], device->devid); + libxl__device_kind_to_string(device->kind), + device->devid); } char *libxl__device_backend_path(libxl__gc *gc, libxl__device *device) @@ -55,7 +45,7 @@ char *dom_path = libxl__xs_get_dompath(gc, device->backend_domid); return libxl__sprintf(gc, "%s/backend/%s/%u/%d", dom_path, - string_of_kinds[device->backend_kind], + libxl__device_kind_to_string(device->backend_kind), device->domid, device->devid); } @@ -67,12 +57,6 @@ xs_transaction_t t; struct xs_permissions frontend_perms[2]; struct xs_permissions backend_perms[2]; - int rc; - - if (!is_valid_device_kind(device->backend_kind) || !is_valid_device_kind(device->kind)) { - rc = ERROR_INVAL; - goto out; - } frontend_path = libxl__device_frontend_path(gc, device); backend_path = libxl__device_backend_path(gc, device); @@ -113,9 +97,8 @@ else LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "xs transaction failed"); } - rc = 0; -out: - return rc; + + return 0; } typedef struct { diff -r 781c6672a253 -r 2d999cdc37f7 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Tue Oct 18 13:36:42 2011 +0100 +++ b/tools/libxl/libxl_internal.h Tue Oct 18 13:36:42 2011 +0100 @@ -97,25 +97,13 @@ libxl_version_info version_info; }; -typedef enum { - DEVICE_VIF = 1, - DEVICE_VBD, - DEVICE_QDISK, - DEVICE_PCI, - DEVICE_VFB, - DEVICE_VKBD, - DEVICE_CONSOLE, -} libxl__device_kinds; - -#define is_valid_device_kind(kind) (((kind) >= DEVICE_VIF) && ((kind) <= DEVICE_CONSOLE)) - typedef struct { uint32_t backend_devid; uint32_t backend_domid; uint32_t devid; uint32_t domid; - libxl__device_kinds backend_kind; - libxl__device_kinds kind; + libxl__device_kind backend_kind; + libxl__device_kind kind; } libxl__device; #define XC_PCI_BDF "0x%x, 0x%x, 0x%x, 0x%x" diff -r 781c6672a253 -r 2d999cdc37f7 tools/libxl/libxl_pci.c --- a/tools/libxl/libxl_pci.c Tue Oct 18 13:36:42 2011 +0100 +++ b/tools/libxl/libxl_pci.c Tue Oct 18 13:36:42 2011 +0100 @@ -244,10 +244,10 @@ /* add pci device */ device.backend_devid = 0; device.backend_domid = 0; - device.backend_kind = DEVICE_PCI; + device.backend_kind = LIBXL__DEVICE_KIND_PCI; device.devid = 0; device.domid = domid; - device.kind = DEVICE_PCI; + device.kind = LIBXL__DEVICE_KIND_PCI; flexarray_append_pair(back, "frontend-id", libxl__sprintf(gc, "%d", domid)); flexarray_append_pair(back, "online", "1"); diff -r 781c6672a253 -r 2d999cdc37f7 tools/libxl/libxl_types_internal.idl --- a/tools/libxl/libxl_types_internal.idl Tue Oct 18 13:36:42 2011 +0100 +++ b/tools/libxl/libxl_types_internal.idl Tue Oct 18 13:36:42 2011 +0100 @@ -1,9 +1,19 @@ namespace("libxl__") -libxl__qmp_message_type = Enumeration("qmp_message_type", [ +libxl__qmp_message_type = Enumeration("qmp_message_type", [ (1, "QMP"), (2, "return"), (3, "error"), (4, "event"), (5, "invalid"), ]) + +libxl__device_kind = Enumeration("device_kind", [ + (1, "VIF"), + (2, "VBD"), + (3, "QDISK"), + (4, "PCI"), + (5, "VFB"), + (6, "VKBD"), + (7, "CONSOLE"), + ]) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Tue Nov 01 16:57:27 2011 Return-path: Envelope-to: www-data@lists.xensource.com Delivery-date: Tue, 01 Nov 2011 16:57:27 -0700 Received: from localhost ([127.0.0.1] helo=lists.colo.xensource.com) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOCs-0001Nf-9n; Tue, 01 Nov 2011 16:57:26 -0700 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOAr-0000Rm-Kw for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 16:55:21 -0700 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-27.messagelabs.com!1320191683!61555355!1 X-Originating-IP: [93.93.131.152] X-StarScan-Version: 6.4.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30038 invoked from network); 1 Nov 2011 23:54:43 -0000 Received: from xenbits.xen.org (HELO xenbits.xen.org) (93.93.131.152) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2011 23:54:43 -0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RLOAo-0007d0-I6 for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 23:55:18 +0000 Message-Id: Date: Tue, 01 Nov 2011 23:55:18 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: use more descriptive variable names in libxl__devices_destroy. X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.5 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1318941402 -3600 # Node ID ae1e145bdac024835980370473bc82269c9f9c67 # Parent 3505f6b5787bfb7b06f961019a1130b1ebe98882 libxl: use more descriptive variable names in libxl__devices_destroy. It's not immediately clear that "l1" iterates over device types and "l2" iterates over individual devices. Name things in a way which makes this more obvious. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 3505f6b5787b -r ae1e145bdac0 tools/libxl/libxl_device.c --- a/tools/libxl/libxl_device.c Tue Oct 18 13:36:42 2011 +0100 +++ b/tools/libxl/libxl_device.c Tue Oct 18 13:36:42 2011 +0100 @@ -464,37 +464,38 @@ { libxl_ctx *ctx = libxl__gc_owner(gc); char *path; - unsigned int num1, num2; - char **l1 = NULL, **l2 = NULL; + unsigned int num_kinds, num_devs; + char **kinds = NULL, **devs = NULL; int i, j, n_watches = 0; libxl__device dev; libxl__device_kind kind; path = libxl__sprintf(gc, "/local/domain/%d/device", domid); - l1 = libxl__xs_directory(gc, XBT_NULL, path, &num1); - if (!l1) { + kinds = libxl__xs_directory(gc, XBT_NULL, path, &num_kinds); + if (!kinds) { if (errno != ENOENT) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "unable to get xenstore" " device listing %s", path); goto out; } - num1 = 0; + num_kinds = 0; } - for (i = 0; i < num1; i++) { - if (libxl__device_kind_from_string(l1[i], &kind)) + for (i = 0; i < num_kinds; i++) { + if (libxl__device_kind_from_string(kinds[i], &kind)) continue; - path = libxl__sprintf(gc, "/local/domain/%d/device/%s", domid, l1[i]); - l2 = libxl__xs_directory(gc, XBT_NULL, path, &num2); - if (!l2) + + path = libxl__sprintf(gc, "/local/domain/%d/device/%s", domid, kinds[i]); + devs = libxl__xs_directory(gc, XBT_NULL, path, &num_devs); + if (!devs) continue; - for (j = 0; j < num2; j++) { + for (j = 0; j < num_devs; j++) { path = libxl__sprintf(gc, "/local/domain/%d/device/%s/%s/backend", - domid, l1[i], l2[j]); + domid, kinds[i], devs[j]); path = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, path)); if (path && libxl__parse_backend_path(gc, path, &dev) == 0) { dev.domid = domid; dev.kind = kind; - dev.devid = atoi(l2[j]); + dev.devid = atoi(devs[j]); if (force) { libxl__device_destroy(gc, &dev); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Tue Nov 01 16:57:37 2011 Return-path: Envelope-to: www-data@lists.xensource.com Delivery-date: Tue, 01 Nov 2011 16:57:37 -0700 Received: from localhost ([127.0.0.1] helo=lists.colo.xensource.com) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOD2-0001Rr-KT; Tue, 01 Nov 2011 16:57:37 -0700 Received: from mail182.messagelabs.com ([85.158.139.83]) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOAr-0000Rf-J6 for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 16:55:22 -0700 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-182.messagelabs.com!1320191718!1053211!1 X-Originating-IP: [93.93.131.152] X-StarScan-Version: 6.4.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23083 invoked from network); 1 Nov 2011 23:55:18 -0000 Received: from xenbits.xen.org (HELO xenbits.xen.org) (93.93.131.152) by server-13.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2011 23:55:18 -0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RLOAo-0007ck-2I for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 23:55:18 +0000 Message-Id: Date: Tue, 01 Nov 2011 23:55:17 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: merge libxl__device_del into libxl__device_remove X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.5 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1318941402 -3600 # Node ID 3505f6b5787bfb7b06f961019a1130b1ebe98882 # Parent 3d4e9f0daad6f6c6b5f18672ca6534bc5a56ceda libxl: merge libxl__device_del into libxl__device_remove Note that the "wait" parameter added to libxl_device_remove is different to the wait paramter previously used by similar functions. In the past not-wait meant forced whereas now in means wait for a graceful shutdown, as opposed to setting off a graceful shutdown but not waiting. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 3d4e9f0daad6 -r 3505f6b5787b tools/libxl/libxl.c --- a/tools/libxl/libxl.c Tue Oct 18 13:36:42 2011 +0100 +++ b/tools/libxl/libxl.c Tue Oct 18 13:36:42 2011 +0100 @@ -1075,7 +1075,7 @@ device.devid = devid; device.kind = LIBXL__DEVICE_KIND_VBD; if (wait) - rc = libxl__device_del(&gc, &device); + rc = libxl__device_remove(&gc, &device, wait); else rc = libxl__device_destroy(&gc, &device); out_free: @@ -1290,7 +1290,7 @@ device.kind = LIBXL__DEVICE_KIND_VIF; if (wait) - rc = libxl__device_del(&gc, &device); + rc = libxl__device_remove(&gc, &device, wait); else rc = libxl__device_destroy(&gc, &device); diff -r 3d4e9f0daad6 -r 3505f6b5787b tools/libxl/libxl_device.c --- a/tools/libxl/libxl_device.c Tue Oct 18 13:36:42 2011 +0100 +++ b/tools/libxl/libxl_device.c Tue Oct 18 13:36:42 2011 +0100 @@ -367,57 +367,6 @@ return -1; } -int libxl__device_remove(libxl__gc *gc, libxl__device *dev) -{ - libxl_ctx *ctx = libxl__gc_owner(gc); - xs_transaction_t t; - char *be_path = libxl__device_backend_path(gc, dev); - char *state_path = libxl__sprintf(gc, "%s/state", be_path); - char *state = libxl__xs_read(gc, XBT_NULL, state_path); - int rc = 0; - - if (!state) - goto out; - if (atoi(state) != 4) { - libxl__device_destroy_tapdisk(gc, be_path); - xs_rm(ctx->xsh, XBT_NULL, be_path); - goto out; - } - -retry_transaction: - t = xs_transaction_start(ctx->xsh); - xs_write(ctx->xsh, t, libxl__sprintf(gc, "%s/online", be_path), "0", strlen("0")); - xs_write(ctx->xsh, t, state_path, "5", strlen("5")); - if (!xs_transaction_end(ctx->xsh, t, 0)) { - if (errno == EAGAIN) - goto retry_transaction; - else { - rc = -1; - goto out; - } - } - - xs_watch(ctx->xsh, state_path, be_path); - libxl__device_destroy_tapdisk(gc, be_path); - rc = 1; -out: - return rc; -} - -int libxl__device_destroy(libxl__gc *gc, libxl__device *dev) -{ - libxl_ctx *ctx = libxl__gc_owner(gc); - char *be_path = libxl__device_backend_path(gc, dev); - char *fe_path = libxl__device_frontend_path(gc, dev); - - xs_rm(ctx->xsh, XBT_NULL, be_path); - xs_rm(ctx->xsh, XBT_NULL, fe_path); - - libxl__device_destroy_tapdisk(gc, be_path); - - return 0; -} - static int wait_for_dev_destroy(libxl__gc *gc, struct timeval *tv) { libxl_ctx *ctx = libxl__gc_owner(gc); @@ -446,6 +395,71 @@ return rc; } +/* + * Returns 0 (device already destroyed) or 1 (caller must + * wait_for_dev_destroy) on success, ERROR_* on fail. + */ +int libxl__device_remove(libxl__gc *gc, libxl__device *dev, int wait) +{ + libxl_ctx *ctx = libxl__gc_owner(gc); + xs_transaction_t t; + char *be_path = libxl__device_backend_path(gc, dev); + char *state_path = libxl__sprintf(gc, "%s/state", be_path); + char *state = libxl__xs_read(gc, XBT_NULL, state_path); + int rc = 0; + + if (!state) + goto out; + if (atoi(state) != 4) { + libxl__device_destroy_tapdisk(gc, be_path); + xs_rm(ctx->xsh, XBT_NULL, be_path); + goto out; + } + +retry_transaction: + t = xs_transaction_start(ctx->xsh); + xs_write(ctx->xsh, t, libxl__sprintf(gc, "%s/online", be_path), "0", strlen("0")); + xs_write(ctx->xsh, t, state_path, "5", strlen("5")); + if (!xs_transaction_end(ctx->xsh, t, 0)) { + if (errno == EAGAIN) + goto retry_transaction; + else { + rc = ERROR_FAIL; + goto out; + } + } + + xs_watch(ctx->xsh, state_path, be_path); + libxl__device_destroy_tapdisk(gc, be_path); + + if (wait) { + struct timeval tv; + tv.tv_sec = LIBXL_DESTROY_TIMEOUT; + tv.tv_usec = 0; + (void)wait_for_dev_destroy(gc, &tv); + xs_rm(ctx->xsh, XBT_NULL, libxl__device_frontend_path(gc, dev)); + } else { + rc = 1; /* Caller must wait_for_dev_destroy */ + } + +out: + return rc; +} + +int libxl__device_destroy(libxl__gc *gc, libxl__device *dev) +{ + libxl_ctx *ctx = libxl__gc_owner(gc); + char *be_path = libxl__device_backend_path(gc, dev); + char *fe_path = libxl__device_frontend_path(gc, dev); + + xs_rm(ctx->xsh, XBT_NULL, be_path); + xs_rm(ctx->xsh, XBT_NULL, fe_path); + + libxl__device_destroy_tapdisk(gc, be_path); + + return 0; +} + int libxl__devices_destroy(libxl__gc *gc, uint32_t domid, int force) { libxl_ctx *ctx = libxl__gc_owner(gc); @@ -485,8 +499,12 @@ if (force) { libxl__device_destroy(gc, &dev); } else { - if (libxl__device_remove(gc, &dev) > 0) - n_watches++; + int rc = libxl__device_remove(gc, &dev, 0); + if (rc < 0) + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, + "cannot remove device %s\n", path); + else + n_watches += rc; } } } @@ -504,8 +522,12 @@ if (force) { libxl__device_destroy(gc, &dev); } else { - if (libxl__device_remove(gc, &dev) > 0) - n_watches++; + int rc = libxl__device_remove(gc, &dev, 0); + if (rc < 0) + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, + "cannot remove device %s\n", path); + else + n_watches += rc; } } @@ -530,29 +552,6 @@ return 0; } -int libxl__device_del(libxl__gc *gc, libxl__device *dev) -{ - libxl_ctx *ctx = libxl__gc_owner(gc); - struct timeval tv; - int rc; - - rc = libxl__device_remove(gc, dev); - if (rc == -1) { - rc = ERROR_FAIL; - goto out; - } - - tv.tv_sec = LIBXL_DESTROY_TIMEOUT; - tv.tv_usec = 0; - (void)wait_for_dev_destroy(gc, &tv); - - xs_rm(ctx->xsh, XBT_NULL, libxl__device_frontend_path(gc, dev)); - rc = 0; - -out: - return rc; -} - int libxl__wait_for_device_model(libxl__gc *gc, uint32_t domid, char *state, libxl__spawn_starting *spawning, diff -r 3d4e9f0daad6 -r 3505f6b5787b tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Tue Oct 18 13:36:42 2011 +0100 +++ b/tools/libxl/libxl_internal.h Tue Oct 18 13:36:42 2011 +0100 @@ -242,8 +242,7 @@ _hidden char *libxl__device_frontend_path(libxl__gc *gc, libxl__device *device); _hidden int libxl__parse_backend_path(libxl__gc *gc, const char *path, libxl__device *dev); -_hidden int libxl__device_del(libxl__gc *gc, libxl__device *dev); -_hidden int libxl__device_remove(libxl__gc *gc, libxl__device *dev); +_hidden int libxl__device_remove(libxl__gc *gc, libxl__device *dev, int wait); _hidden int libxl__device_destroy(libxl__gc *gc, libxl__device *dev); _hidden int libxl__devices_destroy(libxl__gc *gc, uint32_t domid, int force); _hidden int libxl__wait_for_backend(libxl__gc *gc, char *be_path, char *state); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Tue Nov 01 16:57:50 2011 Return-path: Envelope-to: www-data@lists.xensource.com Delivery-date: Tue, 01 Nov 2011 16:57:50 -0700 Received: from localhost ([127.0.0.1] helo=lists.colo.xensource.com) by lists.xensource.com with esmtp (Exim 4.43) id 1RLODF-0001Um-Lg; Tue, 01 Nov 2011 16:57:49 -0700 Received: from mail216.messagelabs.com ([85.158.143.99]) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOAs-0000S3-GH for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 16:55:23 -0700 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-216.messagelabs.com!1320191719!1867877!1 X-Originating-IP: [93.93.131.152] X-StarScan-Version: 6.4.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9554 invoked from network); 1 Nov 2011 23:55:19 -0000 Received: from xenbits.xen.org (HELO xenbits.xen.org) (93.93.131.152) by server-11.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2011 23:55:19 -0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RLOAp-0007dG-38 for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 23:55:19 +0000 Message-Id: Date: Tue, 01 Nov 2011 23:55:18 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: convert disk handling to device API X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.5 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1318941402 -3600 # Node ID 7357a4c2c0113afb971a074f4b21b5c67eb5140b # Parent ae1e145bdac024835980370473bc82269c9f9c67 libxl: convert disk handling to device API Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r ae1e145bdac0 -r 7357a4c2c011 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Tue Oct 18 13:36:42 2011 +0100 +++ b/tools/libxl/libxl.c Tue Oct 18 13:36:42 2011 +0100 @@ -916,13 +916,58 @@ /******************************************************************************/ +int libxl_device_disk_init(libxl_ctx *ctx, libxl_device_disk *disk) +{ + memset(disk, 0x00, sizeof(libxl_device_disk)); + return 0; +} + +static int libxl__device_from_disk(libxl__gc *gc, uint32_t domid, + libxl_device_disk *disk, + libxl__device *device) +{ + libxl_ctx *ctx = libxl__gc_owner(gc); + int devid; + + devid = libxl__device_disk_dev_number(disk->vdev, NULL, NULL); + if (devid==-1) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Invalid or unsupported" + " virtual disk identifier %s", disk->vdev); + return ERROR_INVAL; + } + + device->backend_domid = disk->backend_domid; + device->backend_devid = devid; + + switch (disk->backend) { + case LIBXL_DISK_BACKEND_PHY: + device->backend_kind = LIBXL__DEVICE_KIND_VBD; + break; + case LIBXL_DISK_BACKEND_TAP: + device->backend_kind = LIBXL__DEVICE_KIND_VBD; + break; + case LIBXL_DISK_BACKEND_QDISK: + device->backend_kind = LIBXL__DEVICE_KIND_QDISK; + break; + default: + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "unrecognized disk backend type: %d\n", + disk->backend); + return ERROR_INVAL; + } + + device->domid = domid; + device->devid = devid; + device->kind = LIBXL__DEVICE_KIND_VBD; + + return 0; +} + int libxl_device_disk_add(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk) { libxl__gc gc = LIBXL_INIT_GC(ctx); flexarray_t *front; flexarray_t *back; char *dev; - int devid; libxl__device device; int major, minor, rc; @@ -950,20 +995,13 @@ goto out_free; } - devid = libxl__device_disk_dev_number(disk->vdev, NULL, NULL); - if (devid==-1) { + rc = libxl__device_from_disk(&gc, domid, disk, &device); + if (rc != 0) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Invalid or unsupported" " virtual disk identifier %s", disk->vdev); - rc = ERROR_INVAL; goto out_free; } - device.backend_devid = devid; - device.backend_domid = disk->backend_domid; - device.devid = devid; - device.domid = domid; - device.kind = LIBXL__DEVICE_KIND_VBD; - switch (disk->backend) { case LIBXL_DISK_BACKEND_PHY: dev = disk->pdev_path; @@ -975,7 +1013,7 @@ flexarray_append(back, "params"); flexarray_append(back, dev); - device.backend_kind = LIBXL__DEVICE_KIND_VBD; + assert(device.backend_kind == LIBXL__DEVICE_KIND_VBD); break; case LIBXL_DISK_BACKEND_TAP: dev = libxl__blktap_devpath(&gc, disk->pdev_path, disk->format); @@ -994,7 +1032,7 @@ flexarray_append(back, "params"); flexarray_append(back, libxl__sprintf(&gc, "%s:%s", libxl__device_disk_string_of_format(disk->format), disk->pdev_path)); - device.backend_kind = LIBXL__DEVICE_KIND_QDISK; + assert(device.backend_kind == LIBXL__DEVICE_KIND_QDISK); break; default: LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "unrecognized disk backend type: %d\n", disk->backend); @@ -1026,7 +1064,7 @@ flexarray_append(front, "state"); flexarray_append(front, libxl__sprintf(&gc, "%d", 1)); flexarray_append(front, "virtual-device"); - flexarray_append(front, libxl__sprintf(&gc, "%d", devid)); + flexarray_append(front, libxl__sprintf(&gc, "%d", device.devid)); flexarray_append(front, "device-type"); flexarray_append(front, disk->is_cdrom ? "cdrom" : "disk"); @@ -1044,45 +1082,37 @@ return rc; } -int libxl_device_disk_del(libxl_ctx *ctx, uint32_t domid, - libxl_device_disk *disk, int wait) +int libxl_device_disk_remove(libxl_ctx *ctx, uint32_t domid, + libxl_device_disk *disk) { libxl__gc gc = LIBXL_INIT_GC(ctx); libxl__device device; - int devid, rc; - - devid = libxl__device_disk_dev_number(disk->vdev, NULL, NULL); - device.backend_domid = disk->backend_domid; - device.backend_devid = devid; - - switch (disk->backend) { - case LIBXL_DISK_BACKEND_PHY: - device.backend_kind = LIBXL__DEVICE_KIND_VBD; - break; - case LIBXL_DISK_BACKEND_TAP: - device.backend_kind = LIBXL__DEVICE_KIND_VBD; - break; - case LIBXL_DISK_BACKEND_QDISK: - device.backend_kind = LIBXL__DEVICE_KIND_QDISK; - break; - default: - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "unrecognized disk backend type: %d\n", - disk->backend); - rc = ERROR_INVAL; - goto out_free; - } - device.domid = domid; - device.devid = devid; - device.kind = LIBXL__DEVICE_KIND_VBD; - if (wait) - rc = libxl__device_remove(&gc, &device, wait); - else - rc = libxl__device_destroy(&gc, &device); -out_free: + int rc; + + rc = libxl__device_from_disk(&gc, domid, disk, &device); + if (rc != 0) goto out; + + rc = libxl__device_remove(&gc, &device, 1); +out: libxl__free_all(&gc); return rc; } +int libxl_device_disk_destroy(libxl_ctx *ctx, uint32_t domid, + libxl_device_disk *disk) +{ + libxl__gc gc = LIBXL_INIT_GC(ctx); + libxl__device device; + int rc; + + rc = libxl__device_from_disk(&gc, domid, disk, &device); + if (rc != 0) goto out; + + rc = libxl__device_destroy(&gc, &device); +out: + libxl__free_all(&gc); + return rc; +} char * libxl_device_disk_local_attach(libxl_ctx *ctx, libxl_device_disk *disk) { libxl__gc gc = LIBXL_INIT_GC(ctx); @@ -1626,7 +1656,7 @@ unsigned int len; char *tmp; - memset(disk, 0, sizeof(*disk)); + libxl_device_disk_init(ctx, disk); tmp = xs_read(ctx->xsh, XBT_NULL, libxl__sprintf(gc, "%s/params", be_path), &len); @@ -1670,7 +1700,8 @@ char *dompath, *path; int rc = ERROR_FAIL; - memset(disk, 0, sizeof (libxl_device_disk)); + libxl_device_disk_init(ctx, disk); + dompath = libxl__xs_get_dompath(&gc, domid); if (!dompath) { goto out; @@ -1812,11 +1843,11 @@ ret = 0; - libxl_device_disk_del(ctx, domid, disks + i, 1); + libxl_device_disk_remove(ctx, domid, disks + i); libxl_device_disk_add(ctx, domid, disk); stubdomid = libxl_get_stubdom_id(ctx, domid); if (stubdomid) { - libxl_device_disk_del(ctx, stubdomid, disks + i, 1); + libxl_device_disk_remove(ctx, stubdomid, disks + i); libxl_device_disk_add(ctx, stubdomid, disk); } out: diff -r ae1e145bdac0 -r 7357a4c2c011 tools/libxl/libxl.h --- a/tools/libxl/libxl.h Tue Oct 18 13:36:42 2011 +0100 +++ b/tools/libxl/libxl.h Tue Oct 18 13:36:42 2011 +0100 @@ -438,15 +438,27 @@ * This function does not interact with the guest and therefore * cannot block on the guest. */ + +/* Disks */ +int libxl_device_disk_init(libxl_ctx *ctx, libxl_device_disk *disk); int libxl_device_disk_add(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk); -int libxl_device_disk_del(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk, int wait); +int libxl_device_disk_remove(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk); +int libxl_device_disk_destroy(libxl_ctx *ctx, uint32_t domid, + libxl_device_disk *disk); + libxl_device_disk *libxl_device_disk_list(libxl_ctx *ctx, uint32_t domid, int *num); int libxl_device_disk_getinfo(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk, libxl_diskinfo *diskinfo); + +/* + * Insert a CD-ROM device. A device corresponding to disk must already + * be attached to the guest. + */ int libxl_cdrom_insert(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk); /* - * Make a disk available in this domain. Returns path to a device. + * Make a disk available in this (the control) domain. Returns path to + * a device. */ char * libxl_device_disk_local_attach(libxl_ctx *ctx, libxl_device_disk *disk); int libxl_device_disk_local_detach(libxl_ctx *ctx, libxl_device_disk *disk); diff -r ae1e145bdac0 -r 7357a4c2c011 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Tue Oct 18 13:36:42 2011 +0100 +++ b/tools/libxl/xl_cmdimpl.c Tue Oct 18 13:36:42 2011 +0100 @@ -494,7 +494,7 @@ { int e; - memset(disk, 0, sizeof(*disk)); + libxl_device_disk_init(ctx, disk); if (!*config) { *config = xlu_cfg_init(stderr, "command line"); @@ -1893,6 +1893,8 @@ disk.backend_domid = 0; libxl_cdrom_insert(ctx, domid, &disk); + + libxl_device_disk_dispose(&disk); free(buf); } @@ -4182,8 +4184,8 @@ fprintf(stderr, "Error: Device %s not connected.\n", argv[optind+1]); return 1; } - if (libxl_device_disk_del(ctx, domid, &disk, 1)) { - fprintf(stderr, "libxl_device_disk_del failed.\n"); + if (libxl_device_disk_remove(ctx, domid, &disk)) { + fprintf(stderr, "libxl_device_disk_remove failed.\n"); } return 0; } diff -r ae1e145bdac0 -r 7357a4c2c011 tools/ocaml/libs/xl/genwrap.py --- a/tools/ocaml/libs/xl/genwrap.py Tue Oct 18 13:36:42 2011 +0100 +++ b/tools/ocaml/libs/xl/genwrap.py Tue Oct 18 13:36:42 2011 +0100 @@ -16,6 +16,11 @@ "libxl_hwcap": ("int32 array", None, "Val_hwcap(&%(c)s)"), } +DEVICE_FUNCTIONS = [ ("add", ["t", "domid", "unit"]), + ("remove", ["t", "domid", "unit"]), + ("destroy", ["t", "domid", "unit"]), + ] + functions = { # ( name , [type1,type2,....] ) "device_vfb": [ ("add", ["t", "domid", "unit"]), ("clean_shutdown", ["domid", "unit"]), @@ -27,9 +32,7 @@ ], "device_console": [ ("add", ["t", "domid", "unit"]), ], - "device_disk": [ ("add", ["t", "domid", "unit"]), - ("del", ["t", "domid", "unit"]), - ], + "device_disk": DEVICE_FUNCTIONS, "device_nic": [ ("add", ["t", "domid", "unit"]), ("del", ["t", "domid", "unit"]), ], diff -r ae1e145bdac0 -r 7357a4c2c011 tools/ocaml/libs/xl/xenlight_stubs.c --- a/tools/ocaml/libs/xl/xenlight_stubs.c Tue Oct 18 13:36:42 2011 +0100 +++ b/tools/ocaml/libs/xl/xenlight_stubs.c Tue Oct 18 13:36:42 2011 +0100 @@ -247,7 +247,7 @@ device_disk_val(&gc, &lg, &c_info, info); INIT_CTX(); - ret = libxl_device_disk_del(ctx, Int_val(domid), &c_info, 0); + ret = libxl_device_disk_remove(ctx, Int_val(domid), &c_info); if (ret != 0) failwith_xl("disk_del", &lg); FREE_CTX(); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Tue Nov 01 16:58:18 2011 Return-path: Envelope-to: www-data@lists.xensource.com Delivery-date: Tue, 01 Nov 2011 16:58:18 -0700 Received: from localhost ([127.0.0.1] helo=lists.colo.xensource.com) by lists.xensource.com with esmtp (Exim 4.43) id 1RLODh-0001aE-Oz; Tue, 01 Nov 2011 16:58:17 -0700 Received: from mail216.messagelabs.com ([85.158.143.99]) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOAt-0000S5-1V for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 16:55:23 -0700 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-216.messagelabs.com!1320191719!1935504!1 X-Originating-IP: [93.93.131.152] X-StarScan-Version: 6.4.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6457 invoked from network); 1 Nov 2011 23:55:20 -0000 Received: from xenbits.xen.org (HELO xenbits.xen.org) (93.93.131.152) by server-3.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2011 23:55:20 -0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RLOAp-0007dV-Ka for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 23:55:19 +0000 Message-Id: Date: Tue, 01 Nov 2011 23:55:19 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: convert NIC handling to device API X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.5 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1318941402 -3600 # Node ID 11ae241660f62c85dba0d6f7d8f85197f748e47a # Parent 7357a4c2c0113afb971a074f4b21b5c67eb5140b libxl: convert NIC handling to device API Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 7357a4c2c011 -r 11ae241660f6 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Tue Oct 18 13:36:42 2011 +0100 +++ b/tools/libxl/libxl.c Tue Oct 18 13:36:42 2011 +0100 @@ -1187,32 +1187,46 @@ } /******************************************************************************/ -int libxl_device_nic_init(libxl_device_nic *nic_info, int devnum) +int libxl_device_nic_init(libxl_ctx *ctx, libxl_device_nic *nic) { const uint8_t *r; libxl_uuid uuid; libxl_uuid_generate(&uuid); r = libxl_uuid_bytearray(&uuid); - memset(nic_info, '\0', sizeof(*nic_info)); - - nic_info->backend_domid = 0; - nic_info->devid = devnum; - nic_info->mtu = 1492; - nic_info->model = strdup("rtl8139"); - nic_info->mac[0] = 0x00; - nic_info->mac[1] = 0x16; - nic_info->mac[2] = 0x3e; - nic_info->mac[3] = r[0] & 0x7f; - nic_info->mac[4] = r[1]; - nic_info->mac[5] = r[2]; - nic_info->ifname = NULL; - nic_info->bridge = strdup("xenbr0"); - nic_info->ip = NULL; - if ( asprintf(&nic_info->script, "%s/vif-bridge", + memset(nic, '\0', sizeof(*nic)); + + nic->backend_domid = 0; + nic->devid = -1; + nic->mtu = 1492; + nic->model = strdup("rtl8139"); + nic->mac[0] = 0x00; + nic->mac[1] = 0x16; + nic->mac[2] = 0x3e; + nic->mac[3] = r[0] & 0x7f; + nic->mac[4] = r[1]; + nic->mac[5] = r[2]; + nic->ifname = NULL; + nic->bridge = strdup("xenbr0"); + nic->ip = NULL; + if ( asprintf(&nic->script, "%s/vif-bridge", libxl_xen_script_dir_path()) < 0 ) return ERROR_FAIL; - nic_info->nictype = LIBXL_NIC_TYPE_IOEMU; + nic->nictype = LIBXL_NIC_TYPE_IOEMU; + return 0; +} + +static int libxl__device_from_nic(libxl__gc *gc, uint32_t domid, + libxl_device_nic *nic, + libxl__device *device) +{ + device->backend_devid = nic->devid; + device->backend_domid = nic->backend_domid; + device->backend_kind = LIBXL__DEVICE_KIND_VIF; + device->devid = nic->devid; + device->domid = domid; + device->kind = LIBXL__DEVICE_KIND_VIF; + return 0; } @@ -1249,12 +1263,8 @@ } } - device.backend_devid = nic->devid; - device.backend_domid = nic->backend_domid; - device.backend_kind = LIBXL__DEVICE_KIND_VIF; - device.devid = nic->devid; - device.domid = domid; - device.kind = LIBXL__DEVICE_KIND_VIF; + rc = libxl__device_from_nic(&gc, domid, nic, &device); + if ( rc != 0 ) goto out_free; flexarray_append(back, "frontend-id"); flexarray_append(back, libxl__sprintf(&gc, "%d", domid)); @@ -1305,29 +1315,37 @@ return rc; } -int libxl_device_nic_del(libxl_ctx *ctx, uint32_t domid, - libxl_device_nic *nic, int wait) +int libxl_device_nic_remove(libxl_ctx *ctx, uint32_t domid, + libxl_device_nic *nic) { libxl__gc gc = LIBXL_INIT_GC(ctx); libxl__device device; int rc; - device.backend_devid = nic->devid; - device.backend_domid = nic->backend_domid; - device.backend_kind = LIBXL__DEVICE_KIND_VIF; - device.devid = nic->devid; - device.domid = domid; - device.kind = LIBXL__DEVICE_KIND_VIF; - - if (wait) - rc = libxl__device_remove(&gc, &device, wait); - else - rc = libxl__device_destroy(&gc, &device); - + rc = libxl__device_from_nic(&gc, domid, nic, &device); + if (rc != 0) goto out; + + rc = libxl__device_remove(&gc, &device, 1); +out: libxl__free_all(&gc); return rc; } +int libxl_device_nic_destroy(libxl_ctx *ctx, uint32_t domid, + libxl_device_nic *nic) +{ + libxl__gc gc = LIBXL_INIT_GC(ctx); + libxl__device device; + int rc; + + rc = libxl__device_from_nic(&gc, domid, nic, &device); + if (rc != 0) goto out; + + rc = libxl__device_destroy(&gc, &device); +out: + libxl__free_all(&gc); + return rc; +} static void libxl__device_nic_from_xs_be(libxl__gc *gc, const char *be_path, libxl_device_nic *nic) diff -r 7357a4c2c011 -r 11ae241660f6 tools/libxl/libxl.h --- a/tools/libxl/libxl.h Tue Oct 18 13:36:42 2011 +0100 +++ b/tools/libxl/libxl.h Tue Oct 18 13:36:42 2011 +0100 @@ -463,9 +463,12 @@ char * libxl_device_disk_local_attach(libxl_ctx *ctx, libxl_device_disk *disk); int libxl_device_disk_local_detach(libxl_ctx *ctx, libxl_device_disk *disk); -int libxl_device_nic_init(libxl_device_nic *nic, int dev_num); +/* Network Interfaces */ +int libxl_device_nic_init(libxl_ctx *ctx, libxl_device_nic *nic); int libxl_device_nic_add(libxl_ctx *ctx, uint32_t domid, libxl_device_nic *nic); -int libxl_device_nic_del(libxl_ctx *ctx, uint32_t domid, libxl_device_nic *nic, int wait); +int libxl_device_nic_remove(libxl_ctx *ctx, uint32_t domid, libxl_device_nic *nic); +int libxl_device_nic_destroy(libxl_ctx *ctx, uint32_t domid, libxl_device_nic *nic); + libxl_device_nic *libxl_device_nic_list(libxl_ctx *ctx, uint32_t domid, int *num); int libxl_device_nic_getinfo(libxl_ctx *ctx, uint32_t domid, libxl_device_nic *nic, libxl_nicinfo *nicinfo); diff -r 7357a4c2c011 -r 11ae241660f6 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Tue Oct 18 13:36:42 2011 +0100 +++ b/tools/libxl/xl_cmdimpl.c Tue Oct 18 13:36:42 2011 +0100 @@ -762,7 +762,8 @@ d_config->vifs = (libxl_device_nic *) realloc(d_config->vifs, sizeof (libxl_device_nic) * (d_config->num_vifs+1)); nic = d_config->vifs + d_config->num_vifs; - CHK_ERRNO( libxl_device_nic_init(nic, d_config->num_vifs) ); + CHK_ERRNO( libxl_device_nic_init(ctx, nic) ); + nic->devid = d_config->num_vifs; if (default_vifscript) { free(nic->script); @@ -3972,7 +3973,7 @@ fprintf(stderr, "%s is an invalid domain identifier\n", argv[optind]); return 1; } - libxl_device_nic_init(&nic, -1); + libxl_device_nic_init(ctx, &nic); for (argv += optind+1, argc -= optind+1; argc > 0; ++argv, --argc) { if (MATCH_OPTION("type", *argv, oparg)) { if (!strcmp("vif", oparg)) { @@ -4089,7 +4090,7 @@ return 1; } } - if (libxl_device_nic_del(ctx, domid, &nic, 1)) { + if (libxl_device_nic_remove(ctx, domid, &nic)) { fprintf(stderr, "libxl_device_nic_del failed.\n"); return 1; } diff -r 7357a4c2c011 -r 11ae241660f6 tools/ocaml/libs/xl/genwrap.py --- a/tools/ocaml/libs/xl/genwrap.py Tue Oct 18 13:36:42 2011 +0100 +++ b/tools/ocaml/libs/xl/genwrap.py Tue Oct 18 13:36:42 2011 +0100 @@ -33,9 +33,7 @@ "device_console": [ ("add", ["t", "domid", "unit"]), ], "device_disk": DEVICE_FUNCTIONS, - "device_nic": [ ("add", ["t", "domid", "unit"]), - ("del", ["t", "domid", "unit"]), - ], + "device_nic": DEVICE_FUNCTIONS, "device_pci": [ ("add", ["t", "domid", "unit"]), ("remove", ["t", "domid", "unit"]), ("shutdown", ["domid", "unit"]), diff -r 7357a4c2c011 -r 11ae241660f6 tools/ocaml/libs/xl/xenlight_stubs.c --- a/tools/ocaml/libs/xl/xenlight_stubs.c Tue Oct 18 13:36:42 2011 +0100 +++ b/tools/ocaml/libs/xl/xenlight_stubs.c Tue Oct 18 13:36:42 2011 +0100 @@ -281,7 +281,7 @@ device_nic_val(&gc, &lg, &c_info, info); INIT_CTX(); - ret = libxl_device_nic_del(ctx, Int_val(domid), &c_info, 0); + ret = libxl_device_nic_remove(ctx, Int_val(domid), &c_info); if (ret != 0) failwith_xl("nic_del", &lg); FREE_CTX(); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Tue Nov 01 16:58:40 2011 Return-path: Envelope-to: www-data@lists.xensource.com Delivery-date: Tue, 01 Nov 2011 16:58:40 -0700 Received: from localhost ([127.0.0.1] helo=lists.colo.xensource.com) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOE3-0001di-IE; Tue, 01 Nov 2011 16:58:39 -0700 Received: from mail182.messagelabs.com ([85.158.139.83]) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOAt-0000S9-JD for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 16:55:23 -0700 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-182.messagelabs.com!1320191720!1591314!1 X-Originating-IP: [93.93.131.152] X-StarScan-Version: 6.4.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16719 invoked from network); 1 Nov 2011 23:55:20 -0000 Received: from xenbits.xen.org (HELO xenbits.xen.org) (93.93.131.152) by server-3.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2011 23:55:20 -0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RLOAq-0007dk-58 for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 23:55:20 +0000 Message-Id: Date: Tue, 01 Nov 2011 23:55:19 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: remove libxl_device_console_add. X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.5 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1318941403 -3600 # Node ID 97a2a4c27d2335b9be435f982025d2a9562b9b89 # Parent 11ae241660f62c85dba0d6f7d8f85197f748e47a libxl: remove libxl_device_console_add. It has no callers, the only code which adds consoles in internal to libxl and uses libxl__device_console_add directly. Rather than worrying about what the public API should look like in this case simply remove it, adding new APIs is much easier than fixing broken ones... Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 11ae241660f6 -r 97a2a4c27d23 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Tue Oct 18 13:36:42 2011 +0100 +++ b/tools/libxl/libxl.c Tue Oct 18 13:36:43 2011 +0100 @@ -1585,18 +1585,6 @@ return rc; } -int libxl_device_console_add(libxl_ctx *ctx, uint32_t domid, - libxl_device_console *console) -{ - libxl__gc gc = LIBXL_INIT_GC(ctx); - int rc = ERROR_INVAL; - - rc = libxl__device_console_add(&gc, domid, console, NULL); - - libxl__free_all(&gc); - return rc; -} - /******************************************************************************/ void libxl_device_vkb_init(libxl_device_vkb *vkb, int dev_num) { diff -r 11ae241660f6 -r 97a2a4c27d23 tools/libxl/libxl.h --- a/tools/libxl/libxl.h Tue Oct 18 13:36:42 2011 +0100 +++ b/tools/libxl/libxl.h Tue Oct 18 13:36:43 2011 +0100 @@ -473,8 +473,6 @@ int libxl_device_nic_getinfo(libxl_ctx *ctx, uint32_t domid, libxl_device_nic *nic, libxl_nicinfo *nicinfo); -int libxl_device_console_add(libxl_ctx *ctx, uint32_t domid, libxl_device_console *console); - void libxl_device_vkb_init(libxl_device_vkb *vkb, int dev_num); int libxl_device_vkb_add(libxl_ctx *ctx, uint32_t domid, libxl_device_vkb *vkb); int libxl_device_vkb_clean_shutdown(libxl_ctx *ctx, uint32_t domid); diff -r 11ae241660f6 -r 97a2a4c27d23 tools/ocaml/libs/xl/genwrap.py --- a/tools/ocaml/libs/xl/genwrap.py Tue Oct 18 13:36:42 2011 +0100 +++ b/tools/ocaml/libs/xl/genwrap.py Tue Oct 18 13:36:43 2011 +0100 @@ -30,8 +30,6 @@ ("clean_shutdown", ["domid", "unit"]), ("hard_shutdown", ["domid", "unit"]), ], - "device_console": [ ("add", ["t", "domid", "unit"]), - ], "device_disk": DEVICE_FUNCTIONS, "device_nic": DEVICE_FUNCTIONS, "device_pci": [ ("add", ["t", "domid", "unit"]), diff -r 11ae241660f6 -r 97a2a4c27d23 tools/ocaml/libs/xl/xenlight_stubs.c --- a/tools/ocaml/libs/xl/xenlight_stubs.c Tue Oct 18 13:36:42 2011 +0100 +++ b/tools/ocaml/libs/xl/xenlight_stubs.c Tue Oct 18 13:36:43 2011 +0100 @@ -288,23 +288,6 @@ CAMLreturn(Val_unit); } -value stub_xl_device_console_add(value info, value domid) -{ - CAMLparam2(info, domid); - libxl_device_console c_info; - int ret; - INIT_STRUCT(); - - device_console_val(&gc, &lg, &c_info, info); - - INIT_CTX(); - ret = libxl_device_console_add(ctx, Int_val(domid), &c_info); - if (ret != 0) - failwith_xl("console_add", &lg); - FREE_CTX(); - CAMLreturn(Val_unit); -} - value stub_xl_device_vkb_add(value info, value domid) { CAMLparam2(info, domid); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Tue Nov 01 16:59:15 2011 Return-path: Envelope-to: www-data@lists.xensource.com Delivery-date: Tue, 01 Nov 2011 16:59:15 -0700 Received: from localhost ([127.0.0.1] helo=lists.colo.xensource.com) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOEc-0001i1-0d; Tue, 01 Nov 2011 16:59:14 -0700 Received: from mail182.messagelabs.com ([85.158.139.83]) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOAu-0000SM-4e for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 16:55:24 -0700 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-182.messagelabs.com!1320191720!1582808!1 X-Originating-IP: [93.93.131.152] X-StarScan-Version: 6.4.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13988 invoked from network); 1 Nov 2011 23:55:21 -0000 Received: from xenbits.xen.org (HELO xenbits.xen.org) (93.93.131.152) by server-11.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2011 23:55:21 -0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RLOAq-0007e4-MR for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 23:55:20 +0000 Message-Id: Date: Tue, 01 Nov 2011 23:55:20 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: convert VKB handling to device API X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.5 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1318941403 -3600 # Node ID 175b7e156bcb64aa22f7461659a2f9058687799e # Parent 97a2a4c27d2335b9be435f982025d2a9562b9b89 libxl: convert VKB handling to device API Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 97a2a4c27d23 -r 175b7e156bcb tools/libxl/libxl.c --- a/tools/libxl/libxl.c Tue Oct 18 13:36:43 2011 +0100 +++ b/tools/libxl/libxl.c Tue Oct 18 13:36:43 2011 +0100 @@ -1586,10 +1586,24 @@ } /******************************************************************************/ -void libxl_device_vkb_init(libxl_device_vkb *vkb, int dev_num) +int libxl_device_vkb_init(libxl_ctx *ctx, libxl_device_vkb *vkb) { memset(vkb, 0x00, sizeof(libxl_device_vkb)); - vkb->devid = dev_num; + return 0; +} + +static int libxl__device_from_vkb(libxl__gc *gc, uint32_t domid, + libxl_device_vkb *vkb, + libxl__device *device) +{ + device->backend_devid = vkb->devid; + device->backend_domid = vkb->backend_domid; + device->backend_kind = LIBXL__DEVICE_KIND_VKBD; + device->devid = vkb->devid; + device->domid = domid; + device->kind = LIBXL__DEVICE_KIND_VKBD; + + return 0; } int libxl_device_vkb_add(libxl_ctx *ctx, uint32_t domid, libxl_device_vkb *vkb) @@ -1611,12 +1625,8 @@ goto out_free; } - device.backend_devid = vkb->devid; - device.backend_domid = vkb->backend_domid; - device.backend_kind = LIBXL__DEVICE_KIND_VKBD; - device.devid = vkb->devid; - device.domid = domid; - device.kind = LIBXL__DEVICE_KIND_VKBD; + rc = libxl__device_from_vkb(&gc, domid, vkb, &device); + if (rc != 0) goto out_free; flexarray_append(back, "frontend-id"); flexarray_append(back, libxl__sprintf(&gc, "%d", domid)); @@ -1644,14 +1654,36 @@ return rc; } -int libxl_device_vkb_clean_shutdown(libxl_ctx *ctx, uint32_t domid) +int libxl_device_vkb_remove(libxl_ctx *ctx, uint32_t domid, + libxl_device_vkb *vkb) { - return ERROR_NI; + libxl__gc gc = LIBXL_INIT_GC(ctx); + libxl__device device; + int rc; + + rc = libxl__device_from_vkb(&gc, domid, vkb, &device); + if (rc != 0) goto out; + + rc = libxl__device_remove(&gc, &device, 1); +out: + libxl__free_all(&gc); + return rc; } -int libxl_device_vkb_hard_shutdown(libxl_ctx *ctx, uint32_t domid) +int libxl_device_vkb_destroy(libxl_ctx *ctx, uint32_t domid, + libxl_device_vkb *vkb) { - return ERROR_NI; + libxl__gc gc = LIBXL_INIT_GC(ctx); + libxl__device device; + int rc; + + rc = libxl__device_from_vkb(&gc, domid, vkb, &device); + if (rc != 0) goto out; + + rc = libxl__device_destroy(&gc, &device); +out: + libxl__free_all(&gc); + return rc; } static void libxl__device_disk_from_xs_be(libxl__gc *gc, @@ -1939,16 +1971,6 @@ return rc; } -int libxl_device_vfb_clean_shutdown(libxl_ctx *ctx, uint32_t domid) -{ - return ERROR_NI; -} - -int libxl_device_vfb_hard_shutdown(libxl_ctx *ctx, uint32_t domid) -{ - return ERROR_NI; -} - /******************************************************************************/ int libxl_domain_setmaxmem(libxl_ctx *ctx, uint32_t domid, uint32_t max_memkb) diff -r 97a2a4c27d23 -r 175b7e156bcb tools/libxl/libxl.h --- a/tools/libxl/libxl.h Tue Oct 18 13:36:43 2011 +0100 +++ b/tools/libxl/libxl.h Tue Oct 18 13:36:43 2011 +0100 @@ -473,10 +473,11 @@ int libxl_device_nic_getinfo(libxl_ctx *ctx, uint32_t domid, libxl_device_nic *nic, libxl_nicinfo *nicinfo); -void libxl_device_vkb_init(libxl_device_vkb *vkb, int dev_num); +/* Keyboard */ +int libxl_device_vkb_init(libxl_ctx *ctx, libxl_device_vkb *vkb); int libxl_device_vkb_add(libxl_ctx *ctx, uint32_t domid, libxl_device_vkb *vkb); -int libxl_device_vkb_clean_shutdown(libxl_ctx *ctx, uint32_t domid); -int libxl_device_vkb_hard_shutdown(libxl_ctx *ctx, uint32_t domid); +int libxl_device_vkb_remove(libxl_ctx *ctx, uint32_t domid, libxl_device_vkb *vkb); +int libxl_device_vkb_destroy(libxl_ctx *ctx, uint32_t domid, libxl_device_vkb *vkb); void libxl_device_vfb_init(libxl_device_vfb *vfb, int dev_num); int libxl_device_vfb_add(libxl_ctx *ctx, uint32_t domid, libxl_device_vfb *vfb); diff -r 97a2a4c27d23 -r 175b7e156bcb tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Tue Oct 18 13:36:43 2011 +0100 +++ b/tools/libxl/xl_cmdimpl.c Tue Oct 18 13:36:43 2011 +0100 @@ -857,7 +857,8 @@ d_config->vkbs = (libxl_device_vkb *) realloc(d_config->vkbs, sizeof(libxl_device_vkb) * (d_config->num_vkbs + 1)); vkb = d_config->vkbs + d_config->num_vkbs; - libxl_device_vkb_init(vkb, d_config->num_vkbs); + libxl_device_vkb_init(ctx, vkb); + vkb->devid = d_config->num_vkbs; p = strtok(buf2, ","); if (!p) diff -r 97a2a4c27d23 -r 175b7e156bcb tools/ocaml/libs/xl/genwrap.py --- a/tools/ocaml/libs/xl/genwrap.py Tue Oct 18 13:36:43 2011 +0100 +++ b/tools/ocaml/libs/xl/genwrap.py Tue Oct 18 13:36:43 2011 +0100 @@ -26,10 +26,7 @@ ("clean_shutdown", ["domid", "unit"]), ("hard_shutdown", ["domid", "unit"]), ], - "device_vkb": [ ("add", ["t", "domid", "unit"]), - ("clean_shutdown", ["domid", "unit"]), - ("hard_shutdown", ["domid", "unit"]), - ], + "device_vkb": DEVICE_FUNCTIONS, "device_disk": DEVICE_FUNCTIONS, "device_nic": DEVICE_FUNCTIONS, "device_pci": [ ("add", ["t", "domid", "unit"]), diff -r 97a2a4c27d23 -r 175b7e156bcb tools/ocaml/libs/xl/xenlight_stubs.c --- a/tools/ocaml/libs/xl/xenlight_stubs.c Tue Oct 18 13:36:43 2011 +0100 +++ b/tools/ocaml/libs/xl/xenlight_stubs.c Tue Oct 18 13:36:43 2011 +0100 @@ -306,14 +306,17 @@ CAMLreturn(Val_unit); } -value stub_xl_device_vkb_clean_shutdown(value domid) +value stub_xl_device_vkb_remove(value info, value domid) { CAMLparam1(domid); + libxl_device_vkb c_info; int ret; INIT_STRUCT(); + device_vkb_val(&gc, &lg, &c_info, info); + INIT_CTX(); - ret = libxl_device_vkb_clean_shutdown(ctx, Int_val(domid)); + ret = libxl_device_vkb_remove(ctx, Int_val(domid), &c_info); if (ret != 0) failwith_xl("vkb_clean_shutdown", &lg); FREE_CTX(); @@ -321,14 +324,17 @@ CAMLreturn(Val_unit); } -value stub_xl_device_vkb_hard_shutdown(value domid) +value stub_xl_device_vkb_destroy(value info, value domid) { CAMLparam1(domid); + libxl_device_vkb c_info; int ret; INIT_STRUCT(); + device_vkb_val(&gc, &lg, &c_info, info); + INIT_CTX(); - ret = libxl_device_vkb_hard_shutdown(ctx, Int_val(domid)); + ret = libxl_device_vkb_destroy(ctx, Int_val(domid), &c_info); if (ret != 0) failwith_xl("vkb_hard_shutdown", &lg); FREE_CTX(); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Tue Nov 01 16:59:39 2011 Return-path: Envelope-to: www-data@lists.xensource.com Delivery-date: Tue, 01 Nov 2011 16:59:39 -0700 Received: from localhost ([127.0.0.1] helo=lists.colo.xensource.com) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOF0-0001lE-UJ; Tue, 01 Nov 2011 16:59:39 -0700 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOAu-0000SW-9j for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 16:55:24 -0700 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-27.messagelabs.com!1320191686!55176032!1 X-Originating-IP: [93.93.131.152] X-StarScan-Version: 6.4.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16332 invoked from network); 1 Nov 2011 23:54:46 -0000 Received: from xenbits.xen.org (HELO xenbits.xen.org) (93.93.131.152) by server-7.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2011 23:54:46 -0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RLOAr-0007eM-7n for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 23:55:21 +0000 Message-Id: Date: Tue, 01 Nov 2011 23:55:20 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: convert VFB handling to device API X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.5 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1318941403 -3600 # Node ID 7919aa4b483541ec4a2dc4ed98ab6f82f2d2d494 # Parent 175b7e156bcb64aa22f7461659a2f9058687799e libxl: convert VFB handling to device API Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 175b7e156bcb -r 7919aa4b4835 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Tue Oct 18 13:36:43 2011 +0100 +++ b/tools/libxl/libxl.c Tue Oct 18 13:36:43 2011 +0100 @@ -1896,10 +1896,9 @@ } /******************************************************************************/ -void libxl_device_vfb_init(libxl_device_vfb *vfb, int dev_num) +int libxl_device_vfb_init(libxl_ctx *ctx, libxl_device_vfb *vfb) { memset(vfb, 0x00, sizeof(libxl_device_vfb)); - vfb->devid = dev_num; vfb->display = NULL; vfb->xauthority = NULL; vfb->vnc = 1; @@ -1910,6 +1909,20 @@ vfb->keymap = NULL; vfb->sdl = 0; vfb->opengl = 0; + return 0; +} + +static int libxl__device_from_vfb(libxl__gc *gc, uint32_t domid, + libxl_device_vfb *vfb, + libxl__device *device) +{ + device->backend_devid = vfb->devid; + device->backend_domid = vfb->backend_domid; + device->backend_kind = LIBXL__DEVICE_KIND_VFB; + device->devid = vfb->devid; + device->domid = domid; + device->kind = LIBXL__DEVICE_KIND_VFB; + return 0; } int libxl_device_vfb_add(libxl_ctx *ctx, uint32_t domid, libxl_device_vfb *vfb) @@ -1931,12 +1944,8 @@ goto out_free; } - device.backend_devid = vfb->devid; - device.backend_domid = vfb->backend_domid; - device.backend_kind = LIBXL__DEVICE_KIND_VFB; - device.devid = vfb->devid; - device.domid = domid; - device.kind = LIBXL__DEVICE_KIND_VFB; + rc = libxl__device_from_vfb(&gc, domid, vfb, &device); + if (rc != 0) goto out_free; flexarray_append_pair(back, "frontend-id", libxl__sprintf(&gc, "%d", domid)); flexarray_append_pair(back, "online", "1"); @@ -1971,6 +1980,38 @@ return rc; } +int libxl_device_vfb_remove(libxl_ctx *ctx, uint32_t domid, + libxl_device_vfb *vfb) +{ + libxl__gc gc = LIBXL_INIT_GC(ctx); + libxl__device device; + int rc; + + rc = libxl__device_from_vfb(&gc, domid, vfb, &device); + if (rc != 0) goto out; + + rc = libxl__device_remove(&gc, &device, 1); +out: + libxl__free_all(&gc); + return rc; +} + +int libxl_device_vfb_destroy(libxl_ctx *ctx, uint32_t domid, + libxl_device_vfb *vfb) +{ + libxl__gc gc = LIBXL_INIT_GC(ctx); + libxl__device device; + int rc; + + rc = libxl__device_from_vfb(&gc, domid, vfb, &device); + if (rc != 0) goto out; + + rc = libxl__device_destroy(&gc, &device); +out: + libxl__free_all(&gc); + return rc; +} + /******************************************************************************/ int libxl_domain_setmaxmem(libxl_ctx *ctx, uint32_t domid, uint32_t max_memkb) diff -r 175b7e156bcb -r 7919aa4b4835 tools/libxl/libxl.h --- a/tools/libxl/libxl.h Tue Oct 18 13:36:43 2011 +0100 +++ b/tools/libxl/libxl.h Tue Oct 18 13:36:43 2011 +0100 @@ -479,10 +479,11 @@ int libxl_device_vkb_remove(libxl_ctx *ctx, uint32_t domid, libxl_device_vkb *vkb); int libxl_device_vkb_destroy(libxl_ctx *ctx, uint32_t domid, libxl_device_vkb *vkb); -void libxl_device_vfb_init(libxl_device_vfb *vfb, int dev_num); +/* Framebuffer */ +int libxl_device_vfb_init(libxl_ctx *ctx, libxl_device_vfb *vfb); int libxl_device_vfb_add(libxl_ctx *ctx, uint32_t domid, libxl_device_vfb *vfb); -int libxl_device_vfb_clean_shutdown(libxl_ctx *ctx, uint32_t domid); -int libxl_device_vfb_hard_shutdown(libxl_ctx *ctx, uint32_t domid); +int libxl_device_vfb_remove(libxl_ctx *ctx, uint32_t domid, libxl_device_vfb *vfb); +int libxl_device_vfb_destroy(libxl_ctx *ctx, uint32_t domid, libxl_device_vfb *vfb); int libxl_device_pci_add(libxl_ctx *ctx, uint32_t domid, libxl_device_pci *pcidev); int libxl_device_pci_remove(libxl_ctx *ctx, uint32_t domid, libxl_device_pci *pcidev, int force); diff -r 175b7e156bcb -r 7919aa4b4835 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Tue Oct 18 13:36:43 2011 +0100 +++ b/tools/libxl/xl_cmdimpl.c Tue Oct 18 13:36:43 2011 +0100 @@ -853,7 +853,8 @@ d_config->vfbs = (libxl_device_vfb *) realloc(d_config->vfbs, sizeof(libxl_device_vfb) * (d_config->num_vfbs + 1)); vfb = d_config->vfbs + d_config->num_vfbs; - libxl_device_vfb_init(vfb, d_config->num_vfbs); + libxl_device_vfb_init(ctx, vfb); + vfb->devid = d_config->num_vfbs; d_config->vkbs = (libxl_device_vkb *) realloc(d_config->vkbs, sizeof(libxl_device_vkb) * (d_config->num_vkbs + 1)); vkb = d_config->vkbs + d_config->num_vkbs; diff -r 175b7e156bcb -r 7919aa4b4835 tools/ocaml/libs/xl/genwrap.py --- a/tools/ocaml/libs/xl/genwrap.py Tue Oct 18 13:36:43 2011 +0100 +++ b/tools/ocaml/libs/xl/genwrap.py Tue Oct 18 13:36:43 2011 +0100 @@ -22,10 +22,7 @@ ] functions = { # ( name , [type1,type2,....] ) - "device_vfb": [ ("add", ["t", "domid", "unit"]), - ("clean_shutdown", ["domid", "unit"]), - ("hard_shutdown", ["domid", "unit"]), - ], + "device_vfb": DEVICE_FUNCTIONS, "device_vkb": DEVICE_FUNCTIONS, "device_disk": DEVICE_FUNCTIONS, "device_nic": DEVICE_FUNCTIONS, diff -r 175b7e156bcb -r 7919aa4b4835 tools/ocaml/libs/xl/xenlight_stubs.c --- a/tools/ocaml/libs/xl/xenlight_stubs.c Tue Oct 18 13:36:43 2011 +0100 +++ b/tools/ocaml/libs/xl/xenlight_stubs.c Tue Oct 18 13:36:43 2011 +0100 @@ -360,14 +360,17 @@ CAMLreturn(Val_unit); } -value stub_xl_device_vfb_clean_shutdown(value domid) +value stub_xl_device_vfb_remove(value info, value domid) { CAMLparam1(domid); + libxl_device_vfb c_info; int ret; INIT_STRUCT(); + device_vfb_val(&gc, &lg, &c_info, info); + INIT_CTX(); - ret = libxl_device_vfb_clean_shutdown(ctx, Int_val(domid)); + ret = libxl_device_vfb_remove(ctx, Int_val(domid), &c_info); if (ret != 0) failwith_xl("vfb_clean_shutdown", &lg); FREE_CTX(); @@ -375,14 +378,17 @@ CAMLreturn(Val_unit); } -value stub_xl_device_vfb_hard_shutdown(value domid) +value stub_xl_device_vfb_destroy(value info, value domid) { CAMLparam1(domid); + libxl_device_vfb c_info; int ret; INIT_STRUCT(); + device_vfb_val(&gc, &lg, &c_info, info); + INIT_CTX(); - ret = libxl_device_vfb_hard_shutdown(ctx, Int_val(domid)); + ret = libxl_device_vfb_destroy(ctx, Int_val(domid), &c_info); if (ret != 0) failwith_xl("vfb_hard_shutdown", &lg); FREE_CTX(); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Tue Nov 01 17:00:24 2011 Return-path: Envelope-to: www-data@lists.xensource.com Delivery-date: Tue, 01 Nov 2011 17:00:24 -0700 Received: from localhost ([127.0.0.1] helo=lists.colo.xensource.com) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOFj-0001px-MR; Tue, 01 Nov 2011 17:00:23 -0700 Received: from mail21.messagelabs.com ([85.158.143.35]) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOAw-0000T9-8v for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 16:55:26 -0700 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-21.messagelabs.com!1320191723!995804!1 X-Originating-IP: [93.93.131.152] X-StarScan-Version: 6.4.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8960 invoked from network); 1 Nov 2011 23:55:23 -0000 Received: from xenbits.xen.org (HELO xenbits.xen.org) (93.93.131.152) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2011 23:55:23 -0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RLOAs-0007f5-Rw for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 23:55:22 +0000 Message-Id: Date: Tue, 01 Nov 2011 23:55:22 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: add a flags argument to libxl_ctx_alloc. X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.5 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1318941403 -3600 # Node ID f60911281a1bb1e77ef257be629065102be21a80 # Parent 2866d4f9109c4722fceb61b0b05196b30122bec3 libxl: add a flags argument to libxl_ctx_alloc. Currently unused but gives us scope for expansion in an ABI compatible manner in the future. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 2866d4f9109c -r f60911281a1b tools/libxl/gentest.py --- a/tools/libxl/gentest.py Tue Oct 18 13:36:43 2011 +0100 +++ b/tools/libxl/gentest.py Tue Oct 18 13:36:43 2011 +0100 @@ -239,7 +239,7 @@ logger = xtl_createlogger_stdiostream(stderr, XTL_DETAIL, 0); if (!logger) exit(1); - if (libxl_ctx_alloc(&ctx, LIBXL_VERSION, (xentoollog_logger*)logger)) { + if (libxl_ctx_alloc(&ctx, LIBXL_VERSION, 0, (xentoollog_logger*)logger)) { fprintf(stderr, "cannot init xl context\\n"); exit(1); } diff -r 2866d4f9109c -r f60911281a1b tools/libxl/libxl.c --- a/tools/libxl/libxl.c Tue Oct 18 13:36:43 2011 +0100 +++ b/tools/libxl/libxl.c Tue Oct 18 13:36:43 2011 +0100 @@ -39,7 +39,8 @@ #define PAGE_TO_MEMKB(pages) ((pages) * 4) #define BACKEND_STRING_SIZE 5 -int libxl_ctx_alloc(libxl_ctx **pctx, int version, xentoollog_logger * lg) +int libxl_ctx_alloc(libxl_ctx **pctx, int version, + unsigned flags, xentoollog_logger * lg) { libxl_ctx *ctx; struct stat stat_buf; diff -r 2866d4f9109c -r f60911281a1b tools/libxl/libxl.h --- a/tools/libxl/libxl.h Tue Oct 18 13:36:43 2011 +0100 +++ b/tools/libxl/libxl.h Tue Oct 18 13:36:43 2011 +0100 @@ -245,7 +245,9 @@ } libxl_domain_config; /* context functions */ -int libxl_ctx_alloc(libxl_ctx **pctx, int version, xentoollog_logger *lg); +int libxl_ctx_alloc(libxl_ctx **pctx, int version, + unsigned flags /* none currently defined */, + xentoollog_logger *lg); int libxl_ctx_free(libxl_ctx *ctx /* 0 is OK */); int libxl_ctx_postfork(libxl_ctx *ctx); diff -r 2866d4f9109c -r f60911281a1b tools/libxl/xl.c --- a/tools/libxl/xl.c Tue Oct 18 13:36:43 2011 +0100 +++ b/tools/libxl/xl.c Tue Oct 18 13:36:43 2011 +0100 @@ -116,7 +116,7 @@ logger = xtl_createlogger_stdiostream(stderr, minmsglevel, 0); if (!logger) exit(1); - if (libxl_ctx_alloc(&ctx, LIBXL_VERSION, (xentoollog_logger*)logger)) { + if (libxl_ctx_alloc(&ctx, LIBXL_VERSION, 0, (xentoollog_logger*)logger)) { fprintf(stderr, "cannot init xl context\n"); exit(1); } diff -r 2866d4f9109c -r f60911281a1b tools/ocaml/libs/xl/xenlight_stubs.c --- a/tools/ocaml/libs/xl/xenlight_stubs.c Tue Oct 18 13:36:43 2011 +0100 +++ b/tools/ocaml/libs/xl/xenlight_stubs.c Tue Oct 18 13:36:43 2011 +0100 @@ -59,7 +59,7 @@ lg.logger.destroy = log_destroy; \ lg.logger.progress = NULL; \ caml_enter_blocking_section(); \ - ret = libxl_ctx_alloc(&ctx, LIBXL_VERSION, (struct xentoollog_logger *) &lg); \ + ret = libxl_ctx_alloc(&ctx, LIBXL_VERSION, 0, (struct xentoollog_logger *) &lg); \ if (ret != 0) \ failwith_xl("cannot init context", &lg); diff -r 2866d4f9109c -r f60911281a1b tools/python/xen/lowlevel/xl/xl.c --- a/tools/python/xen/lowlevel/xl/xl.c Tue Oct 18 13:36:43 2011 +0100 +++ b/tools/python/xen/lowlevel/xl/xl.c Tue Oct 18 13:36:43 2011 +0100 @@ -687,7 +687,7 @@ return -1; } - if ( libxl_ctx_alloc(&self->ctx, LIBXL_VERSION, + if ( libxl_ctx_alloc(&self->ctx, LIBXL_VERSION, 0, (xentoollog_logger*)self->logger) ) { PyErr_SetString(xl_error_obj, "cannot init xl context"); return -1; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Tue Nov 01 17:01:04 2011 Return-path: Envelope-to: www-data@lists.xensource.com Delivery-date: Tue, 01 Nov 2011 17:01:04 -0700 Received: from localhost ([127.0.0.1] helo=lists.colo.xensource.com) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOGL-0001tf-Tr; Tue, 01 Nov 2011 17:01:02 -0700 Received: from mail21.messagelabs.com ([85.158.143.35]) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOAv-0000T0-O3 for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 16:55:26 -0700 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-21.messagelabs.com!1320191722!2541884!1 X-Originating-IP: [93.93.131.152] X-StarScan-Version: 6.4.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3092 invoked from network); 1 Nov 2011 23:55:22 -0000 Received: from xenbits.xen.org (HELO xenbits.xen.org) (93.93.131.152) by server-14.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2011 23:55:22 -0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RLOAs-0007eq-9v for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 23:55:22 +0000 Message-Id: Date: Tue, 01 Nov 2011 23:55:21 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: convert PCI device handling to device API X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.5 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1318941403 -3600 # Node ID 2866d4f9109c4722fceb61b0b05196b30122bec3 # Parent e81e7774564702b3f403ea7f74af220265c98cf4 libxl: convert PCI device handling to device API Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r e81e77745647 -r 2866d4f9109c tools/libxl/libxl.c --- a/tools/libxl/libxl.c Tue Oct 18 13:36:43 2011 +0100 +++ b/tools/libxl/libxl.c Tue Oct 18 13:36:43 2011 +0100 @@ -754,7 +754,7 @@ goto out; } - if (libxl_device_pci_shutdown(ctx, domid) < 0) + if (libxl__device_pci_destroy_all(&gc, domid) < 0) LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "pci shutdown failed for domid %d", domid); rc = xc_domain_pause(ctx->xch, domid); if (rc < 0) { diff -r e81e77745647 -r 2866d4f9109c tools/libxl/libxl.h --- a/tools/libxl/libxl.h Tue Oct 18 13:36:43 2011 +0100 +++ b/tools/libxl/libxl.h Tue Oct 18 13:36:43 2011 +0100 @@ -485,12 +485,28 @@ int libxl_device_vfb_remove(libxl_ctx *ctx, uint32_t domid, libxl_device_vfb *vfb); int libxl_device_vfb_destroy(libxl_ctx *ctx, uint32_t domid, libxl_device_vfb *vfb); +/* PCI Passthrough */ +int libxl_device_pci_init(libxl_ctx *ctx, libxl_device_pci *pci); int libxl_device_pci_add(libxl_ctx *ctx, uint32_t domid, libxl_device_pci *pcidev); -int libxl_device_pci_remove(libxl_ctx *ctx, uint32_t domid, libxl_device_pci *pcidev, int force); -int libxl_device_pci_shutdown(libxl_ctx *ctx, uint32_t domid); -int libxl_device_pci_list_assigned(libxl_ctx *ctx, libxl_device_pci **list, uint32_t domid, int *num); -int libxl_device_pci_list_assignable(libxl_ctx *ctx, libxl_device_pci **list, int *num); -int libxl_device_pci_parse_bdf(libxl_ctx *ctx, libxl_device_pci *pcidev, const char *str); +int libxl_device_pci_remove(libxl_ctx *ctx, uint32_t domid, libxl_device_pci *pcidev); +int libxl_device_pci_destroy(libxl_ctx *ctx, uint32_t domid, libxl_device_pci *pcidev); +libxl_device_pci *libxl_device_pci_list(libxl_ctx *ctx, uint32_t domid, int *num); + +/* + * Parse a PCI BDF into a PCI device structure. + */ +int libxl_device_pci_parse_bdf(libxl_ctx *ctx, + libxl_device_pci *pcidev, + const char *str); + +/* + * Similar to libxl_device_pci_list but returns all devices which + * could be assigned to a domain (i.e. are bound to the backend + * driver) but are not currently. + */ +libxl_device_pci *libxl_device_pci_list_assignable(libxl_ctx *ctx, int *num); + +/* CPUID handling */ int libxl_cpuid_parse_config(libxl_cpuid_policy_list *cpuid, const char* str); int libxl_cpuid_parse_config_xend(libxl_cpuid_policy_list *cpuid, const char* str); diff -r e81e77745647 -r 2866d4f9109c tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Tue Oct 18 13:36:43 2011 +0100 +++ b/tools/libxl/libxl_internal.h Tue Oct 18 13:36:43 2011 +0100 @@ -252,6 +252,7 @@ _hidden int libxl__device_pci_add(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcidev, int starting); _hidden int libxl__create_pci_backend(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcidev, int num); +_hidden int libxl__device_pci_destroy_all(libxl__gc *gc, uint32_t domid); /* xl_exec */ diff -r e81e77745647 -r 2866d4f9109c tools/libxl/libxl_pci.c --- a/tools/libxl/libxl_pci.c Tue Oct 18 13:36:43 2011 +0100 +++ b/tools/libxl/libxl_pci.c Tue Oct 18 13:36:43 2011 +0100 @@ -486,7 +486,7 @@ return 0; } -int libxl_device_pci_list_assignable(libxl_ctx *ctx, libxl_device_pci **list, int *num) +libxl_device_pci *libxl_device_pci_list_assignable(libxl_ctx *ctx, int *num) { libxl__gc gc = LIBXL_INIT_GC(ctx); libxl_device_pci *pcidevs = NULL, *new, *assigned; @@ -495,13 +495,10 @@ int rc, num_assigned; *num = 0; - *list = NULL; rc = get_all_assigned_devices(&gc, &assigned, &num_assigned); - if ( rc ) { - libxl__free_all(&gc); - return rc; - } + if ( rc ) + goto out; dir = opendir(SYSFS_PCIBACK_DRIVER); if ( NULL == dir ) { @@ -510,8 +507,7 @@ }else{ LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Couldn't open %s", SYSFS_PCIBACK_DRIVER); } - libxl__free_all(&gc); - return ERROR_FAIL; + goto out_closedir; } while( (de = readdir(dir)) ) { @@ -534,10 +530,11 @@ (*num)++; } +out_closedir: closedir(dir); - *list = pcidevs; +out: libxl__free_all(&gc); - return 0; + return pcidevs; } /* @@ -846,21 +843,25 @@ int hvm = 0, rc, num; int stubdomid = 0; - if ( !libxl_device_pci_list_assigned(ctx, &assigned, domid, &num) ) { - if ( !is_assigned(assigned, num, pcidev->domain, - pcidev->bus, pcidev->dev, pcidev->func) ) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "PCI device not attached to this domain"); - return ERROR_INVAL; - } + assigned = libxl_device_pci_list(ctx, domid, &num); + if ( assigned == NULL ) + return ERROR_FAIL; + + rc = ERROR_INVAL; + if ( !is_assigned(assigned, num, pcidev->domain, + pcidev->bus, pcidev->dev, pcidev->func) ) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "PCI device not attached to this domain"); + goto out_fail; } + rc = ERROR_FAIL; switch (libxl__domain_type(gc, domid)) { case LIBXL_DOMAIN_TYPE_HVM: hvm = 1; if (libxl__wait_for_device_model(gc, domid, "running", - NULL, NULL, NULL) < 0) { - return ERROR_FAIL; - } + NULL, NULL, NULL) < 0) + goto out_fail; + path = libxl__sprintf(gc, "/local/domain/0/device-model/%d/state", domid); state = libxl__xs_read(gc, XBT_NULL, path); path = libxl__sprintf(gc, "/local/domain/0/device-model/%d/parameter", domid); @@ -879,7 +880,7 @@ * SCI, if it doesn't respond in time then we may wish to * force the removal. */ - return ERROR_FAIL; + goto out_fail; } } path = libxl__sprintf(gc, "/local/domain/0/device-model/%d/state", domid); @@ -955,25 +956,31 @@ stubdomid = libxl_get_stubdom_id(ctx, domid); if (stubdomid != 0) { libxl_device_pci pcidev_s = *pcidev; - libxl_device_pci_remove(ctx, stubdomid, &pcidev_s, force); + if (force) + libxl_device_pci_destroy(ctx, stubdomid, &pcidev_s); + else + libxl_device_pci_remove(ctx, stubdomid, &pcidev_s); } libxl__device_pci_remove_xenstore(gc, domid, pcidev); - return 0; + rc = 0; +out_fail: + free(assigned); + return rc; + } -int libxl_device_pci_remove(libxl_ctx *ctx, uint32_t domid, - libxl_device_pci *pcidev, int force) +static int libxl__device_pci_remove_common(libxl__gc *gc, uint32_t domid, + libxl_device_pci *pcidev, int force) { - libxl__gc gc = LIBXL_INIT_GC(ctx); unsigned int orig_vdev, pfunc_mask; int i, rc; orig_vdev = pcidev->vdevfn & ~7U; if ( pcidev->vfunc_mask == LIBXL_PCI_FUNC_ALL ) { - if ( pci_multifunction_check(&gc, pcidev, &pfunc_mask) ) { + if ( pci_multifunction_check(gc, pcidev, &pfunc_mask) ) { rc = ERROR_FAIL; goto out; } @@ -990,81 +997,118 @@ }else{ pcidev->vdevfn = orig_vdev; } - if ( do_pci_remove(&gc, domid, pcidev, force) ) + if ( do_pci_remove(gc, domid, pcidev, force) ) rc = ERROR_FAIL; } } out: + return rc; +} + +int libxl_device_pci_remove(libxl_ctx *ctx, uint32_t domid, libxl_device_pci *pcidev) +{ + libxl__gc gc = LIBXL_INIT_GC(ctx); + int rc; + + rc = libxl__device_pci_remove_common(&gc, domid, pcidev, 0); + libxl__free_all(&gc); return rc; } -int libxl_device_pci_list_assigned(libxl_ctx *ctx, libxl_device_pci **list, uint32_t domid, int *num) +int libxl_device_pci_destroy(libxl_ctx *ctx, uint32_t domid, + libxl_device_pci *pcidev) { libxl__gc gc = LIBXL_INIT_GC(ctx); - char *be_path, *num_devs, *xsdev, *xsvdevfn, *xsopts; + int rc; + + rc = libxl__device_pci_remove_common(&gc, domid, pcidev, 1); + + libxl__free_all(&gc); + return rc; +} + +static void libxl__device_pci_from_xs_be(libxl__gc *gc, + const char *be_path, + libxl_device_pci *pci, + int nr) +{ + char *s; + unsigned int domain = 0, bus = 0, dev = 0, func = 0, vdevfn = 0; + + s = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "%s/dev-%d", be_path, nr)); + sscanf(s, PCI_BDF, &domain, &bus, &dev, &func); + + s = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "%s/vdevfn-%d", be_path, nr)); + if (s) + vdevfn = strtol(s, (char **) NULL, 16); + + pcidev_init(pci, domain, bus, dev, func, vdevfn); + + s = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "%s/opts-%d", be_path, nr)); + if (s) { + char *saveptr; + char *p = strtok_r(s, ",=", &saveptr); + do { + while (*p == ' ') + p++; + if (!strcmp(p, "msitranslate")) { + p = strtok_r(NULL, ",=", &saveptr); + pci->msitranslate = atoi(p); + } else if (!strcmp(p, "power_mgmt")) { + p = strtok_r(NULL, ",=", &saveptr); + pci->power_mgmt = atoi(p); + } + } while ((p = strtok_r(NULL, ",=", &saveptr)) != NULL); + } +} + +libxl_device_pci *libxl_device_pci_list(libxl_ctx *ctx, uint32_t domid, int *num) +{ + libxl__gc gc = LIBXL_INIT_GC(ctx); + char *be_path, *num_devs; int n, i; - unsigned int domain = 0, bus = 0, dev = 0, func = 0, vdevfn = 0; - libxl_device_pci *pcidevs; + libxl_device_pci *pcidevs = NULL; + + *num = 0; be_path = libxl__sprintf(&gc, "%s/backend/pci/%d/0", libxl__xs_get_dompath(&gc, 0), domid); num_devs = libxl__xs_read(&gc, XBT_NULL, libxl__sprintf(&gc, "%s/num_devs", be_path)); - if (!num_devs) { - *num = 0; - *list = NULL; - libxl__free_all(&gc); - return 0; - } + if (!num_devs) + goto out; + n = atoi(num_devs); pcidevs = calloc(n, sizeof(libxl_device_pci)); + + for (i = 0; i < n; i++) + libxl__device_pci_from_xs_be(&gc, be_path, pcidevs + i, i); + *num = n; - - for (i = 0; i < n; i++) { - xsdev = libxl__xs_read(&gc, XBT_NULL, libxl__sprintf(&gc, "%s/dev-%d", be_path, i)); - sscanf(xsdev, PCI_BDF, &domain, &bus, &dev, &func); - xsvdevfn = libxl__xs_read(&gc, XBT_NULL, libxl__sprintf(&gc, "%s/vdevfn-%d", be_path, i)); - if (xsvdevfn) - vdevfn = strtol(xsvdevfn, (char **) NULL, 16); - pcidev_init(pcidevs + i, domain, bus, dev, func, vdevfn); - xsopts = libxl__xs_read(&gc, XBT_NULL, libxl__sprintf(&gc, "%s/opts-%d", be_path, i)); - if (xsopts) { - char *saveptr; - char *p = strtok_r(xsopts, ",=", &saveptr); - do { - while (*p == ' ') - p++; - if (!strcmp(p, "msitranslate")) { - p = strtok_r(NULL, ",=", &saveptr); - pcidevs[i].msitranslate = atoi(p); - } else if (!strcmp(p, "power_mgmt")) { - p = strtok_r(NULL, ",=", &saveptr); - pcidevs[i].power_mgmt = atoi(p); - } - } while ((p = strtok_r(NULL, ",=", &saveptr)) != NULL); - } - } - *list = pcidevs; +out: libxl__free_all(&gc); - return 0; + return pcidevs; } -int libxl_device_pci_shutdown(libxl_ctx *ctx, uint32_t domid) +int libxl__device_pci_destroy_all(libxl__gc *gc, uint32_t domid) { + libxl_ctx *ctx = libxl__gc_owner(gc); libxl_device_pci *pcidevs; - int num, i, rc; + int num, i, rc = 0; - rc = libxl_device_pci_list_assigned(ctx, &pcidevs, domid, &num); - if ( rc ) - return rc; + pcidevs = libxl_device_pci_list(ctx, domid, &num); + if ( pcidevs == NULL ) + return ERROR_FAIL; + for (i = 0; i < num; i++) { /* Force remove on shutdown since, on HVM, qemu will not always * respond to SCI interrupt because the guest kernel has shut down the * devices by the time we even get here! */ - if (libxl_device_pci_remove(ctx, domid, pcidevs + i, 1) < 0) - return ERROR_FAIL; + if (libxl_device_pci_destroy(ctx, domid, pcidevs + i) < 0) + rc = ERROR_FAIL; } + free(pcidevs); return 0; } diff -r e81e77745647 -r 2866d4f9109c tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Tue Oct 18 13:36:43 2011 +0100 +++ b/tools/libxl/xl_cmdimpl.c Tue Oct 18 13:36:43 2011 +0100 @@ -2018,11 +2018,14 @@ libxl_device_pci *pcidevs; int num, i; - if ( libxl_device_pci_list_assignable(ctx, &pcidevs, &num) ) + pcidevs = libxl_device_pci_list_assignable(ctx, &num); + + if ( pcidevs == NULL ) return; for (i = 0; i < num; i++) { printf("%04x:%02x:%02x.%01x\n", - pcidevs[i].domain, pcidevs[i].bus, pcidevs[i].dev, pcidevs[i].func); + pcidevs[i].domain, pcidevs[i].bus, pcidevs[i].dev, pcidevs[i].func); + libxl_device_pci_dispose(&pcidevs[i]); } free(pcidevs); } @@ -2045,7 +2048,8 @@ find_domain(dom); - if (libxl_device_pci_list_assigned(ctx, &pcidevs, domid, &num)) + pcidevs = libxl_device_pci_list(ctx, domid, &num); + if (pcidevs == NULL) return; printf("Vdev Device\n"); for (i = 0; i < num; i++) { @@ -2082,7 +2086,10 @@ fprintf(stderr, "pci-detach: malformed BDF specification \"%s\"\n", bdf); exit(2); } - libxl_device_pci_remove(ctx, domid, &pcidev, force); + if (force) + libxl_device_pci_destroy(ctx, domid, &pcidev); + else + libxl_device_pci_remove(ctx, domid, &pcidev); libxl_device_pci_dispose(&pcidev); } diff -r e81e77745647 -r 2866d4f9109c tools/ocaml/libs/xl/genwrap.py --- a/tools/ocaml/libs/xl/genwrap.py Tue Oct 18 13:36:43 2011 +0100 +++ b/tools/ocaml/libs/xl/genwrap.py Tue Oct 18 13:36:43 2011 +0100 @@ -26,10 +26,7 @@ "device_vkb": DEVICE_FUNCTIONS, "device_disk": DEVICE_FUNCTIONS, "device_nic": DEVICE_FUNCTIONS, - "device_pci": [ ("add", ["t", "domid", "unit"]), - ("remove", ["t", "domid", "unit"]), - ("shutdown", ["domid", "unit"]), - ], + "device_pci": DEVICE_FUNCTIONS, "physinfo": [ ("get", ["unit", "t"]), ], "sched_credit": [ ("domain_get", ["domid", "t"]), diff -r e81e77745647 -r 2866d4f9109c tools/ocaml/libs/xl/xenlight_stubs.c --- a/tools/ocaml/libs/xl/xenlight_stubs.c Tue Oct 18 13:36:43 2011 +0100 +++ b/tools/ocaml/libs/xl/xenlight_stubs.c Tue Oct 18 13:36:43 2011 +0100 @@ -424,7 +424,7 @@ device_pci_val(&gc, &lg, &c_info, info); INIT_CTX(); - ret = libxl_device_pci_remove(ctx, Int_val(domid), &c_info, 0); + ret = libxl_device_pci_remove(ctx, Int_val(domid), &c_info); if (ret != 0) failwith_xl("pci_remove", &lg); FREE_CTX(); @@ -432,21 +432,6 @@ CAMLreturn(Val_unit); } -value stub_xl_device_pci_shutdown(value domid) -{ - CAMLparam1(domid); - int ret; - INIT_STRUCT(); - - INIT_CTX(); - ret = libxl_device_pci_shutdown(ctx, Int_val(domid)); - if (ret != 0) - failwith_xl("pci_shutdown", &lg); - FREE_CTX(); - - CAMLreturn(Val_unit); -} - value stub_xl_button_press(value domid, value button) { CAMLparam2(domid, button); diff -r e81e77745647 -r 2866d4f9109c tools/python/xen/lowlevel/xl/xl.c --- a/tools/python/xen/lowlevel/xl/xl.c Tue Oct 18 13:36:43 2011 +0100 +++ b/tools/python/xen/lowlevel/xl/xl.c Tue Oct 18 13:36:43 2011 +0100 @@ -521,9 +521,16 @@ return NULL; } pci = (Py_device_pci *)obj; - if ( libxl_device_pci_remove(self->ctx, domid, &pci->obj, force) ) { - PyErr_SetString(xl_error_obj, "cannot remove pci device"); - return NULL; + if ( force ) { + if ( libxl_device_pci_destroy(self->ctx, domid, &pci->obj) ) { + PyErr_SetString(xl_error_obj, "cannot remove pci device"); + return NULL; + } + } else { + if ( libxl_device_pci_remove(self->ctx, domid, &pci->obj) ) { + PyErr_SetString(xl_error_obj, "cannot remove pci device"); + return NULL; + } } Py_INCREF(Py_None); return Py_None; @@ -558,7 +565,8 @@ PyObject *list; int nr_dev, i; - if ( libxl_device_pci_list_assignable(self->ctx, &dev, &nr_dev) ) { + dev = libxl_device_pci_list_assignable(self->ctx, &nr_dev); + if ( dev == NULL ) { PyErr_SetString(xl_error_obj, "Cannot list assignable devices"); return NULL; } @@ -594,7 +602,8 @@ if ( !PyArg_ParseTuple(args, "i", &domid) ) return NULL; - if ( libxl_device_pci_list_assigned(self->ctx, &dev, domid, &nr_dev) ) { + dev = libxl_device_pci_list(self->ctx, domid, &nr_dev); + if ( dev == NULL ) { PyErr_SetString(xl_error_obj, "Cannot list assignable devices"); return NULL; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Tue Nov 01 17:01:26 2011 Return-path: Envelope-to: www-data@lists.xensource.com Delivery-date: Tue, 01 Nov 2011 17:01:26 -0700 Received: from localhost ([127.0.0.1] helo=lists.colo.xensource.com) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOGj-0001xG-1u; Tue, 01 Nov 2011 17:01:25 -0700 Received: from mail21.messagelabs.com ([85.158.143.35]) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOAv-0000Sz-61 for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 16:55:26 -0700 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-21.messagelabs.com!1320191722!2577230!1 X-Originating-IP: [93.93.131.152] X-StarScan-Version: 6.4.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1290 invoked from network); 1 Nov 2011 23:55:22 -0000 Received: from xenbits.xen.org (HELO xenbits.xen.org) (93.93.131.152) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2011 23:55:22 -0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RLOAr-0007eb-OB for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 23:55:21 +0000 Message-Id: Date: Tue, 01 Nov 2011 23:55:21 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: reorder device functions to put functions for each device together. X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.5 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1318941403 -3600 # Node ID e81e7774564702b3f403ea7f74af220265c98cf4 # Parent 7919aa4b483541ec4a2dc4ed98ab6f82f2d2d494 libxl: reorder device functions to put functions for each device together. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 7919aa4b4835 -r e81e77745647 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Tue Oct 18 13:36:43 2011 +0100 +++ b/tools/libxl/libxl.c Tue Oct 18 13:36:43 2011 +0100 @@ -1113,6 +1113,216 @@ libxl__free_all(&gc); return rc; } + +static void libxl__device_disk_from_xs_be(libxl__gc *gc, + const char *be_path, + libxl_device_disk *disk) +{ + libxl_ctx *ctx = libxl__gc_owner(gc); + unsigned int len; + char *tmp; + + libxl_device_disk_init(ctx, disk); + + tmp = xs_read(ctx->xsh, XBT_NULL, + libxl__sprintf(gc, "%s/params", be_path), &len); + if (tmp && strchr(tmp, ':')) { + disk->pdev_path = strdup(strchr(tmp, ':') + 1); + free(tmp); + } else { + disk->pdev_path = tmp; + } + libxl_string_to_backend(ctx, + libxl__xs_read(gc, XBT_NULL, + libxl__sprintf(gc, "%s/type", be_path)), + &(disk->backend)); + disk->vdev = xs_read(ctx->xsh, XBT_NULL, + libxl__sprintf(gc, "%s/dev", be_path), &len); + tmp = libxl__xs_read(gc, XBT_NULL, libxl__sprintf + (gc, "%s/removable", be_path)); + + if (tmp) + disk->removable = atoi(tmp); + else + disk->removable = 0; + + tmp = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "%s/mode", be_path)); + if (!strcmp(tmp, "w")) + disk->readwrite = 1; + else + disk->readwrite = 0; + + tmp = libxl__xs_read(gc, XBT_NULL, + libxl__sprintf(gc, "%s/device-type", be_path)); + disk->is_cdrom = !strcmp(tmp, "cdrom"); + + disk->format = LIBXL_DISK_FORMAT_UNKNOWN; +} + +int libxl_devid_to_device_disk(libxl_ctx *ctx, uint32_t domid, + int devid, libxl_device_disk *disk) +{ + libxl__gc gc = LIBXL_INIT_GC(ctx); + char *dompath, *path; + int rc = ERROR_FAIL; + + libxl_device_disk_init(ctx, disk); + + dompath = libxl__xs_get_dompath(&gc, domid); + if (!dompath) { + goto out; + } + path = libxl__xs_read(&gc, XBT_NULL, + libxl__sprintf(&gc, "%s/device/vbd/%d/backend", + dompath, devid)); + if (!path) + goto out; + + libxl__device_disk_from_xs_be(&gc, path, disk); + + rc = 0; +out: + libxl__free_all(&gc); + return rc; +} + + +static int libxl__append_disk_list_of_type(libxl__gc *gc, + uint32_t domid, + const char *type, + libxl_device_disk **disks, + int *ndisks) +{ + char *be_path = NULL; + char **dir = NULL; + unsigned int n = 0; + libxl_device_disk *pdisk = NULL, *pdisk_end = NULL; + + be_path = libxl__sprintf(gc, "%s/backend/%s/%d", + libxl__xs_get_dompath(gc, 0), type, domid); + dir = libxl__xs_directory(gc, XBT_NULL, be_path, &n); + if (dir) { + libxl_device_disk *tmp; + tmp = realloc(*disks, sizeof (libxl_device_disk) * (*ndisks + n)); + if (tmp == NULL) + return ERROR_NOMEM; + *disks = tmp; + pdisk = *disks + *ndisks; + *ndisks += n; + pdisk_end = *disks + *ndisks; + for (; pdisk < pdisk_end; pdisk++, dir++) { + const char *p; + p = libxl__sprintf(gc, "%s/%s", be_path, *dir); + libxl__device_disk_from_xs_be(gc, p, pdisk); + pdisk->backend_domid = 0; + } + } + return 0; +} + +libxl_device_disk *libxl_device_disk_list(libxl_ctx *ctx, uint32_t domid, int *num) +{ + libxl__gc gc = LIBXL_INIT_GC(ctx); + libxl_device_disk *disks = NULL; + int rc; + + *num = 0; + + rc = libxl__append_disk_list_of_type(&gc, domid, "vbd", &disks, num); + if (rc) goto out_err; + + rc = libxl__append_disk_list_of_type(&gc, domid, "tap", &disks, num); + if (rc) goto out_err; + + rc = libxl__append_disk_list_of_type(&gc, domid, "qdisk", &disks, num); + if (rc) goto out_err; + + libxl__free_all(&gc); + return disks; + +out_err: + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Unable to list disks"); + while (disks && *num) { + (*num)--; + libxl_device_disk_dispose(&disks[*num]); + } + free(disks); + return NULL; +} + +int libxl_device_disk_getinfo(libxl_ctx *ctx, uint32_t domid, + libxl_device_disk *disk, libxl_diskinfo *diskinfo) +{ + libxl__gc gc = LIBXL_INIT_GC(ctx); + char *dompath, *diskpath; + char *val; + + dompath = libxl__xs_get_dompath(&gc, domid); + diskinfo->devid = libxl__device_disk_dev_number(disk->vdev, NULL, NULL); + + /* tap devices entries in xenstore are written as vbd devices. */ + diskpath = libxl__sprintf(&gc, "%s/device/vbd/%d", dompath, diskinfo->devid); + diskinfo->backend = xs_read(ctx->xsh, XBT_NULL, + libxl__sprintf(&gc, "%s/backend", diskpath), NULL); + if (!diskinfo->backend) { + libxl__free_all(&gc); + return ERROR_FAIL; + } + val = libxl__xs_read(&gc, XBT_NULL, libxl__sprintf(&gc, "%s/backend-id", diskpath)); + diskinfo->backend_id = val ? strtoul(val, NULL, 10) : -1; + val = libxl__xs_read(&gc, XBT_NULL, libxl__sprintf(&gc, "%s/state", diskpath)); + diskinfo->state = val ? strtoul(val, NULL, 10) : -1; + val = libxl__xs_read(&gc, XBT_NULL, libxl__sprintf(&gc, "%s/event-channel", diskpath)); + diskinfo->evtch = val ? strtoul(val, NULL, 10) : -1; + val = libxl__xs_read(&gc, XBT_NULL, libxl__sprintf(&gc, "%s/ring-ref", diskpath)); + diskinfo->rref = val ? strtoul(val, NULL, 10) : -1; + diskinfo->frontend = xs_read(ctx->xsh, XBT_NULL, + libxl__sprintf(&gc, "%s/frontend", diskinfo->backend), NULL); + val = libxl__xs_read(&gc, XBT_NULL, libxl__sprintf(&gc, "%s/frontend-id", diskinfo->backend)); + diskinfo->frontend_id = val ? strtoul(val, NULL, 10) : -1; + + libxl__free_all(&gc); + return 0; +} + +int libxl_cdrom_insert(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk) +{ + int num, i; + uint32_t stubdomid; + libxl_device_disk *disks; + int ret = ERROR_FAIL; + + if (!disk->pdev_path) { + disk->pdev_path = strdup(""); + disk->format = LIBXL_DISK_FORMAT_EMPTY; + } + disks = libxl_device_disk_list(ctx, domid, &num); + for (i = 0; i < num; i++) { + if (disks[i].is_cdrom && !strcmp(disk->vdev, disks[i].vdev)) + /* found */ + break; + } + if (i == num) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Virtual device not found"); + goto out; + } + + ret = 0; + + libxl_device_disk_remove(ctx, domid, disks + i); + libxl_device_disk_add(ctx, domid, disk); + stubdomid = libxl_get_stubdom_id(ctx, domid); + if (stubdomid) { + libxl_device_disk_remove(ctx, stubdomid, disks + i); + libxl_device_disk_add(ctx, stubdomid, disk); + } +out: + for (i = 0; i < num; i++) + libxl_device_disk_dispose(&disks[i]); + free(disks); + return ret; +} + char * libxl_device_disk_local_attach(libxl_ctx *ctx, libxl_device_disk *disk) { libxl__gc gc = LIBXL_INIT_GC(ctx); @@ -1346,6 +1556,7 @@ libxl__free_all(&gc); return rc; } + static void libxl__device_nic_from_xs_be(libxl__gc *gc, const char *be_path, libxl_device_nic *nic) @@ -1686,215 +1897,6 @@ return rc; } -static void libxl__device_disk_from_xs_be(libxl__gc *gc, - const char *be_path, - libxl_device_disk *disk) -{ - libxl_ctx *ctx = libxl__gc_owner(gc); - unsigned int len; - char *tmp; - - libxl_device_disk_init(ctx, disk); - - tmp = xs_read(ctx->xsh, XBT_NULL, - libxl__sprintf(gc, "%s/params", be_path), &len); - if (tmp && strchr(tmp, ':')) { - disk->pdev_path = strdup(strchr(tmp, ':') + 1); - free(tmp); - } else { - disk->pdev_path = tmp; - } - libxl_string_to_backend(ctx, - libxl__xs_read(gc, XBT_NULL, - libxl__sprintf(gc, "%s/type", be_path)), - &(disk->backend)); - disk->vdev = xs_read(ctx->xsh, XBT_NULL, - libxl__sprintf(gc, "%s/dev", be_path), &len); - tmp = libxl__xs_read(gc, XBT_NULL, libxl__sprintf - (gc, "%s/removable", be_path)); - - if (tmp) - disk->removable = atoi(tmp); - else - disk->removable = 0; - - tmp = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "%s/mode", be_path)); - if (!strcmp(tmp, "w")) - disk->readwrite = 1; - else - disk->readwrite = 0; - - tmp = libxl__xs_read(gc, XBT_NULL, - libxl__sprintf(gc, "%s/device-type", be_path)); - disk->is_cdrom = !strcmp(tmp, "cdrom"); - - disk->format = LIBXL_DISK_FORMAT_UNKNOWN; -} - -int libxl_devid_to_device_disk(libxl_ctx *ctx, uint32_t domid, - int devid, libxl_device_disk *disk) -{ - libxl__gc gc = LIBXL_INIT_GC(ctx); - char *dompath, *path; - int rc = ERROR_FAIL; - - libxl_device_disk_init(ctx, disk); - - dompath = libxl__xs_get_dompath(&gc, domid); - if (!dompath) { - goto out; - } - path = libxl__xs_read(&gc, XBT_NULL, - libxl__sprintf(&gc, "%s/device/vbd/%d/backend", - dompath, devid)); - if (!path) - goto out; - - libxl__device_disk_from_xs_be(&gc, path, disk); - - rc = 0; -out: - libxl__free_all(&gc); - return rc; -} - - -static int libxl__append_disk_list_of_type(libxl__gc *gc, - uint32_t domid, - const char *type, - libxl_device_disk **disks, - int *ndisks) -{ - char *be_path = NULL; - char **dir = NULL; - unsigned int n = 0; - libxl_device_disk *pdisk = NULL, *pdisk_end = NULL; - - be_path = libxl__sprintf(gc, "%s/backend/%s/%d", - libxl__xs_get_dompath(gc, 0), type, domid); - dir = libxl__xs_directory(gc, XBT_NULL, be_path, &n); - if (dir) { - libxl_device_disk *tmp; - tmp = realloc(*disks, sizeof (libxl_device_disk) * (*ndisks + n)); - if (tmp == NULL) - return ERROR_NOMEM; - *disks = tmp; - pdisk = *disks + *ndisks; - *ndisks += n; - pdisk_end = *disks + *ndisks; - for (; pdisk < pdisk_end; pdisk++, dir++) { - const char *p; - p = libxl__sprintf(gc, "%s/%s", be_path, *dir); - libxl__device_disk_from_xs_be(gc, p, pdisk); - pdisk->backend_domid = 0; - } - } - return 0; -} - -libxl_device_disk *libxl_device_disk_list(libxl_ctx *ctx, uint32_t domid, int *num) -{ - libxl__gc gc = LIBXL_INIT_GC(ctx); - libxl_device_disk *disks = NULL; - int rc; - - *num = 0; - - rc = libxl__append_disk_list_of_type(&gc, domid, "vbd", &disks, num); - if (rc) goto out_err; - - rc = libxl__append_disk_list_of_type(&gc, domid, "tap", &disks, num); - if (rc) goto out_err; - - rc = libxl__append_disk_list_of_type(&gc, domid, "qdisk", &disks, num); - if (rc) goto out_err; - - libxl__free_all(&gc); - return disks; - -out_err: - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Unable to list disks"); - while (disks && *num) { - (*num)--; - libxl_device_disk_dispose(&disks[*num]); - } - free(disks); - return NULL; -} - -int libxl_device_disk_getinfo(libxl_ctx *ctx, uint32_t domid, - libxl_device_disk *disk, libxl_diskinfo *diskinfo) -{ - libxl__gc gc = LIBXL_INIT_GC(ctx); - char *dompath, *diskpath; - char *val; - - dompath = libxl__xs_get_dompath(&gc, domid); - diskinfo->devid = libxl__device_disk_dev_number(disk->vdev, NULL, NULL); - - /* tap devices entries in xenstore are written as vbd devices. */ - diskpath = libxl__sprintf(&gc, "%s/device/vbd/%d", dompath, diskinfo->devid); - diskinfo->backend = xs_read(ctx->xsh, XBT_NULL, - libxl__sprintf(&gc, "%s/backend", diskpath), NULL); - if (!diskinfo->backend) { - libxl__free_all(&gc); - return ERROR_FAIL; - } - val = libxl__xs_read(&gc, XBT_NULL, libxl__sprintf(&gc, "%s/backend-id", diskpath)); - diskinfo->backend_id = val ? strtoul(val, NULL, 10) : -1; - val = libxl__xs_read(&gc, XBT_NULL, libxl__sprintf(&gc, "%s/state", diskpath)); - diskinfo->state = val ? strtoul(val, NULL, 10) : -1; - val = libxl__xs_read(&gc, XBT_NULL, libxl__sprintf(&gc, "%s/event-channel", diskpath)); - diskinfo->evtch = val ? strtoul(val, NULL, 10) : -1; - val = libxl__xs_read(&gc, XBT_NULL, libxl__sprintf(&gc, "%s/ring-ref", diskpath)); - diskinfo->rref = val ? strtoul(val, NULL, 10) : -1; - diskinfo->frontend = xs_read(ctx->xsh, XBT_NULL, - libxl__sprintf(&gc, "%s/frontend", diskinfo->backend), NULL); - val = libxl__xs_read(&gc, XBT_NULL, libxl__sprintf(&gc, "%s/frontend-id", diskinfo->backend)); - diskinfo->frontend_id = val ? strtoul(val, NULL, 10) : -1; - - libxl__free_all(&gc); - return 0; -} - -int libxl_cdrom_insert(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk) -{ - int num, i; - uint32_t stubdomid; - libxl_device_disk *disks; - int ret = ERROR_FAIL; - - if (!disk->pdev_path) { - disk->pdev_path = strdup(""); - disk->format = LIBXL_DISK_FORMAT_EMPTY; - } - disks = libxl_device_disk_list(ctx, domid, &num); - for (i = 0; i < num; i++) { - if (disks[i].is_cdrom && !strcmp(disk->vdev, disks[i].vdev)) - /* found */ - break; - } - if (i == num) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Virtual device not found"); - goto out; - } - - ret = 0; - - libxl_device_disk_remove(ctx, domid, disks + i); - libxl_device_disk_add(ctx, domid, disk); - stubdomid = libxl_get_stubdom_id(ctx, domid); - if (stubdomid) { - libxl_device_disk_remove(ctx, stubdomid, disks + i); - libxl_device_disk_add(ctx, stubdomid, disk); - } -out: - for (i = 0; i < num; i++) - libxl_device_disk_dispose(&disks[i]); - free(disks); - return ret; -} - /******************************************************************************/ int libxl_device_vfb_init(libxl_ctx *ctx, libxl_device_vfb *vfb) { _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Tue Nov 01 17:01:53 2011 Return-path: Envelope-to: www-data@lists.xensource.com Delivery-date: Tue, 01 Nov 2011 17:01:53 -0700 Received: from localhost ([127.0.0.1] helo=lists.colo.xensource.com) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOHA-00020N-Oq; Tue, 01 Nov 2011 17:01:52 -0700 Received: from mail21.messagelabs.com ([85.158.143.35]) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOAw-0000TN-OO for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 16:55:27 -0700 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-4.tower-21.messagelabs.com!1320191723!2565514!1 X-Originating-IP: [93.93.131.152] X-StarScan-Version: 6.4.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19389 invoked from network); 1 Nov 2011 23:55:23 -0000 Received: from xenbits.xen.org (HELO xenbits.xen.org) (93.93.131.152) by server-4.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2011 23:55:23 -0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RLOAt-0007fM-Bb for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 23:55:23 +0000 Message-Id: Date: Tue, 01 Nov 2011 23:55:22 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xenstored: Fix processing of zero-length messages X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.5 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Daniel De Graaf # Date 1320171917 0 # Node ID 45025966f7d1e556d1c9085279c392f50c92a71e # Parent f60911281a1bb1e77ef257be629065102be21a80 xenstored: Fix processing of zero-length messages When a message with zero length is sent to xenstore, the body of the message was not processed until the socket or ring had more data to read; this will cause deadlocks if the requestor is waiting on a response to continue. Signed-off-by: Daniel De Graaf Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r f60911281a1b -r 45025966f7d1 tools/xenstore/xenstored_core.c --- a/tools/xenstore/xenstored_core.c Tue Oct 18 13:36:43 2011 +0100 +++ b/tools/xenstore/xenstored_core.c Tue Nov 01 18:25:17 2011 +0000 @@ -1297,7 +1297,6 @@ goto bad_client; in->used = 0; in->inhdr = false; - return; } bytes = conn->read(conn, in->buffer + in->used, _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Tue Nov 01 17:02:14 2011 Return-path: Envelope-to: www-data@lists.xensource.com Delivery-date: Tue, 01 Nov 2011 17:02:14 -0700 Received: from localhost ([127.0.0.1] helo=lists.colo.xensource.com) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOHV-000242-IT; Tue, 01 Nov 2011 17:02:13 -0700 Received: from mail216.messagelabs.com ([85.158.143.99]) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOAy-0000U5-8J for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 16:55:28 -0700 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-216.messagelabs.com!1320191725!1938046!1 X-Originating-IP: [93.93.131.152] X-StarScan-Version: 6.4.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23637 invoked from network); 1 Nov 2011 23:55:25 -0000 Received: from xenbits.xen.org (HELO xenbits.xen.org) (93.93.131.152) by server-7.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2011 23:55:25 -0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RLOAu-0007g5-R4 for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 23:55:24 +0000 Message-Id: Date: Tue, 01 Nov 2011 23:55:24 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] docs: add some scaffolding for building HTML docs from markdown X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.5 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1319646217 -3600 # Node ID 3568883ebd550be6e26bf5d34dc0764c31918f09 # Parent 4c7c063631db44d3244710ef78bbc81b10fec050 docs: add some scaffolding for building HTML docs from markdown Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 4c7c063631db -r 3568883ebd55 docs/Docs.mk --- a/docs/Docs.mk Wed Oct 26 17:20:21 2011 +0100 +++ b/docs/Docs.mk Wed Oct 26 17:23:37 2011 +0100 @@ -7,3 +7,4 @@ POD2MAN := pod2man DOT := dot NEATO := neato +MARKDOWN := markdown diff -r 4c7c063631db -r 3568883ebd55 docs/Makefile --- a/docs/Makefile Wed Oct 26 17:20:21 2011 +0100 +++ b/docs/Makefile Wed Oct 26 17:23:37 2011 +0100 @@ -11,10 +11,11 @@ DOC_MAN1 := $(patsubst man/%.pod.1,man1/%.1,$(DOC_MAN1SRC)) DOC_MAN5 := $(patsubst man/%.pod.5,man5/%.5,$(DOC_MAN5SRC)) DOC_TEX := src/user.tex src/interface.tex +DOC_MARKDOWN := $(wildcard misc/*.markdown) DOC_PS := $(patsubst src/%.tex,ps/%.ps,$(DOC_TEX)) DOC_PDF := $(patsubst src/%.tex,pdf/%.pdf,$(DOC_TEX)) -DOC_HTML := $(patsubst src/%.tex,html/%/index.html,$(DOC_TEX)) - +DOC_HTML := $(patsubst src/%.tex,html/%/index.html,$(DOC_TEX)) \ + $(patsubst %.markdown,html/%.html,$(DOC_MARKDOWN)) GFX = $(patsubst %.fig, %.eps, $(wildcard figs/*.fig)) .PHONY: all @@ -37,9 +38,7 @@ pdf: $(DOC_PDF) .PHONY: html -html: - @if which $(LATEX2HTML) 1>/dev/null 2>/dev/null; then \ - $(MAKE) $(DOC_HTML); fi +html: $(DOC_HTML) .PHONY: python-dev-docs python-dev-docs: @@ -110,7 +109,16 @@ $(FIG2DEV) -L eps $< $@ html/%/index.html: src/%.tex - $(INSTALL_DIR) $(@D) + @$(INSTALL_DIR) $(@D) + @set -e ; if which $(LATEX2HTML) 1>/dev/null 2>/dev/null; then \ + echo "Running latex2html to generate $*/index.html ... "; \ $(LATEX2HTML) -split 0 -show_section_numbers -toc_depth 3 -nonavigation \ -numbered_footnotes -local_icons -noinfo -math -dir $(@D) \ - $< 1>/dev/null 2>/dev/null + $< 1>/dev/null 2>/dev/null ;fi + +html/%.html: %.markdown + @$(INSTALL_DIR) $(@D) + @set -e ; if which $(MARKDOWN) 1>/dev/null 2>/dev/null; then \ + echo "Running markdown to generate $*.html ... "; \ + $(MARKDOWN) $< > $@.tmp ; \ + $(call move-if-changed,$@.tmp,$@) ; fi _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Tue Nov 01 17:02:50 2011 Return-path: Envelope-to: www-data@lists.xensource.com Delivery-date: Tue, 01 Nov 2011 17:02:50 -0700 Received: from localhost ([127.0.0.1] helo=lists.colo.xensource.com) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOI5-00027b-Af; Tue, 01 Nov 2011 17:02:49 -0700 Received: from mail27.messagelabs.com ([193.109.254.147]) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOAx-0000Tj-F4 for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 16:55:28 -0700 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-27.messagelabs.com!1320191700!51110421!1 X-Originating-IP: [93.93.131.152] X-StarScan-Version: 6.4.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32385 invoked from network); 1 Nov 2011 23:55:00 -0000 Received: from xenbits.xen.org (HELO xenbits.xen.org) (93.93.131.152) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2011 23:55:00 -0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RLOAu-0007fq-B2 for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 23:55:24 +0000 Message-Id: Date: Tue, 01 Nov 2011 23:55:23 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] docs: import HVM emulated device unplug protocol spec X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.5 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1319646021 -3600 # Node ID 4c7c063631db44d3244710ef78bbc81b10fec050 # Parent a1e0b24a8728d82ac4dd8e7e767298932aaa8b77 docs: import HVM emulated device unplug protocol spec Convert to markdown as I go. Currently this lives in qemu-xen.git i386-dm/README.hvm-pv-magic-ioport-disable and I can never find it when I want it. As we transition to upstream qemu this location becomes less useful. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r a1e0b24a8728 -r 4c7c063631db docs/misc/hvm-emulated-unplug.markdown --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/docs/misc/hvm-emulated-unplug.markdown Wed Oct 26 17:20:21 2011 +0100 @@ -0,0 +1,68 @@ +#Xen HVM emulated device unplug protocol + +The protocol covers three basic things: + + * Disconnecting emulated devices. + * Getting log messages out of the drivers and into dom0. + * Allowing dom0 to block the loading of specific drivers. This is + intended as a backwards-compatibility thing: if we discover a bug + in some old version of the drivers, then rather than working around + it in Xen, we have the option of just making those drivers fall + back to emulated mode. + +The current protocol works like this (from the point of view of +drivers): + +1. When the drivers first come up, they check whether the unplug logic + is available by reading a two-byte magic number from IO port `0x10`. + These should be `0x49d2`. If the magic number doesn't match, the + drivers don't do anything. + +2. The drivers read a one-byte protocol version from IO port `0x12`. If + this is 0, skip to 6. + +3. The drivers write a two-byte product number to IO port `0x12`. At + the moment, the only drivers using this protocol are our + closed-source ones, which use product number 1. + +4. The drivers write a four-byte build number to IO port `0x10`. + +5. The drivers check the magic number by reading two bytes from `0x10` + again. If it's changed from `0x49d2` to `0xd249`, the drivers are + blacklisted and should not load. + +6. The drivers write a two-byte bitmask of devices to unplug to IO + port `0x10`. The defined fields are: + + * `1` -- All IDE disks (not including CD drives) + * `2` -- All emulated NICs + * `4` -- All IDE disks except for the primary master (not including CD + drives) + + The relevant emulated devices then disappear from the relevant + buses. For most guest operating systems, you want to do this + before device enumeration happens. + +Once the drivers have checked the magic number, they can send log +messages to qemu which will be logged to wherever qemu's logs go +(`/var/log/xen/qemu-dm.log` on normal Xen, dom0 syslog on XenServer). +These messages are written to IO port `0x12` a byte at a time, and are +terminated by newlines. There's a fairly aggressive rate limiter on +these messages, so they shouldn't be used for anything even vaguely +high-volume, but they're rather useful for debugging and support. + +It is still permitted for a driver to use this logging feature if it +is blacklisted, but *ONLY* if it has checked the magic number and found +it to be `0x49d2` or `0xd249`. + +This isn't exactly a pretty protocol, but it does solve the problem. + +The blacklist is, from qemu's point of view, handled mostly through +xenstore. A driver version is considered to be blacklisted if +`/mh/driver-blacklist/{product_name}/{build_number}` exists and is +readable, where `{build_number}` is the build number from step 4 as a +decimal number. `{product_name}` is a string corresponding to the +product number in step 3. + +The master registry of product names and numbers is in +qemu-xen-unstable's xenstore.c. _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Tue Nov 01 17:03:52 2011 Return-path: Envelope-to: www-data@lists.xensource.com Delivery-date: Tue, 01 Nov 2011 17:03:52 -0700 Received: from localhost ([127.0.0.1] helo=lists.colo.xensource.com) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOJ4-0002CW-BV; Tue, 01 Nov 2011 17:03:50 -0700 Received: from mail216.messagelabs.com ([85.158.143.99]) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOAx-0000Td-Ad for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 16:55:28 -0700 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-216.messagelabs.com!1320191724!1839183!1 X-Originating-IP: [93.93.131.152] X-StarScan-Version: 6.4.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32064 invoked from network); 1 Nov 2011 23:55:24 -0000 Received: from xenbits.xen.org (HELO xenbits.xen.org) (93.93.131.152) by server-10.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2011 23:55:24 -0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RLOAt-0007fb-Ra for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 23:55:23 +0000 Message-Id: Date: Tue, 01 Nov 2011 23:55:23 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] docs: Add HowTo use QEMU upstream. X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.5 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Anthony PERARD # Date 1320172130 0 # Node ID a1e0b24a8728d82ac4dd8e7e767298932aaa8b77 # Parent 45025966f7d1e556d1c9085279c392f50c92a71e docs: Add HowTo use QEMU upstream. Signed-off-by: Anthony PERARD Committed-by: Ian Jackson --- diff -r 45025966f7d1 -r a1e0b24a8728 docs/misc/qemu-upstream_howto_use_it.markdown --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/docs/misc/qemu-upstream_howto_use_it.markdown Tue Nov 01 18:28:50 2011 +0000 @@ -0,0 +1,129 @@ +Help to use QEMU (upstream version) with Xen +============================================ + +Note +---- + +All these steps will become unnecessary after the patches to integrate +SeaBIOS/QEMU build will be applied. + + +How to build it +--------------- + +### SeaBIOS + +The new device-model needs a different BIOS, SeaBIOS. Clone the repository from: + + - git://git.qemu.org/seabios.git + - http://git.qemu.org/git/seabios.git + +Put the `.config` file in the appendix at the root of seabios.git and build SeaBIOS. + +In xen-unstable source tree, add the file `.config` with +`SEABIOS_DIR = /path/to/seabios.git`. +To build hvmloader with SeaBIOS, you propably need to `make -C tools/firmware +clean` first and then `make tools`, to use the new SEABIOS_DIR parameter. + + +### QEMU + +Get QEMU upstream source from: + + - git://xenbits.xensource.com/qemu-upstream-unstable.git + - http://xenbits.xensource.com/git-http/qemu-upstream-unstable.git + +To configure build QEMU upstream with Xen + + ./configure --enable-xen --target-list=i386-softmmu --extra-cflags="-I$path_to_xen_source/tools/include -I$path_to_xen_source/tools/libxc -I$path_to_xen_source/tools/xenstore" --extra-ldflags="-L$path_to_xen_source/tools/libxc -L$path_to_xen_source/tools/xenstore" + +You can also use other several options such as `--disable-kvm`. + + +How to use QEMU upstream +------------------------ + +Only xl support QEMU upstream. + +To actually use it, add or change this in your VM configuration file: + + device_model_version = 'qemu-xen' + device_model_override = '/path/to/qemu/i386-softmmu/qemu' + +NB: On qemu-upstream repository, the default binary name has been renamed to +`qemu-system-i386`. + + +Appendix +------ + +### `.config` file for SeaBIOS + + # + # General Features + # + # CONFIG_COREBOOT is not set + CONFIG_XEN=y + CONFIG_THREADS=y + CONFIG_THREAD_OPTIONROMS=y + CONFIG_RELOCATE_INIT=y + CONFIG_BOOTMENU=y + CONFIG_BOOTMENU_WAIT=1000 + # CONFIG_BOOTSPLASH is not set + CONFIG_BOOTORDER=y + # + # Hardware support + # + CONFIG_ATA=y + CONFIG_ATA_DMA=y + CONFIG_ATA_PIO32=y + CONFIG_AHCI=y + CONFIG_VIRTIO_BLK=y + CONFIG_FLOPPY=y + CONFIG_PS2PORT=y + CONFIG_USB=y + CONFIG_USB_UHCI=y + CONFIG_USB_OHCI=y + CONFIG_USB_EHCI=y + CONFIG_USB_MSC=y + CONFIG_USB_HUB=y + CONFIG_USB_KEYBOARD=y + CONFIG_USB_MOUSE=y + CONFIG_SERIAL=y + CONFIG_LPT=y + # CONFIG_EXTRA_PCI_ROOTS is not set + # CONFIG_USE_SMM is not set + CONFIG_MTRR_INIT=y + # + # BIOS interfaces + # + CONFIG_DRIVES=y + # CONFIG_CDROM_BOOT is not set + CONFIG_PCIBIOS=y + CONFIG_APMBIOS=y + CONFIG_PNPBIOS=y + CONFIG_OPTIONROMS=y + # CONFIG_OPTIONROMS_DEPLOYED is not set + CONFIG_OPTIONROMS_CHECKSUM=y + CONFIG_PMM=y + CONFIG_BOOT=y + CONFIG_KEYBOARD=y + CONFIG_KBD_CALL_INT15_4F=y + CONFIG_MOUSE=y + CONFIG_S3_RESUME=y + # CONFIG_S3_RESUME_VGA_INIT is not set + # CONFIG_DISABLE_A20 is not set + # + # BIOS Tables + # + CONFIG_PIRTABLE=y + CONFIG_MPTABLE=y + CONFIG_SMBIOS=y + CONFIG_ACPI=y + # + # Debugging + # + CONFIG_DEBUG_LEVEL=3 + CONFIG_DEBUG_SERIAL=y + CONFIG_DEBUG_SERIAL_PORT=0x3f8 + # CONFIG_SCREEN_AND_DEBUG is not set _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Tue Nov 01 17:08:18 2011 Return-path: Envelope-to: www-data@lists.xensource.com Delivery-date: Tue, 01 Nov 2011 17:08:19 -0700 Received: from localhost ([127.0.0.1] helo=lists.colo.xensource.com) by lists.xensource.com with esmtp (Exim 4.43) id 1RLONN-0002Mz-L1; Tue, 01 Nov 2011 17:08:17 -0700 Received: from mail21.messagelabs.com ([85.158.143.35]) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOAy-0000U6-OD for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 16:55:29 -0700 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-21.messagelabs.com!1320191725!2454517!1 X-Originating-IP: [93.93.131.152] X-StarScan-Version: 6.4.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31358 invoked from network); 1 Nov 2011 23:55:25 -0000 Received: from xenbits.xen.org (HELO xenbits.xen.org) (93.93.131.152) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2011 23:55:25 -0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RLOAv-0007gK-AY for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 23:55:25 +0000 Message-Id: Date: Tue, 01 Nov 2011 23:55:24 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] unmodified_drivers: update README from http://wiki.xen.org/xenwiki/UnmodifiedDrivers X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.5 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1319647443 -3600 # Node ID 4ed766d703968e2340bb7289990d2f1f6bc91557 # Parent 3568883ebd550be6e26bf5d34dc0764c31918f09 unmodified_drivers: update README from http://wiki.xen.org/xenwiki/UnmodifiedDrivers Add reference to the fact that these drivers are for "classic-Xen" kernels only and do not work with PVops but point towards the PVHVM functionality in mainstream. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 3568883ebd55 -r 4ed766d70396 unmodified_drivers/linux-2.6/README --- a/unmodified_drivers/linux-2.6/README Wed Oct 26 17:23:37 2011 +0100 +++ b/unmodified_drivers/linux-2.6/README Wed Oct 26 17:44:03 2011 +0100 @@ -1,10 +1,19 @@ -To build: +These drivers provide paravirtualised drivers for pre-PVops Linux +kernels which have the classic-Xen patches applied. They do not work +with kernels which are not patched with the classic-Xen patches. In +particular this includes all PVops kernels. -1. ./mkbuildtree [] +For 2.6.36 and newer you should use the "PVHVM" functionality which is +available in the mainline kernel. + +To build do one of: + + ./mkbuildtree [] NB. You can override paths to Xen sources and a (stub) XenLinux build tree via the XEN and XL environment variable. -2. make -C /path/to/kernel/build M=$PWD modules +- or - + make -C /path/to/kernel/build M=$PWD modules NB. This is your native kernel build tree (or a distro provided stub), not the XenLinux sources referred to in step 1. NB. If you are cross compiling, you need to set ARCH and _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Tue Nov 01 17:08:43 2011 Return-path: Envelope-to: www-data@lists.xensource.com Delivery-date: Tue, 01 Nov 2011 17:08:43 -0700 Received: from localhost ([127.0.0.1] helo=lists.colo.xensource.com) by lists.xensource.com with esmtp (Exim 4.43) id 1RLONm-0002QP-H2; Tue, 01 Nov 2011 17:08:43 -0700 Received: from mail182.messagelabs.com ([85.158.139.83]) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOAz-0000UI-7t for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 16:55:29 -0700 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-182.messagelabs.com!1320191726!1053216!1 X-Originating-IP: [93.93.131.152] X-StarScan-Version: 6.4.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23137 invoked from network); 1 Nov 2011 23:55:26 -0000 Received: from xenbits.xen.org (HELO xenbits.xen.org) (93.93.131.152) by server-13.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2011 23:55:26 -0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RLOAv-0007gZ-QI for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 23:55:25 +0000 Message-Id: Date: Tue, 01 Nov 2011 23:55:25 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] docs: add a document describing the xl vif syntax X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.5 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1319705668 -3600 # Node ID 4900950d16bbbb63925fadd4cdabdfde01195c37 # Parent 4ed766d703968e2340bb7289990d2f1f6bc91557 docs: add a document describing the xl vif syntax Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 4ed766d70396 -r 4900950d16bb docs/misc/xl-network-configuration.markdown --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/docs/misc/xl-network-configuration.markdown Thu Oct 27 09:54:28 2011 +0100 @@ -0,0 +1,126 @@ +# XL Network Configuration + +## Syntax Overview + +This document specifies the xl config file format vif configuration +option. It has the following form: + + vif = [ '', '', ... ] + +where each vifspec is in this form: + + [=|,] + +For example: + + 'mac=00:16:3E:74:3d:76,model=rtl8139,bridge=xenbr0' + 'mac=00:16:3E:74:34:32' + '' # The empty string + +These might be specified in the domain config file like this: + + vif = [ 'mac=00:16:3E:74:34:32', 'mac=00:16:3e:5f:48:e4,bridge=xenbr1' ] + +More formally, the string is a series of comma-separated keyword/value +pairs. All keywords are optional. + +Each device has a `DEVID` which is its index within the vif list, starting from 0. + +## Keywords + +### mac + +If specified then this option specifies the MAC address inside the +guest of this VIF device. The value is a 48-bit number represented as +six groups of two hexadecimal digits, separated by colons (:). + +The default if this keyword is not specified is to be automatically +generate a MAC address inside the space assigned to Xen's +[Organizationally Unique Identifier][oui] (00:16:3e). + +If you are choosing a MAC address then it is strongly recommend to +follow one of the following strategies: + + * Generate a random sequence of 6 byte, set the locally administered + bit (bit 2 of the first byte) and clear the multicast bit (bit 1 + of the first byte). In other words the first byte should have the + bit pattern xxxxxx10 (where x is a randomly generated bit) and the + remaining 5 bytes are randomly generated See + [http://en.wikipedia.org/wiki/MAC_address] for more details the + structure of a MAC address. + * Allocate an address from within the space defined by your + organization's OUI (if you have one) following your organization's + procedures for doing so. + * Allocate an address from within the space defined by Xen's OUI + (00:16:3e). Taking care not to clash with other users of the + physical network segment where this VIF will reside. + +If you have an OUI for your own use then that is the preferred +strategy. Otherwise in general you should prefer to generate a random +MAC and set the locally administered bit since this allows for more +bits of randomness than using the Xen OUI. + +### bridge + +Specifies the name of the network bridge which this VIF should be +added to. The default is `xenbr0`. The bridge must be configured using +your distribution's network configuration tools. See the [wiki][net] +for guidance and examples. + +### type + +This keyword is valid for HVM guests only. + +Specifies the type of device to valid values are: + + * `ioemu` (default) -- this device will be provided as an emulate + device to the guest and also as a paravirtualised device which the + guest may choose to use instead if it has suitable drivers + available. + * `vif` -- this device will be provided as a paravirtualised device + only. + +### model + +This keyword is valid for HVM guest devices with `type=ioemu` only. + +Specifies the type device to emulated for this guest. Valid values +are: + + * `rtl8139` (default) -- Realtek RTL8139 + * `e1000` -- Intel E1000 + * in principal any device supported by your device model + +### vifname + +This keyword is valid for HVM guest devices with `type=ioemu` only. + +Specifies the backend device name for an emulated device. The default +is `tapDOMID.DEVID` where `DOMID` is the guest domain ID and `DEVID` +is the device number. + +### script + +Specifies the hotplug script to run to configure this device (e.g. to +add it to the relevant bridge). Defaults to +`XEN_SCRIPT_DIR/vif-bridge` but can be set to any script. Some example +scripts are installed in `XEN_SCRIPT_DIR`. + +### ip + +Specifies the IP address for the device, the default is not to +specify an IP address. + +What, if any, effect this has depends on the hotplug script which is +configured. A typically behaviour (exhibited by the example hotplug +scripts) if set might be to configure firewall rules to allow only the +specified IP address to be used by the guest (blocking all others). + +### backend + +Specifies the backend domain which this device should attach to. This +defaults to domain 0. Specifying another domain requires setting up a +driver domain which is outside the scope of this document. + +[oui]: http://en.wikipedia.org/wiki/Organizationally_Unique_Identifier +[net]: http://wiki.xen.org/xenwiki/HostConfiguration/Networking _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Tue Nov 01 17:08:59 2011 Return-path: Envelope-to: www-data@lists.xensource.com Delivery-date: Tue, 01 Nov 2011 17:08:59 -0700 Received: from localhost ([127.0.0.1] helo=lists.colo.xensource.com) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOO2-0002Tn-QI; Tue, 01 Nov 2011 17:08:59 -0700 Received: from mail216.messagelabs.com ([85.158.143.99]) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOB0-0000Un-6K for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 16:55:30 -0700 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-216.messagelabs.com!1320191727!1941252!1 X-Originating-IP: [93.93.131.152] X-StarScan-Version: 6.4.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5749 invoked from network); 1 Nov 2011 23:55:27 -0000 Received: from xenbits.xen.org (HELO xenbits.xen.org) (93.93.131.152) by server-8.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2011 23:55:27 -0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RLOAw-0007h3-Pc for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 23:55:26 +0000 Message-Id: Date: Tue, 01 Nov 2011 23:55:26 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] docs: install text documentation X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.5 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1319705722 -3600 # Node ID 7648496d4ff12d41a8445c2b125173906d25bce7 # Parent e3bd1c4184e513ca19e1f2e11803004015ed0d15 docs: install text documentation Including markdown docs. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r e3bd1c4184e5 -r 7648496d4ff1 .hgignore --- a/.hgignore Thu Oct 27 09:55:14 2011 +0100 +++ b/.hgignore Thu Oct 27 09:55:22 2011 +0100 @@ -57,6 +57,7 @@ ^docs/user/labels\.pl$ ^docs/user/user\.css$ ^docs/user/user\.html$ +^docs/txt/.*$ ^docs/xen-api/vm_lifecycle.eps$ ^docs/xen-api/xenapi-datamodel-graph.eps$ ^docs/xen-api/xenapi.out$ diff -r e3bd1c4184e5 -r 7648496d4ff1 docs/Makefile --- a/docs/Makefile Thu Oct 27 09:55:14 2011 +0100 +++ b/docs/Makefile Thu Oct 27 09:55:22 2011 +0100 @@ -16,13 +16,16 @@ DOC_PDF := $(patsubst src/%.tex,pdf/%.pdf,$(DOC_TEX)) DOC_HTML := $(patsubst src/%.tex,html/%/index.html,$(DOC_TEX)) \ $(patsubst %.markdown,html/%.html,$(DOC_MARKDOWN)) +DOC_TXT := $(patsubst %.txt,txt/%.txt,$(wildcard misc/*.txt)) \ + $(patsubst %.markdown,txt/%.txt,$(DOC_MARKDOWN)) + GFX = $(patsubst %.fig, %.eps, $(wildcard figs/*.fig)) .PHONY: all all: build .PHONY: build -build: ps pdf html man-pages +build: ps pdf html txt man-pages @if which $(DOT) 1>/dev/null 2>/dev/null ; then \ $(MAKE) -C xen-api build ; else \ echo "Graphviz (dot) not installed; skipping xen-api." ; fi @@ -40,6 +43,9 @@ .PHONY: html html: $(DOC_HTML) +.PHONY: txt +txt: $(DOC_TXT) + .PHONY: python-dev-docs python-dev-docs: @mkdir -v -p api/tools/python @@ -122,3 +128,13 @@ echo "Running markdown to generate $*.html ... "; \ $(MARKDOWN) $< > $@.tmp ; \ $(call move-if-changed,$@.tmp,$@) ; fi + +txt/%.txt: %.txt + $(INSTALL_DIR) $(@D) + cp $< $@.tmp + $(call move-if-changed,$@.tmp,$@) + +txt/%.txt: %.markdown + $(INSTALL_DIR) $(@D) + cp $< $@.tmp + $(call move-if-changed,$@.tmp,$@) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Tue Nov 01 17:09:19 2011 Return-path: Envelope-to: www-data@lists.xensource.com Delivery-date: Tue, 01 Nov 2011 17:09:19 -0700 Received: from localhost ([127.0.0.1] helo=lists.colo.xensource.com) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOOL-0002XQ-If; Tue, 01 Nov 2011 17:09:19 -0700 Received: from mail216.messagelabs.com ([85.158.143.99]) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOAz-0000UZ-MA for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 16:55:30 -0700 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-216.messagelabs.com!1320191726!1938047!1 X-Originating-IP: [93.93.131.152] X-StarScan-Version: 6.4.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23645 invoked from network); 1 Nov 2011 23:55:26 -0000 Received: from xenbits.xen.org (HELO xenbits.xen.org) (93.93.131.152) by server-7.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2011 23:55:26 -0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RLOAw-0007go-9l for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 23:55:26 +0000 Message-Id: Date: Tue, 01 Nov 2011 23:55:25 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xl: add some example configuration files X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.5 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Ian Campbell # Date 1319705714 -3600 # Node ID e3bd1c4184e513ca19e1f2e11803004015ed0d15 # Parent 4900950d16bbbb63925fadd4cdabdfde01195c37 xl: add some example configuration files These are much more minimal than the equivalent xmexamples but should eventually reference a more complete document describing the available options. These are based on the guest configuration files that I actually use day-to-day. There is an unresolved reference to a document describing the complete syntax. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 4900950d16bb -r e3bd1c4184e5 tools/examples/xlexample.hvm --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/examples/xlexample.hvm Thu Oct 27 09:55:14 2011 +0100 @@ -0,0 +1,39 @@ +# ===================================================================== +# Example HVM guest configuration +# ===================================================================== +# +# This is a fairly minimal example of what is required for an +# HVM guest. For a more complete guide see + +# Guest name +name = "example.hvm" + +# 128-bit UUID for the domain as a hexadecimal number. +# Use "uuidgen" to generate one if required. +# The default behavior is to generate a new UUID each time the guest is started. +#uuid = "XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX" + +# Initial memory allocation (MB) +memory = 128 + +# Maximum memory (MB) +# If this is greater than `memory' then the slack will start ballooned +# (this assumes guest kernel support for ballooning) +#maxmem = 512 + +# Number of VCPUS +vcpus = 2 + +# Network devices +# A list of 'vifspec' entries as described in +# docs/misc/xl-network-configuration.markdown +vif = [ '' ] + +# Disk Devices +# A list of `diskspec' entries as described in +# docs/misc/xl-disk-configuration.txt +disk = [ '/dev/vg/guest-volume,raw,xvda,rw' ] + +# Guest VGA console configuration, either SDL or VNC +sdl = 1 +#vnc = 1 diff -r 4900950d16bb -r e3bd1c4184e5 tools/examples/xlexample.pvlinux --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/examples/xlexample.pvlinux Thu Oct 27 09:55:14 2011 +0100 @@ -0,0 +1,44 @@ +# ===================================================================== +# Example PV Linux guest configuration +# ===================================================================== +# +# This is a fairly minimal example of what is required for a +# Paravirtualised Linux guest. For a more complete guide see + +# Guest name +name = "example.pvlinux" + +# 128-bit UUID for the domain as a hexadecimal number. +# Use "uuidgen" to generate one if required. +# The default behavior is to generate a new UUID each time the guest is started. +#uuid = "XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX" + +# Kernel image to boot +kernel = "/boot/vmlinuz" + +# Ramdisk (optional) +#ramdisk = "/boot/initrd.gz" + +# Kernel command line options +extra = "root=/dev/xvda1" + +# Initial memory allocation (MB) +memory = 128 + +# Maximum memory (MB) +# If this is greater than `memory' then the slack will start ballooned +# (this assumes guest kernel support for ballooning) +#maxmem = 512 + +# Number of VCPUS +vcpus = 2 + +# Network devices +# A list of 'vifspec' entries as described in +# docs/misc/xl-network-configuration.markdown +vif = [ '' ] + +# Disk Devices +# A list of `diskspec' entries as described in +# docs/misc/xl-disk-configuration.txt +disk = [ '/dev/vg/guest-volume,raw,xvda,rw' ] _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xensource.com http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xensource.com Tue Nov 01 17:09:41 2011 Return-path: Envelope-to: www-data@lists.xensource.com Delivery-date: Tue, 01 Nov 2011 17:09:41 -0700 Received: from localhost ([127.0.0.1] helo=lists.colo.xensource.com) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOOj-0002ac-IK; Tue, 01 Nov 2011 17:09:41 -0700 Received: from mail216.messagelabs.com ([85.158.143.99]) by lists.xensource.com with esmtp (Exim 4.43) id 1RLOB0-0000Uo-UG for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 16:55:31 -0700 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-216.messagelabs.com!1320191727!1839188!1 X-Originating-IP: [93.93.131.152] X-StarScan-Version: 6.4.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32150 invoked from network); 1 Nov 2011 23:55:27 -0000 Received: from xenbits.xen.org (HELO xenbits.xen.org) (93.93.131.152) by server-10.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 1 Nov 2011 23:55:27 -0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1RLOAx-0007hJ-9K for xen-changelog@lists.xensource.com; Tue, 01 Nov 2011 23:55:27 +0000 Message-Id: Date: Tue, 01 Nov 2011 23:55:26 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] docs: introduce an xl man page in pod format X-BeenThere: xen-changelog@lists.xensource.com X-Mailman-Version: 2.1.5 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: BK change log List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-changelog-bounces@lists.xensource.com Errors-To: xen-changelog-bounces@lists.xensource.com # HG changeset patch # User Stefano Stabellini # Date 1320173074 0 # Node ID 386f078de0ea55c1ff982ab045c4f8c2efe74d01 # Parent 7648496d4ff12d41a8445c2b125173906d25bce7 docs: introduce an xl man page in pod format This is the initial version of an xl man page, based on the old xm man page. Almost every command implemented in xl should be present, a notable exception are the tmem commands that are currently missing. Further improvements and clarifications to this man page are very welcome. Signed-off-by: Stefano Stabellini Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 7648496d4ff1 -r 386f078de0ea docs/man/xl.pod.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/docs/man/xl.pod.1 Tue Nov 01 18:44:34 2011 +0000 @@ -0,0 +1,805 @@ +=head1 NAME + +XL - Xen management tool, based on LibXenlight + +=head1 SYNOPSIS + +B I [I] + +=head1 DESCRIPTION + +The B program is the new tool for managing Xen guest +domains. The program can be used to create, pause, and shutdown +domains. It can also be used to list current domains, enable or pin +VCPUs, and attach or detach virtual block devices. +The old B tool is deprecated and should not be used. + +The basic structure of every B command is almost always: + +=over 2 + +B I [I] I + +=back + +Where I is one of the subcommands listed below, I +is the numeric domain id, or the domain name (which will be internally +translated to domain id), and I are subcommand specific +options. There are a few exceptions to this rule in the cases where +the subcommand in question acts on all domains, the entire machine, +or directly on the Xen hypervisor. Those exceptions will be clear for +each of those subcommands. + +=head1 NOTES + +Most B operations rely upon B and B: make +sure you start the script B at boot time to +initialize all the daemons needed by B. + +In the most common network configuration, you need to setup a bridge in dom0 +named B in order to have a working network in the guest domains. +Please refer to the documentation of your Linux distribution to know how to +setup the bridge. + +Most B commands require root privileges to run due to the +communications channels used to talk to the hypervisor. Running as +non root will return an error. + +=head1 DOMAIN SUBCOMMANDS + +The following subcommands manipulate domains directly. As stated +previously, most commands take I as the first parameter. + +=over 4 + +=item B [I] I + +The create subcommand requires a config file: see L for +full details of that file format and possible options. + +I can either be an absolute path to a file, or a relative +path to a file located in /etc/xen. + +Create will return B as the domain is started. This B mean the guest OS in the domain has actually booted, or is +available for input. + +B + +=over 4 + +=item B<-q>, B<--quiet> + +No console output. + +=item B<-f=FILE>, B<--defconfig=FILE> + +Use the given configuration file. + +=item B<-n>, B<--dryrun> + +Dry run - prints the resulting configuration in SXP but does not create +the domain. + +=item B<-p> + +Leave the domain paused after it is created. + +=item B<-c> + +Attach console to the domain as soon as it has started. This is +useful for determining issues with crashing domains. + +=back + +B + +=over 4 + +=item I + + xl create DebianLenny + +This creates a domain with the file /etc/xen/DebianLenny, and returns as +soon as it is run. + +=back + +=item B I + +Attach to domain I's console. If you've set up your domains to +have a traditional log in console this will look much like a normal +text log in screen. + +Use the key combination Ctrl+] to detach the domain console. + +=item B [I] I + +Attach to domain's VNC server, forking a vncviewer process. + +B + +=over 4 + +=item I<--autopass> + +Pass VNC password to vncviewer via stdin. + +=back + +=item B I + +Immediately terminate the domain I. This doesn't give the +domain OS any chance to react, and is the equivalent of ripping the +power cord out on a physical machine. In most cases you will want to +use the B command instead. + +=item B I + +Converts a domain name to a domain id. + +=item B I + +Converts a domain id to a domain name. + +=item B I I + +Change the domain name of I to I. + +=item B I [I] + +Dumps the virtual machine's memory for the specified domain to the +I specified, without pausing the domain. The dump file will +be written to a distribution specific directory for dump files. Such +as: /var/lib/xen/dump or /var/xen/dump. + +=item B [I<--long>] + +Displays the short help message (i.e. common commands). + +The I<--long> option prints out the complete set of B subcommands, +grouped by function. + +=item B [I] [I ...] + +Prints information about one or more domains. If no domains are +specified it prints out information about all domains. + + +B + +=over 4 + +=item B<-l>, B<--long> + +The output for B is not the table view shown below, but +instead presents the data in SXP compatible format. + +=item B<-Z>, B<--context> +Also prints the security labels. + +=item B<-v>, B<--verbose> + +Also prints the domain UUIDs, the shutdown reason and security labels. + +=back + +B + +An example format for the list is as follows: + + Name ID Mem VCPUs State Time(s) + Domain-0 0 750 4 r----- 11794.3 + win 1 1019 1 r----- 0.3 + linux 2 2048 2 r----- 5624.2 + +Name is the name of the domain. ID the numeric domain id. Mem is the +desired amount of memory to allocate to the domain (although it may +not be the currently allocated amount). VCPUs is the number of +virtual CPUs allocated to the domain. State is the run state (see +below). Time is the total run time of the domain as accounted for by +Xen. + +B + +The State field lists 6 states for a Xen domain, and which ones the +current domain is in. + +=over 4 + +=item B + +The domain is currently running on a CPU. + +=item B + +The domain is blocked, and not running or runnable. This can be caused +because the domain is waiting on IO (a traditional wait state) or has +gone to sleep because there was nothing else for it to do. + +=item B

+ +The domain has been paused, usually occurring through the administrator +running B. When in a paused state the domain will still +consume allocated resources like memory, but will not be eligible for +scheduling by the Xen hypervisor. + +=item B + +FIXME: Why would you ever see this state? + +=item B + +The domain has crashed, which is always a violent ending. Usually +this state can only occur if the domain has been configured not to +restart on crash. See L for more info. + +=item B + +The domain is in process of dying, but hasn't completely shutdown or +crashed. + +FIXME: Is this right? + +=back + +B + +=over 4 + +The Time column is deceptive. Virtual IO (network and block devices) +used by domains requires coordination by Domain0, which means that +Domain0 is actually charged for much of the time that a DomainU is +doing IO. Use of this time value to determine relative utilizations +by domains is thus very suspect, as a high IO workload may show as +less utilized than a high CPU workload. Consider yourself warned. + +=back + +=item B I I + +Specify the maximum amount of memory the domain is able to use, appending 't' +for terabytes, 'g' for gigabytes, 'm' for megabytes, 'k' for kilobytes and 'b' +for bytes. + +The mem-max value may not correspond to the actual memory used in the +domain, as it may balloon down its memory to give more back to the OS. + +=item B I I + +Set the domain's used memory using the balloon driver; append 't' for +terabytes, 'g' for gigabytes, 'm' for megabytes, 'k' for kilobytes and 'b' for +bytes. + +Because this operation requires cooperation from the domain operating +system, there is no guarantee that it will succeed. This command will +definitely not work unless the domain has the required paravirt +driver. + +B There is no good way to know in advance how small of a +mem-set will make a domain unstable and cause it to crash. Be very +careful when using this command on running domains. + +=item B [I] I I + +Migrate a domain to another host machine. By default B relies on ssh as a +transport mechanism between the two hosts. + +B + +=over 4 + +=item B<-s> I + +Use instead of ssh. String will be passed to sh. If empty, run + instead of ssh xl migrate-receive [-d -e]. + +=item B<-e> + +On the new host, do not wait in the background (on ) for the death of the +domain. + +=item B<-C> I + +Send instead of config file from creation. + +=back + +=item B I + +Pause a domain. When in a paused state the domain will still consume +allocated resources such as memory, but will not be eligible for +scheduling by the Xen hypervisor. + +=item B [I] I + +Reboot a domain. This acts just as if the domain had the B +command run from the console. The command returns as soon as it has +executed the reboot action, which may be significantly before the +domain actually reboots. + +The behavior of what happens to a domain when it reboots is set by the +B parameter of the xldomain.cfg file when the domain was +created. + +=item B [I] [I] I + +Build a domain from an B state file. See B for more info. + +B + +=over 4 + +=item B<-p> + +Do not unpause domain after restoring it. + +=item B<-e> + +Do not wait in the background for the death of the domain on the new host. + +=item B<-d> + +Enable debug messages. + +=back + +=item B [I] I I [I] + +Saves a running domain to a state file so that it can be restored +later. Once saved, the domain will no longer be running on the +system, unless the -c option is used. +B restores from this checkpoint file. +Passing a config file argument allows the user to manually select the VM config +file used to create the domain. + + +=over 4 + +=item B<-c> + +Leave domain running after creating the snapshot. + +=back + + +=item B [I] I + +Gracefully shuts down a domain. This coordinates with the domain OS +to perform graceful shutdown, so there is no guarantee that it will +succeed, and may take a variable length of time depending on what +services must be shutdown in the domain. The command returns +immediately after signally the domain unless that B<-w> flag is used. + +The behavior of what happens to a domain when it reboots is set by the +B parameter of the xldomain.cfg file when the domain was +created. + +B + +=over 4 + +=item B<-w> + +Wait for the domain to complete shutdown before returning. + +=back + +=item B I I + +Send a I signal to the domain. For more +information on available magic sys req operations, see sysrq.txt in +your Linux Kernel sources. + +=item B I + +Moves a domain out of the paused state. This will allow a previously +paused domain to now be eligible for scheduling by the Xen hypervisor. + +=item B I I + +Enables the I virtual CPUs for the domain in question. +Like mem-set, this command can only allocate up to the maximum virtual +CPU count configured at boot for the domain. + +If the I is smaller than the current number of active +VCPUs, the highest number VCPUs will be hotplug removed. This may be +important for pinning purposes. + +Attempting to set the VCPUs to a number larger than the initially +configured VCPU count is an error. Trying to set VCPUs to < 1 will be +quietly ignored. + +Because this operation requires cooperation from the domain operating +system, there is no guarantee that it will succeed. This command will +not work with a full virt domain. + +=item B [I] + +Lists VCPU information for a specific domain. If no domain is +specified, VCPU information for all domains will be provided. + +=item B I I I + +Pins the VCPU to only run on the specific CPUs. The keyword +B can be used to apply the I list to all VCPUs in the +domain. + +Normally VCPUs can float between available CPUs whenever Xen deems a +different run state is appropriate. Pinning can be used to restrict +this, by ensuring certain VCPUs can only run on certain physical +CPUs. + +=item B I I