diff mbox

uefi: Don't abort on non-UEFI firmware

Message ID 1398324889.955361.308311874027.1.gpush@pablo
State Accepted
Headers show

Commit Message

Jeremy Kerr April 24, 2014, 7:34 a.m. UTC
It's not an error to have non-UEFI firmware.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

---
 src/uefi/securebootcert/securebootcert.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Colin Ian King April 24, 2014, 7:39 a.m. UTC | #1
On 24/04/14 08:34, Jeremy Kerr wrote:
> It's not an error to have non-UEFI firmware.
> 
> Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
> 
> ---
>  src/uefi/securebootcert/securebootcert.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/uefi/securebootcert/securebootcert.c b/src/uefi/securebootcert/securebootcert.c
> index 8929c44..5a860f8 100644
> --- a/src/uefi/securebootcert/securebootcert.c
> +++ b/src/uefi/securebootcert/securebootcert.c
> @@ -321,7 +321,7 @@ static int securebootcert_init(fwts_framework *fw)
>  {
>  	if (fwts_firmware_detect() != FWTS_FIRMWARE_UEFI) {
>  		fwts_log_info(fw, "Cannot detect any UEFI firmware. Aborted.");
> -		return FWTS_ABORTED;
> +		return FWTS_SKIP;
>  	}
>  
>  	if (!fwts_uefi_efivars_iface_exist()) {
> 
Acked-by: Colin Ian King <colin.king@canonical.com>
Jeremy Kerr April 24, 2014, 7:41 a.m. UTC | #2
Hi all,

>> @@ -321,7 +321,7 @@ static int securebootcert_init(fwts_framework *fw)
>>  {
>>  	if (fwts_firmware_detect() != FWTS_FIRMWARE_UEFI) {
>>  		fwts_log_info(fw, "Cannot detect any UEFI firmware. Aborted.");
>> -		return FWTS_ABORTED;
>> +		return FWTS_SKIP;
>>  	}
>>  
>>  	if (!fwts_uefi_efivars_iface_exist()) {

Just so I get this right in future - what's the conceptual difference
between a skip and an abort? Abort looked like more of a failure to me,
hence the change. But is there a more solid definition here?

Thanks!


Jeremy
Colin Ian King April 24, 2014, 7:44 a.m. UTC | #3
On 24/04/14 08:41, Jeremy Kerr wrote:
> Hi all,
> 
>>> @@ -321,7 +321,7 @@ static int securebootcert_init(fwts_framework *fw)
>>>  {
>>>  	if (fwts_firmware_detect() != FWTS_FIRMWARE_UEFI) {
>>>  		fwts_log_info(fw, "Cannot detect any UEFI firmware. Aborted.");
>>> -		return FWTS_ABORTED;
>>> +		return FWTS_SKIP;
>>>  	}
>>>  
>>>  	if (!fwts_uefi_efivars_iface_exist()) {
> 
> Just so I get this right in future - what's the conceptual difference
> between a skip and an abort? Abort looked like more of a failure to me,
> hence the change. But is there a more solid definition here?

Abort was to stop further sub-tests from running, it's like a hard stop
for subsequent sub-tests.  For example, if you run a test that requires
a specific resource common in all the sub-tests.  A SKIP is just a
notional concept to skip over a test because something can't be tested
and it registered as "can't test it, not a pass and not a fail"

> 
> Thanks!
> 
> 
> Jeremy
>
Alex Hung April 24, 2014, 7:49 a.m. UTC | #4
On 04/24/2014 03:34 PM, Jeremy Kerr wrote:
> It's not an error to have non-UEFI firmware.
>
> Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
>
> ---
>   src/uefi/securebootcert/securebootcert.c |    2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/uefi/securebootcert/securebootcert.c b/src/uefi/securebootcert/securebootcert.c
> index 8929c44..5a860f8 100644
> --- a/src/uefi/securebootcert/securebootcert.c
> +++ b/src/uefi/securebootcert/securebootcert.c
> @@ -321,7 +321,7 @@ static int securebootcert_init(fwts_framework *fw)
>   {
>   	if (fwts_firmware_detect() != FWTS_FIRMWARE_UEFI) {
>   		fwts_log_info(fw, "Cannot detect any UEFI firmware. Aborted.");
> -		return FWTS_ABORTED;
> +		return FWTS_SKIP;
>   	}
>
>   	if (!fwts_uefi_efivars_iface_exist()) {
>

Acked-by: Alex Hung <alex.hung@canoniocal.com>
diff mbox

Patch

diff --git a/src/uefi/securebootcert/securebootcert.c b/src/uefi/securebootcert/securebootcert.c
index 8929c44..5a860f8 100644
--- a/src/uefi/securebootcert/securebootcert.c
+++ b/src/uefi/securebootcert/securebootcert.c
@@ -321,7 +321,7 @@  static int securebootcert_init(fwts_framework *fw)
 {
 	if (fwts_firmware_detect() != FWTS_FIRMWARE_UEFI) {
 		fwts_log_info(fw, "Cannot detect any UEFI firmware. Aborted.");
-		return FWTS_ABORTED;
+		return FWTS_SKIP;
 	}
 
 	if (!fwts_uefi_efivars_iface_exist()) {