[Xen-devel] [rfc 8/8] qemu-xen: pass-through: rename vslot to vdevfn and vslots to vdevfns

[Simon Horman <horms@xxxxxxxxxxxx>]

This is a noisy patch that makes no functional changes.
It renames vslot to vdevfn and vslots to vdevfns.

This breaks compatibility with xend and as a xenstore entry has been renamed.
A companion patch for that code will be posted separately.

Cc: Dexuan Cui <dexuan.cui@xxxxxxxxx>
Cc: Masaki Kanno <kanno.masaki@xxxxxxxxxxxxxx>
Signed-off-by: Simon Horman <horms@xxxxxxxxxxxx>

--- 

Co-Dependent on
"xend: pass-through: rename vslot to vdevfn and vslots to vdevfns"

Index: ioemu-remote/qemu-xen.h
===================================================================
--- ioemu-remote.orig/qemu-xen.h        2009-06-15 11:26:01.000000000 +1000
+++ ioemu-remote/qemu-xen.h     2009-06-15 11:26:10.000000000 +1000
@@ -71,7 +71,7 @@ void xenstore_record_dm_state(const char
 void xenstore_check_new_media_present(int timeout);
 void xenstore_write_vncport(int vnc_display);
 void xenstore_read_vncpasswd(int domid, char *pwbuf, size_t pwbuflen);
-void xenstore_write_vslots(char *vslots);
+void xenstore_write_vdevfns(char *vdevfns);
 
 int xenstore_domain_has_devtype_danger(struct xs_handle *handle,
                                 const char *devtype);
Index: ioemu-remote/xenstore.c
===================================================================
--- ioemu-remote.orig/xenstore.c        2009-06-15 11:26:01.000000000 +1000
+++ ioemu-remote/xenstore.c     2009-06-15 11:26:10.000000000 +1000
@@ -971,18 +971,18 @@ void xenstore_write_vncport(int display)
     free(buf);
 }
 
-void xenstore_write_vslots(char *vslots)
+void xenstore_write_vdevfns(char *vdevfns)
 {
     char *path = NULL;
     int pci_devid = 0;
 
     if (pasprintf(&path, 
-                  "/local/domain/0/backend/pci/%u/%u/vslots", domid, 
pci_devid) == -1) {
-        fprintf(logfile, "out of memory when updating vslots.\n");
+                  "/local/domain/0/backend/pci/%u/%u/vdevfns", domid, 
pci_devid) == -1) {
+        fprintf(logfile, "out of memory when updating vdevfns.\n");
         goto out;
     }
-    if (!xs_write(xsh, XBT_NULL, path, vslots, strlen(vslots)))
-        fprintf(logfile, "error updating vslots \n");
+    if (!xs_write(xsh, XBT_NULL, path, vdevfns, strlen(vdevfns)))
+        fprintf(logfile, "error updating vdevfns \n");
 
  out:
     free(path);

-- 

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel