diff mbox series

[v2,01/10] main: Move device_node setting before parse_options

Message ID 20181123044019.633814-2-amitay@ozlabs.org
State Accepted
Headers show
Series Convert more commands to path based targeting | expand

Checks

Context Check Description
snowpatch_ozlabs/apply_patch success master/apply_patch Successfully applied
snowpatch_ozlabs/build-multiarch success Test build-multiarch on branch master

Commit Message

Amitay Isaacs Nov. 23, 2018, 4:40 a.m. UTC 
Parsing -l options requires device_node to be set.  It is used in
pir_map() to map Linux CPU to proc/core/thread.

Signed-off-by: Amitay Isaacs <amitay@ozlabs.org>
---
 src/main.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/src/main.c b/src/main.c
index 961d850..45ecd6a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -502,6 +502,9 @@  static bool parse_options(int argc, char *argv[])
 	if (l_count) {
 		int pir = -1, i, chip, core, thread;
 
+		if (!device_node)
+			return false;
+
 		for (i = 0; i < MAX_LINUX_CPUS; i++) {
 			if (l_list[i] == 1) {
 				pir = get_pir(i);
@@ -730,6 +733,9 @@  int main(int argc, char *argv[])
 
 	backend = default_backend();
 
+	if (!device_node)
+		device_node = default_target(backend);
+
 	if (!parse_options(argc, argv))
 		return 1;
 
@@ -738,9 +744,6 @@  int main(int argc, char *argv[])
 		return 1;
 	}
 
-	if (!device_node)
-		device_node = default_target(backend);
-
 	/* Disable unselected targets */
 	if (!target_selection())
 		return 1;