From: Ian Jackson Date: Wed, 4 May 2016 15:18:36 +0000 (+0100) Subject: libxl: Rename libxl__device_nic_from_xs_be to _from_xenstore X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=0eb5ef298605a6cbf3de1bf15eb1b9bc856066a9;p=xen.git libxl: Rename libxl__device_nic_from_xs_be to _from_xenstore We are going to change these functions to expect, and be passed, a /libxl path. So it is wrong that they are called _from_xs_be. Neither function reads anything which isn't found in both places, so we can and will change the call sites later. The only remaining function in libxl called *_from_xs_be relates to PCI devices, for which the backend domain is hardcoded to 0 throughout the libxl_pci.c. No functional change. This is part of XSA-178. Signed-off-by: Ian Jackson Reviewed-by: Wei Liu --- diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 362fb222be..5a9a05e382 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -3030,7 +3030,7 @@ out: return; } -static int libxl__device_nic_from_xs_be(libxl__gc *gc, +static int libxl__device_nic_from_xenstore(libxl__gc *gc, const char *be_path, libxl_device_nic *nic) { @@ -3095,7 +3095,7 @@ int libxl_devid_to_device_nic(libxl_ctx *ctx, uint32_t domid, if (!path) goto out; - rc = libxl__device_nic_from_xs_be(gc, path, nic); + rc = libxl__device_nic_from_xenstore(gc, path, nic); if (rc) goto out; rc = 0; @@ -3130,7 +3130,7 @@ static int libxl__append_nic_list_of_type(libxl__gc *gc, for (; pnic < pnic_end; pnic++, dir++) { const char *p; p = libxl__sprintf(gc, "%s/%s", be_path, *dir); - rc = libxl__device_nic_from_xs_be(gc, p, pnic); + rc = libxl__device_nic_from_xenstore(gc, p, pnic); if (rc) goto out; pnic->backend_domid = 0; }