Commit 5584ea25 authored by Juergen Gross's avatar Juergen Gross Committed by Boris Ostrovsky
Browse files

xen: modify xenstore watch event interface 



Today a Xenstore watch event is delivered via a callback function
declared as:

void (*callback)(struct xenbus_watch *,
                 const char **vec, unsigned int len);

As all watch events only ever come with two parameters (path and token)
changing the prototype to:

void (*callback)(struct xenbus_watch *,
                 const char *path, const char *token);

is the natural thing to do.

Apply this change and adapt all users.

Cc: konrad.wilk@oracle.com
Cc: roger.pau@citrix.com
Cc: wei.liu2@citrix.com
Cc: paul.durrant@citrix.com
Cc: netdev@vger.kernel.org

Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
Reviewed-by: default avatarPaul Durrant <paul.durrant@citrix.com>
Reviewed-by: default avatarWei Liu <wei.liu2@citrix.com>
Reviewed-by: default avatarRoger Pau Monné <roger.pau@citrix.com>
Reviewed-by: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
parent 332f791d

drivers/block/xen-blkback/xenbus.c

+3 −3
Original line number Diff line number Diff line
@@ -38,8 +38,8 @@ struct backend_info { 
static struct kmem_cache *xen_blkif_cachep;

static void connect(struct backend_info *);

static int connect_ring(struct backend_info *);

static void backend_changed(struct xenbus_watch *, const char **,

			    unsigned int);

static void backend_changed(struct xenbus_watch *, const char *,

			    const char *);

static void xen_blkif_free(struct xen_blkif *blkif);

static void xen_vbd_free(struct xen_vbd *vbd);
@@ -661,7 +661,7 @@ fail: 
 * ready, connect.

 */

static void backend_changed(struct xenbus_watch *watch,

			    const char **vec, unsigned int len)

			    const char *path, const char *token)

{

	int err;

	unsigned major;

drivers/net/xen-netback/xenbus.c

+4 −4
Original line number Diff line number Diff line
@@ -734,7 +734,7 @@ static int xen_net_read_mac(struct xenbus_device *dev, u8 mac[]) 
}



static void xen_net_rate_changed(struct xenbus_watch *watch,

				const char **vec, unsigned int len)

				 const char *path, const char *token)

{

	struct xenvif *vif = container_of(watch, struct xenvif, credit_watch);

	struct xenbus_device *dev = xenvif_to_xenbus_device(vif);
@@ -791,7 +791,7 @@ static void xen_unregister_credit_watch(struct xenvif *vif) 
}



static void xen_mcast_ctrl_changed(struct xenbus_watch *watch,

				   const char **vec, unsigned int len)

				   const char *path, const char *token)

{

	struct xenvif *vif = container_of(watch, struct xenvif,

					  mcast_ctrl_watch);
@@ -866,8 +866,8 @@ static void unregister_hotplug_status_watch(struct backend_info *be) 
}



static void hotplug_status_changed(struct xenbus_watch *watch,

				   const char **vec,

				   unsigned int vec_size)

				   const char *path,

				   const char *token)

{

	struct backend_info *be = container_of(watch,

					       struct backend_info,

drivers/xen/cpu_hotplug.c

+2 −3
Original line number Diff line number Diff line
@@ -68,13 +68,12 @@ static void vcpu_hotplug(unsigned int cpu) 
}



static void handle_vcpu_hotplug_event(struct xenbus_watch *watch,

					const char **vec, unsigned int len)

				      const char *path, const char *token)

{

	unsigned int cpu;

	char *cpustr;

	const char *node = vec[XS_WATCH_PATH];



	cpustr = strstr(node, "cpu/");

	cpustr = strstr(path, "cpu/");

	if (cpustr != NULL) {

		sscanf(cpustr, "cpu/%u", &cpu);

		vcpu_hotplug(cpu);

drivers/xen/manage.c

+3 −3
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ static struct shutdown_handler shutdown_handlers[] = { 
};



static void shutdown_handler(struct xenbus_watch *watch,

			     const char **vec, unsigned int len)

			     const char *path, const char *token)

{

	char *str;

	struct xenbus_transaction xbt;
@@ -266,8 +266,8 @@ static void shutdown_handler(struct xenbus_watch *watch, 
}



#ifdef CONFIG_MAGIC_SYSRQ

static void sysrq_handler(struct xenbus_watch *watch, const char **vec,

			  unsigned int len)

static void sysrq_handler(struct xenbus_watch *watch, const char *path,

			  const char *token)

{

	char sysrq_key = '\0';

	struct xenbus_transaction xbt;

drivers/xen/xen-balloon.c

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ static int register_balloon(struct device *dev); 


/* React to a change in the target key */

static void watch_target(struct xenbus_watch *watch,

			 const char **vec, unsigned int len)

			 const char *path, const char *token)

{

	unsigned long long new_target;

	int err;

CRA Git | Maintained and supported by SUSTech CRA and CCSE