public inbox for igt-dev@lists.freedesktop.org
 help / color / mirror / Atom feed
* [igt-dev] [PATCH i-g-t v2] chamelium: Handle errors when fetching AdapterAllowed
@ 2023-01-04 13:10 Petri Latvala
  2023-01-04 14:30 ` Knop, Ryszard
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Petri Latvala @ 2023-01-04 13:10 UTC (permalink / raw)
  To: igt-dev; +Cc: Petri Latvala

Not setting AdapterAllowed in .igtrc should be considered a valid
configuration. The default value of 'false' from
g_key_file_get_boolean when the field is missing is exactly what we
want to use, and storing the missing field error in the 'error'
variable leads to an error such as

(kms_chamelium:1713) igt_chamelium-WARNING: Failed to read chamelium port ID for DP-3: Key file does not have key “AdapterAllowed” in group “Chamelium:HDMI-A-2”

v2: Check if the field exists first to get syntax validation
    happening, handle the error accordingly by bailing out (Ryszard)

Signed-off-by: Petri Latvala <petri.latvala@intel.com>
Cc: Ryszard Knop <ryszard.knop@intel.com>
---
 lib/igt_chamelium.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/igt_chamelium.c b/lib/igt_chamelium.c
index 79920de1..a235f3c8 100644
--- a/lib/igt_chamelium.c
+++ b/lib/igt_chamelium.c
@@ -2476,8 +2476,15 @@ static bool chamelium_read_port_mappings(struct chamelium *chamelium,
 			goto out;
 		}
 
-		port->adapter_allowed = g_key_file_get_boolean(igt_key_file, group,
-		                                               "AdapterAllowed", &error);
+		if (g_key_file_has_key(igt_key_file, group, "AdapterAllowed", NULL)) {
+			port->adapter_allowed = g_key_file_get_boolean(igt_key_file, group,
+								       "AdapterAllowed", &error);
+			if (error) {
+				igt_warn("Unable to read AdapterAllowed: %s\n", error->message);
+				ret = false;
+				goto out;
+			}
+		}
 
 		for (j = 0;
 		     j < res->count_connectors && !port->connector_id;
-- 
2.30.2

^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-01-04 22:41 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-04 13:10 [igt-dev] [PATCH i-g-t v2] chamelium: Handle errors when fetching AdapterAllowed Petri Latvala
2023-01-04 14:30 ` Knop, Ryszard
2023-01-04 17:44 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
2023-01-04 22:41 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox