diff mbox

[U-Boot,v1] gpt: Fix uuid string format

Message ID 20170227141115.49050-1-andriy.shevchenko@linux.intel.com
State Accepted
Commit 9da52f8f67b32a21a687602681f6b6b6b7df480b
Delegated to: Tom Rini
Headers show

Commit Message

Andy Shevchenko Feb. 27, 2017, 2:11 p.m. UTC
From: Vincent Tinelli <vincent.tinelli@intel.com>

Change GPT UUID string format from UUID to GUID per specification.

Signed-off-by: Vincent Tinelli <vincent.tinelli@intel.com>
---
 cmd/gpt.c       | 2 +-
 disk/part_efi.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Simon Glass March 3, 2017, 4:52 a.m. UTC | #1
Hi Andy,

On 27 February 2017 at 07:11, Andy Shevchenko
<andriy.shevchenko@linux.intel.com> wrote:
> From: Vincent Tinelli <vincent.tinelli@intel.com>
>
> Change GPT UUID string format from UUID to GUID per specification.
>
> Signed-off-by: Vincent Tinelli <vincent.tinelli@intel.com>
> ---
>  cmd/gpt.c       | 2 +-
>  disk/part_efi.c | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)

Reviewed-by: Simon Glass <sjg@chromium.org>

How about also a patch to add comments to that enum in uuid.h?

- Simon
Andy Shevchenko March 3, 2017, 3:18 p.m. UTC | #2
On Fri, Mar 3, 2017 at 6:52 AM, Simon Glass <sjg@chromium.org> wrote:
> Hi Andy,
>
> On 27 February 2017 at 07:11, Andy Shevchenko
> <andriy.shevchenko@linux.intel.com> wrote:
>> From: Vincent Tinelli <vincent.tinelli@intel.com>
>>
>> Change GPT UUID string format from UUID to GUID per specification.
>>
>> Signed-off-by: Vincent Tinelli <vincent.tinelli@intel.com>
>> ---
>>  cmd/gpt.c       | 2 +-
>>  disk/part_efi.c | 2 +-
>>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> Reviewed-by: Simon Glass <sjg@chromium.org>
>
> How about also a patch to add comments to that enum in uuid.h?

I hope it's not a condition for your tag? Otherwise we might do this
later at some point.
Simon Glass March 8, 2017, 9:01 p.m. UTC | #3
Hi Andy,

On 3 March 2017 at 08:18, Andy Shevchenko <andy.shevchenko@gmail.com> wrote:
> On Fri, Mar 3, 2017 at 6:52 AM, Simon Glass <sjg@chromium.org> wrote:
>> Hi Andy,
>>
>> On 27 February 2017 at 07:11, Andy Shevchenko
>> <andriy.shevchenko@linux.intel.com> wrote:
>>> From: Vincent Tinelli <vincent.tinelli@intel.com>
>>>
>>> Change GPT UUID string format from UUID to GUID per specification.
>>>
>>> Signed-off-by: Vincent Tinelli <vincent.tinelli@intel.com>
>>> ---
>>>  cmd/gpt.c       | 2 +-
>>>  disk/part_efi.c | 2 +-
>>>  2 files changed, 2 insertions(+), 2 deletions(-)
>>
>> Reviewed-by: Simon Glass <sjg@chromium.org>
>>
>> How about also a patch to add comments to that enum in uuid.h?
>
> I hope it's not a condition for your tag? Otherwise we might do this
> later at some point.

No, it's a suggestion. I normally use something 'but please ...' if I
think something needs to be done.

However it does seem confusing, as this bug suggests.

Regards,
Simon
Tom Rini March 18, 2017, 12:16 a.m. UTC | #4
On Mon, Feb 27, 2017 at 04:11:15PM +0200, Andy Shevchenko wrote:

> From: Vincent Tinelli <vincent.tinelli@intel.com>
> 
> Change GPT UUID string format from UUID to GUID per specification.
> 
> Signed-off-by: Vincent Tinelli <vincent.tinelli@intel.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/cmd/gpt.c b/cmd/gpt.c
index 196f506335..3e98821868 100644
--- a/cmd/gpt.c
+++ b/cmd/gpt.c
@@ -54,7 +54,7 @@  static int extract_env(const char *str, char **env)
 	if (e == NULL) {
 #ifdef CONFIG_RANDOM_UUID
 		debug("%s unset. ", str);
-		gen_rand_uuid_str(uuid_str, UUID_STR_FORMAT_STD);
+		gen_rand_uuid_str(uuid_str, UUID_STR_FORMAT_GUID);
 		setenv(s, uuid_str);
 
 		e = getenv(s);
diff --git a/disk/part_efi.c b/disk/part_efi.c
index 893cbbdbda..db0c890d5b 100644
--- a/disk/part_efi.c
+++ b/disk/part_efi.c
@@ -463,7 +463,7 @@  int gpt_fill_pte(gpt_header *gpt_h, gpt_entry *gpt_e,
 		str_uuid = partitions[i].uuid;
 		bin_uuid = gpt_e[i].unique_partition_guid.b;
 
-		if (uuid_str_to_bin(str_uuid, bin_uuid, UUID_STR_FORMAT_STD)) {
+		if (uuid_str_to_bin(str_uuid, bin_uuid, UUID_STR_FORMAT_GUID)) {
 			printf("Partition no. %d: invalid guid: %s\n",
 				i, str_uuid);
 			return -1;