add cmdline option to retrieve storage device info

Author: rawoul

firehose.c

@@ -101,7 +101,7 @@ static void firehose_response_log(xmlNode *node)
 	xmlChar *value;
 
 	value = xmlGetProp(node, (xmlChar*)"value");
-	dbg("LOG: %s", value);
+	printf("[LOG] %s\n", value);
 }
 
 static int firehose_wait(int fd, int timeout)
@@ -573,7 +573,7 @@ static int firehose_set_bootable(int fd, int part)
 	return 0;
 }
 
-static int firehose_reset(int fd)
+int firehose_reset(int fd)
 {
 	xmlNode *root;
 	xmlNode *node;
@@ -595,9 +595,8 @@ static int firehose_reset(int fd)
 	return firehose_read(fd, -1, firehose_nop_parser);
 }
 
-int firehose_run(int fd)
+int firehose_init(int fd)
 {
-	int bootable;
 	int ret;
 
 	ret = firehose_wait(fd, 10000);
@@ -607,11 +606,47 @@ int firehose_run(int fd)
 	while (firehose_read(fd, 100, NULL) != -ETIMEDOUT)
 		;
 
-	ret = firehose_nop(fd);
+	return 0;
+}
+
+int firehose_get_storage_info(int fd, int part)
+{
+	xmlNode *root;
+	xmlNode *node;
+	xmlDoc *doc;
+	int ret;
+
+	ret = firehose_configure(fd, false);
 	if (ret)
 		return ret;
 
-	if(ufs_need_provisioning()) {
+	doc = xmlNewDoc((xmlChar*)"1.0");
+	root = xmlNewNode(NULL, (xmlChar*)"data");
+	xmlDocSetRootElement(doc, root);
+
+	node = xmlNewChild(root, NULL, (xmlChar*)"getstorageinfo", NULL);
+	xml_setpropf(node, "physical_partition_number", "%d", part);
+
+	ret = firehose_write(fd, doc);
+	xmlFreeDoc(doc);
+	if (ret < 0)
+		return ret;
+
+	ret = firehose_read(fd, -1, firehose_nop_parser);
+	if (ret) {
+		warnx("failed to mark partition %d as bootable", part);
+		return -1;
+	}
+
+	return 0;
+}
+
+int firehose_provision(int fd)
+{
+	int bootable;
+	int ret;
+
+	if (ufs_need_provisioning()) {
 		ret = firehose_configure(fd, true);
 		if (ret)
 			return ret;

qdl.c

@@ -61,6 +61,7 @@ enum {
 };
 
 bool qdl_debug;
+bool qdl_get_info;
 const char **qdl_search_path;
 
 static int detect_type(const char *xml_file)
@@ -266,9 +267,11 @@ int main(int argc, char **argv)
 	int fd;
 	int opt;
 	bool qdl_finalize_provisioning = false;
+	bool qdl_get_info = false;
 
 	static struct option options[] = {
 		{"debug", no_argument, 0, 'd'},
+		{"info", no_argument, 0, 'i'},
 		{"finalize-provisioning", no_argument, 0, 'l'},
 		{"search-path", required_argument, 0, 's'},
 		{0, 0, 0, 0}
@@ -279,6 +282,9 @@ int main(int argc, char **argv)
 		case 'd':
 			qdl_debug = true;
 			break;
+		case 'i':
+			qdl_get_info = true;
+			break;
 		case 'l':
 			qdl_finalize_provisioning = true;
 			break;
@@ -291,19 +297,18 @@ int main(int argc, char **argv)
 		}
 	}
 
-	/* at least 2 non optional args required */
-	if ((optind + 2) > argc) {
+	if ((optind + 1) > argc) {
 		print_usage();
 		return 1;
 	}
 
-	prog_mbn = argv[optind++];
+	prog_mbn = argv[optind];
 
 	/* default to cwd as search path */
 	if (!qdl_search_path)
 		add_search_path(".");
 
-	do {
+	while (++optind < argc) {
 		type = detect_type(argv[optind]);
 		if (type < 0 || type == QDL_FILE_UNKNOWN)
 			errx(1, "failed to detect file type of %s\n", argv[optind]);
@@ -328,7 +333,7 @@ int main(int argc, char **argv)
 			errx(1, "%s type not yet supported", argv[optind]);
 			break;
 		}
-	} while (++optind < argc);
+	}
 
 	fd = tty_open(&tios);
 	if (fd < 0)
@@ -338,7 +343,21 @@ int main(int argc, char **argv)
 	if (ret < 0)
 		goto out;
 
-	ret = firehose_run(fd);
+	ret = firehose_init(fd);
+	if (ret < 0)
+		goto out;
+
+	if (qdl_get_info) {
+		ret = firehose_get_storage_info(fd, 65210);
+		if (ret < 0)
+			goto out;
+	} else {
+		ret = firehose_provision(fd);
+		if (ret < 0)
+			goto out;
+
+		firehose_reset(fd);
+	}
 
 out:
 	ret = tcsetattr(fd, TCSANOW, &tios);

qdl.h

@@ -6,7 +6,10 @@
 #include "patch.h"
 #include "program.h"
 
-int firehose_run(int fd);
+int firehose_init(int fd);
+int firehose_reset(int fd);
+int firehose_get_storage_info(int fd, int part);
+int firehose_provision(int fd);
 int sahara_run(int fd, char *prog_mbn);
 void print_hex_dump(const char *prefix, const void *buf, size_t len);
 int open_in_search_path(const char *filename, int flags);