From: Simon Horman Subject: [rfc 8/8] qemu-xen: pass-through: rename vslot to vdevfn and vslots to vdevfns Date: Wed, 17 Jun 2009 18:07:44 +1000 Message-ID: <20090617080758.941171054@vergenet.net> References: <20090617080736.631945993@vergenet.net> Return-path: Content-Disposition: inline; filename=xm-rename-vslot-vdevfn.patch List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com Cc: Ian Jackson , Akio Takebe , Masaki Kanno , Dexuan Cui List-Id: xen-devel@lists.xenproject.org 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 Cc: Masaki Kanno Signed-off-by: Simon Horman --- 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); --