[{"id":1764190,"web_url":"http://patchwork.ozlabs.org/comment/1764190/","msgid":"<7d4990fa-1b46-b277-0e94-d18b6398622b@suse.de>","list_archive_url":null,"date":"2017-09-06T15:22:42","subject":"Re: [U-Boot] [PATCH 1/1] efi_loader: move efi_guid_t typedef to\n\tefi.h","submitter":{"id":1212,"url":"http://patchwork.ozlabs.org/api/people/1212/","name":"Alexander Graf","email":"agraf@suse.de"},"content":"On 06.09.17 16:49, Heinrich Schuchardt wrote:\n> efi_guid_t is used both in efi_api.h and in part_efi.h.\n> Both include efi.h. So we should move the typedef to\n> the common include. This saves us from including\n> part_efi.h in places where we don't need it.\n> \n> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>\n\nWon't that break the case where GUID partition table support is enabled, \nbut efi is not?\n\n\nAlex\n\n> ---\n> download.suse.org seems to be down.\n> So I was no able to test on Travis CI.\n> I just built for vexpress and x86.\n> ---\n>   include/efi.h      | 3 +++\n>   include/part_efi.h | 4 ----\n>   2 files changed, 3 insertions(+), 4 deletions(-)\n> \n> diff --git a/include/efi.h b/include/efi.h\n> index 02b78b31b1..6cb7db1ea5 100644\n> --- a/include/efi.h\n> +++ b/include/efi.h\n> @@ -81,6 +81,9 @@ typedef unsigned long efi_status_t;\n>   typedef u64 efi_physical_addr_t;\n>   typedef u64 efi_virtual_addr_t;\n>   typedef void *efi_handle_t;\n> +typedef struct {\n> +\tu8 b[16];\n> +} efi_guid_t;\n>   \n>   #define EFI_GUID(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) \\\n>   \t((efi_guid_t) \\\n> diff --git a/include/part_efi.h b/include/part_efi.h\n> index 317c044795..31e6bc6e14 100644\n> --- a/include/part_efi.h\n> +++ b/include/part_efi.h\n> @@ -58,10 +58,6 @@\n>   /* linux/include/efi.h */\n>   typedef u16 efi_char16_t;\n>   \n> -typedef struct {\n> -\tu8 b[16];\n> -} efi_guid_t;\n> -\n>   /* based on linux/include/genhd.h */\n>   struct partition {\n>   \tu8 boot_ind;\t\t/* 0x80 - active */\n>","headers":{"Return-Path":"<u-boot-bounces@lists.denx.de>","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=lists.denx.de\n\t(client-ip=81.169.180.215; helo=lists.denx.de;\n\tenvelope-from=u-boot-bounces@lists.denx.de;\n\treceiver=<UNKNOWN>)","Received":["from lists.denx.de (dione.denx.de [81.169.180.215])\n\tby ozlabs.org (Postfix) with ESMTP id 3xnS5G0Tzxz9t2R\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu,  7 Sep 2017 01:22:56 +1000 (AEST)","by lists.denx.de (Postfix, from userid 105)\n\tid 37995C21F2E; Wed,  6 Sep 2017 15:22:53 +0000 (UTC)","from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id 29E9FC21E31;\n\tWed,  6 Sep 2017 15:22:49 +0000 (UTC)","by lists.denx.de (Postfix, from userid 105)\n\tid 9D88EC21E31; Wed,  6 Sep 2017 15:22:47 +0000 (UTC)","from mx1.suse.de (mx2.suse.de [195.135.220.15])\n\tby lists.denx.de (Postfix) with ESMTPS id B6067C21DC4\n\tfor <u-boot@lists.denx.de>; Wed,  6 Sep 2017 15:22:44 +0000 (UTC)","from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254])\n\tby mx1.suse.de (Postfix) with ESMTP id E83CAAC5B;\n\tWed,  6 Sep 2017 15:22:43 +0000 (UTC)"],"X-Spam-Checker-Version":"SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de","X-Spam-Level":"","X-Spam-Status":"No, score=-2.3 required=5.0 tests=RCVD_IN_DNSWL_MED\n\tautolearn=unavailable autolearn_force=no version=3.4.0","X-Virus-Scanned":"by amavisd-new at test-mx.suse.de","To":"Heinrich Schuchardt <xypron.glpk@gmx.de>","References":"<20170906144932.24403-1-xypron.glpk@gmx.de>","From":"Alexander Graf <agraf@suse.de>","Message-ID":"<7d4990fa-1b46-b277-0e94-d18b6398622b@suse.de>","Date":"Wed, 6 Sep 2017 17:22:42 +0200","User-Agent":"Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:52.0)\n\tGecko/20100101 Thunderbird/52.3.0","MIME-Version":"1.0","In-Reply-To":"<20170906144932.24403-1-xypron.glpk@gmx.de>","Content-Language":"en-US","Cc":"Petr Kulhavy <brain@jikos.cz>, u-boot@lists.denx.de,\n\tSteve Rae <steve.rae@raedomain.com>","Subject":"Re: [U-Boot] [PATCH 1/1] efi_loader: move efi_guid_t typedef to\n\tefi.h","X-BeenThere":"u-boot@lists.denx.de","X-Mailman-Version":"2.1.18","Precedence":"list","List-Id":"U-Boot discussion <u-boot.lists.denx.de>","List-Unsubscribe":"<https://lists.denx.de/options/u-boot>,\n\t<mailto:u-boot-request@lists.denx.de?subject=unsubscribe>","List-Archive":"<http://lists.denx.de/pipermail/u-boot/>","List-Post":"<mailto:u-boot@lists.denx.de>","List-Help":"<mailto:u-boot-request@lists.denx.de?subject=help>","List-Subscribe":"<https://lists.denx.de/listinfo/u-boot>,\n\t<mailto:u-boot-request@lists.denx.de?subject=subscribe>","Content-Transfer-Encoding":"base64","Content-Type":"text/plain; charset=\"utf-8\"; Format=\"flowed\"","Errors-To":"u-boot-bounces@lists.denx.de","Sender":"\"U-Boot\" <u-boot-bounces@lists.denx.de>"}},{"id":1764206,"web_url":"http://patchwork.ozlabs.org/comment/1764206/","msgid":"<71d01dd0-3709-d562-a6cd-3655885b43f1@gmx.de>","list_archive_url":null,"date":"2017-09-06T15:39:30","subject":"Re: [U-Boot] [PATCH 1/1] efi_loader: move efi_guid_t typedef to\n\tefi.h","submitter":{"id":61270,"url":"http://patchwork.ozlabs.org/api/people/61270/","name":"Heinrich Schuchardt","email":"xypron.glpk@gmx.de"},"content":"On 09/06/2017 05:22 PM, Alexander Graf wrote:\n> \n> \n> On 06.09.17 16:49, Heinrich Schuchardt wrote:\n>> efi_guid_t is used both in efi_api.h and in part_efi.h.\n>> Both include efi.h. So we should move the typedef to\n>> the common include. This saves us from including\n>> part_efi.h in places where we don't need it.\n>>\n>> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>\n> \n> Won't that break the case where GUID partition table support is enabled,\n> but efi is not?\n> \n> \n> Alex\n>\n\nI moved the definition of efi_guid_t from part_efi.h to efi.h.\nThe definition is placed in a part of efi.h that is not enclosed in any\n#if*.\ninclude/part_efi.h has this line:\n#include <efi.h>\nSo any program including part_efi.h will still see the definition.\n\nBest regards\n\nHeinrich\n\n>> ---\n>> download.suse.org seems to be down.\n>> So I was no able to test on Travis CI.\n>> I just built for vexpress and x86.\n>> ---\n>>   include/efi.h      | 3 +++\n>>   include/part_efi.h | 4 ----\n>>   2 files changed, 3 insertions(+), 4 deletions(-)\n>>\n>> diff --git a/include/efi.h b/include/efi.h\n>> index 02b78b31b1..6cb7db1ea5 100644\n>> --- a/include/efi.h\n>> +++ b/include/efi.h\n>> @@ -81,6 +81,9 @@ typedef unsigned long efi_status_t;\n>>   typedef u64 efi_physical_addr_t;\n>>   typedef u64 efi_virtual_addr_t;\n>>   typedef void *efi_handle_t;\n>> +typedef struct {\n>> +    u8 b[16];\n>> +} efi_guid_t;\n>>     #define EFI_GUID(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) \\\n>>       ((efi_guid_t) \\\n>> diff --git a/include/part_efi.h b/include/part_efi.h\n>> index 317c044795..31e6bc6e14 100644\n>> --- a/include/part_efi.h\n>> +++ b/include/part_efi.h\n>> @@ -58,10 +58,6 @@\n>>   /* linux/include/efi.h */\n>>   typedef u16 efi_char16_t;\n>>   -typedef struct {\n>> -    u8 b[16];\n>> -} efi_guid_t;\n>> -\n>>   /* based on linux/include/genhd.h */\n>>   struct partition {\n>>       u8 boot_ind;        /* 0x80 - active */\n>>\n>","headers":{"Return-Path":"<u-boot-bounces@lists.denx.de>","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=lists.denx.de\n\t(client-ip=81.169.180.215; helo=lists.denx.de;\n\tenvelope-from=u-boot-bounces@lists.denx.de;\n\treceiver=<UNKNOWN>)","Received":["from lists.denx.de (dione.denx.de [81.169.180.215])\n\tby ozlabs.org (Postfix) with ESMTP id 3xnSSq3RPGz9s81\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu,  7 Sep 2017 01:39:55 +1000 (AEST)","by lists.denx.de (Postfix, from userid 105)\n\tid 13492C21F39; Wed,  6 Sep 2017 15:39:48 +0000 (UTC)","from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id 548A6C21E31;\n\tWed,  6 Sep 2017 15:39:46 +0000 (UTC)","by lists.denx.de (Postfix, from userid 105)\n\tid 38B15C21E31; Wed,  6 Sep 2017 15:39:45 +0000 (UTC)","from mout.gmx.net (mout.gmx.net [212.227.15.18])\n\tby lists.denx.de (Postfix) with ESMTPS id B84FBC21DC4\n\tfor <u-boot@lists.denx.de>; Wed,  6 Sep 2017 15:39:44 +0000 (UTC)","from [192.168.8.100] ([94.197.121.76]) by mail.gmx.com (mrgmx003\n\t[212.227.17.190]) with ESMTPSA (Nemesis) id 0LeMWL-1d6xKc0WDN-00q9rc;\n\tWed, 06 Sep 2017 17:39:35 +0200"],"X-Spam-Checker-Version":"SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de","X-Spam-Level":"","X-Spam-Status":"No, score=-0.7 required=5.0 tests=FREEMAIL_FROM,\n\tRCVD_IN_DNSWL_LOW,\n\tRCVD_IN_MSPIKE_H2 autolearn=unavailable autolearn_force=no\n\tversion=3.4.0","To":"Alexander Graf <agraf@suse.de>","References":"<20170906144932.24403-1-xypron.glpk@gmx.de>\n\t<7d4990fa-1b46-b277-0e94-d18b6398622b@suse.de>","From":"Heinrich Schuchardt <xypron.glpk@gmx.de>","Message-ID":"<71d01dd0-3709-d562-a6cd-3655885b43f1@gmx.de>","Date":"Wed, 6 Sep 2017 17:39:30 +0200","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101\n\tThunderbird/52.2.1","MIME-Version":"1.0","In-Reply-To":"<7d4990fa-1b46-b277-0e94-d18b6398622b@suse.de>","Content-Language":"en-US","X-Provags-ID":"V03:K0:C0dqET+3DLxEns8D2Aupf4SV8mGrbrLMA4oC9Fs3F53edHSidDV\n\tOC0yduoULeg0dGyic8QY2XRASL03GCvLJABbj+hpH0jnup/v7MpYWx2ifWnfNIpNv5E5Gd8\n\tuuEzj5feS3rncZ0/IXo0TaASE/eTaQfdcryJJd6JhEySdx74jdq0MOa+fJevzmDRZTxN+QF\n\tlwg/2BcM+kUtwxPLDuf/w==","X-UI-Out-Filterresults":"notjunk:1; V01:K0:smjsAj6a/x4=:S0vUM9mQomy1Q5LR07D+Wg\n\tP5U7VTqI66nTcV7BByxKCBQmlp3Gb8xTulSUT9lsZvI6ZSf1lJuiId//+NqdiFI+H6+g+tfzN\n\tpnt+LwkVuV19B8ubRCX42B9/5aQSV3Up35OYhwJyhddWPIYySJIEgUI7zBTtRhvsHozhscpta\n\tHC+V4SsyCsPxx74BHIXqSBSQKVxM5cmlqcGLFnmcvxLSv6uUm8Yku700YvLfgHCmD9ZSaPeH8\n\t7kEC+8r/TYyAsHetGfEkY+QhLtiBIva2QoEYKXIvkjvtny9/jYd6vMKBB/o1bbalm9oZd510F\n\tQlkwDPCq2ND93t65Iw6aA6fppO5vDL80BT7XfEkNiQdNORM/NQGK32WNtFm70GQPPmlu93b81\n\tI95RArSCt+7a14+J046apugcVjWFYe0GF9Kxd57HuIAcxYw8qyZDgEu58hK3p8bcPkf5iE8bT\n\tpd2QnU9xTzaDRDGfpaHqo0ggFPY0LzY+93ore+4K0HT3iBhhcimCQpBE2qUQEkLxMNtRJLzix\n\tyeLz2ULFEZJW2WEyMw/qptBklV5dfP6vcUvxnnWPtftTaXU5dPT9qfh0Srxe0dmZGOELiKtht\n\t1OlwymJvM8YFAiNAwMR+AIMicvNM6FfOfSCrT+he1dv81GY/YmAeas8YdCePaFy96HTgmYPth\n\tsIjbvUxCW57qzYZkdHrmS8tsWpUQRjl0K6BtZH3NVNgU8LL3wEYPIk2t5RTw/jpvhoOkaDOSz\n\t0CYVUCfG4w6mk3uvs/iwHoZI8JCOOBvSwdLM/ZsW3GTwMz7ncJYmoSBl0M9SYJSRHbYWAKJFC\n\t/1JRE6B09EGDvJbGrcZX4rNwpT3UBrw3mGflRpKMRFDxZLRCHw=","Cc":"Petr Kulhavy <brain@jikos.cz>, u-boot@lists.denx.de,\n\tSteve Rae <steve.rae@raedomain.com>","Subject":"Re: [U-Boot] [PATCH 1/1] efi_loader: move efi_guid_t typedef to\n\tefi.h","X-BeenThere":"u-boot@lists.denx.de","X-Mailman-Version":"2.1.18","Precedence":"list","List-Id":"U-Boot discussion <u-boot.lists.denx.de>","List-Unsubscribe":"<https://lists.denx.de/options/u-boot>,\n\t<mailto:u-boot-request@lists.denx.de?subject=unsubscribe>","List-Archive":"<http://lists.denx.de/pipermail/u-boot/>","List-Post":"<mailto:u-boot@lists.denx.de>","List-Help":"<mailto:u-boot-request@lists.denx.de?subject=help>","List-Subscribe":"<https://lists.denx.de/listinfo/u-boot>,\n\t<mailto:u-boot-request@lists.denx.de?subject=subscribe>","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"u-boot-bounces@lists.denx.de","Sender":"\"U-Boot\" <u-boot-bounces@lists.denx.de>"}}]