Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b88c52d0 authored by SeongJae Park's avatar SeongJae Park Committed by Greg Kroah-Hartman
Browse files

xen/xenbus/xen_bus_type: Support will_handle watch callback 



commit be987200fbaceaef340872841d4f7af2c5ee8dc3 upstream.

This commit adds support of the 'will_handle' watch callback for
'xen_bus_type' users.

This is part of XSA-349

Cc: stable@vger.kernel.org
Signed-off-by: default avatarSeongJae Park <sjpark@amazon.de>
Reported-by: default avatarMichael Kurth <mku@amazon.de>
Reported-by: default avatarPawel Wieczorkiewicz <wipawel@amazon.de>
Reviewed-by: default avatarJuergen Gross <jgross@suse.com>
Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3a36e4af

drivers/xen/xenbus/xenbus.h

+2 −0
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ struct xen_bus_type { 
	int (*get_bus_id)(char bus_id[XEN_BUS_ID_SIZE], const char *nodename);

	int (*probe)(struct xen_bus_type *bus, const char *type,

		     const char *dir);

	bool (*otherend_will_handle)(struct xenbus_watch *watch,

				     const char *path, const char *token);

	void (*otherend_changed)(struct xenbus_watch *watch, const char *path,

				 const char *token);

	struct bus_type bus;

drivers/xen/xenbus/xenbus_probe.c

+2 −1
Original line number Diff line number Diff line
@@ -136,7 +136,8 @@ static int watch_otherend(struct xenbus_device *dev) 
		container_of(dev->dev.bus, struct xen_bus_type, bus);



	return xenbus_watch_pathfmt(dev, &dev->otherend_watch,

				    NULL, bus->otherend_changed,

				    bus->otherend_will_handle,

				    bus->otherend_changed,

				    "%s/%s", dev->otherend, "state");

}