]> xenbits.xensource.com Git - xen.git/commitdiff
libxl: Rename libxl__device_nic_from_xs_be to _from_xenstore
authorIan Jackson <ian.jackson@eu.citrix.com>
Wed, 4 May 2016 15:18:36 +0000 (16:18 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Mon, 6 Jun 2016 16:21:47 +0000 (17:21 +0100)
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>
tools/libxl/libxl.c

index 38f0ef5764e6d3d4373dda4af946c6e53ad013a6..5e184c54c6dd8bf2239f318bfd474c7b39641a6d 100644 (file)
@@ -2990,7 +2990,7 @@ out:
     return;
 }
 
-static void libxl__device_nic_from_xs_be(libxl__gc *gc,
+static void libxl__device_nic_from_xenstore(libxl__gc *gc,
                                          const char *be_path,
                                          libxl_device_nic *nic)
 {
@@ -3049,7 +3049,7 @@ int libxl_devid_to_device_nic(libxl_ctx *ctx, uint32_t domid,
     if (!path)
         goto out;
 
-    libxl__device_nic_from_xs_be(gc, path, nic);
+    libxl__device_nic_from_xenstore(gc, path, nic);
 
     rc = 0;
 out:
@@ -3083,7 +3083,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);
-            libxl__device_nic_from_xs_be(gc, p, pnic);
+            libxl__device_nic_from_xenstore(gc, p, pnic);
             pnic->backend_domid = 0;
         }
     }