libxl: Rename libxl__device_{nic,channel}_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 <Ian.Jackson@eu.citrix.com>
Reviewed-by: Wei Liu <wei.liu2@citrix.com>
This commit is contained in:
Ian Jackson authored and Ian Jackson committed 2016-06-06 15:05:28 +01:00
1 parent 1176a0a7e4
commit b7c46a67bd
1 file changed
+6 -6
+6 -6
View File
@@ -3470,7 +3470,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)
{
@@ -3533,7 +3533,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;
@@ -3568,7 +3568,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;
}
@@ -3818,7 +3818,7 @@ int libxl__init_console_from_channel(libxl__gc *gc,
return 0;
}
static int libxl__device_channel_from_xs_be(libxl__gc *gc,
static int libxl__device_channel_from_xenstore(libxl__gc *gc,
const char *be_path,
libxl_device_channel *channel)
{
@@ -3827,7 +3827,7 @@ static int libxl__device_channel_from_xs_be(libxl__gc *gc,
libxl_device_channel_init(channel);
/* READ_BACKEND is from libxl__device_nic_from_xs_be above */
/* READ_BACKEND is from libxl__device_nic_from_xenstore above */
channel->name = READ_BACKEND(NOGC, "name");
tmp = READ_BACKEND(gc, "connection");
if (!strcmp(tmp, "pty")) {
@@ -3882,7 +3882,7 @@ static int libxl__append_channel_list(libxl__gc *gc,
}
*channels = tmp;
next = *channels + *nchannels + devid;
rc = libxl__device_channel_from_xs_be(gc, be_path, next);
rc = libxl__device_channel_from_xenstore(gc, be_path, next);
if (rc) goto out;
next->devid = devid;
devid++;
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.