[igt-dev] [PATCH i-g-t v2] chamelium: Handle errors when fetching AdapterAllowed

[Knop, Ryszard]

LGTM

Reviewed-by: Ryszard Knop <ryszard.knop at intel.com>

On Wed, 2023-01-04 at 15:10 +0200, Petri Latvala wrote:
> 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 at intel.com>
> Cc: Ryszard Knop <ryszard.knop at 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;