path: root/discover/device-handler.h
diff options
authorNeelesh Gupta <>2013-10-28 12:45:21 +0530
committerJeremy Kerr <>2013-11-06 16:34:26 +0800
commitb8e53cb4b96eb17dc7fa0ffc505dfebae37e6cbf (patch)
tree2049ee274a9a7872366da8b95dbecaffc215df3a /discover/device-handler.h
parentf385e8cacbc574e213b0805a8d383373f29a8058 (diff)
discover: Change parsers to explicitly request configuration files
Add a new function parser_request_url() to read the data from configuration files present remotely. We deprecate iterate_parser_files() and download_config() functions along with the 'filenames' and 'method' members of the 'parser' structure so that individual parsers would now require to request the configuration files data from the parser code and doesn't necessarily export the list of configuration files. Add the support to handle incoming DHCP event, done by passing all the relevant environment variables of the udhcpc to the discover code. Also, update the pxe parser code to populate the list of configuration file names as per PXELINUX convention of fallback names using mac and ip addresses of the booting machine. Signed-off-by: Neelesh Gupta <> Signed-off-by: Jeremy Kerr <>
Diffstat (limited to 'discover/device-handler.h')
1 files changed, 4 insertions, 14 deletions
diff --git a/discover/device-handler.h b/discover/device-handler.h
index 6b36e07..56d585a 100644
--- a/discover/device-handler.h
+++ b/discover/device-handler.h
@@ -14,16 +14,6 @@ struct event;
struct device;
struct waitset;
-enum conf_method {
- CONF_METHOD_LOCAL_FILE, /* discover by looking at local files on this
- block device */
- CONF_METHOD_DHCP, /* configuration from a DHCP response */
struct discover_device {
struct device *device;
@@ -64,7 +54,6 @@ struct discover_context {
struct discover_device *device;
struct list boot_options;
struct pb_url *conf_url;
- enum conf_method method;
void *test_data;
@@ -82,10 +71,11 @@ struct discover_device *discover_device_create(struct device_handler *handler,
void device_handler_add_device(struct device_handler *handler,
struct discover_device *device);
int device_handler_discover(struct device_handler *handler,
- struct discover_device *dev, enum conf_method method);
+ struct discover_device *dev);
+int device_handler_dhcp(struct device_handler *handler,
+ struct discover_device *dev, struct event *event);
int device_handler_conf(struct device_handler *handler,
- struct discover_device *dev, struct pb_url *url,
- enum conf_method method);
+ struct discover_device *dev, struct pb_url *url);
void device_handler_remove(struct device_handler *handler,
struct discover_device *device);
OpenPOWER on IntegriCloud