diff mbox series

[1/3] tools/hvmloader: Drop machelf include as well

Message ID 20210225203010.11378-2-andrew.cooper3@citrix.com (mailing list archive)
State New
Headers show
Series Build firmware as freestanding | expand

Commit Message

Andrew Cooper Feb. 25, 2021, 8:30 p.m. UTC
The logic behind switching to elfstructs applies to sun builds as well.

Fixes: 81b2b328a2 ("hvmloader: use Xen private header for elf structs")
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Jan Beulich <JBeulich@suse.com>
CC: Roger Pau Monné <roger.pau@citrix.com>
CC: Wei Liu <wl@xen.org>
CC: Ian Jackson <iwj@xenproject.org>
---
 tools/firmware/hvmloader/32bitbios_support.c | 3 ---
 1 file changed, 3 deletions(-)

Comments

Jan Beulich Feb. 26, 2021, 9:06 a.m. UTC | #1
On 25.02.2021 21:30, Andrew Cooper wrote:
> The logic behind switching to elfstructs applies to sun builds as well.
> 
> Fixes: 81b2b328a2 ("hvmloader: use Xen private header for elf structs")
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>

Acked-by: Jan Beulich <jbeulich@suse.com>
Ian Jackson March 1, 2021, 4:16 p.m. UTC | #2
Andrew Cooper writes ("[PATCH 1/3] tools/hvmloader: Drop machelf include as well"):
> The logic behind switching to elfstructs applies to sun builds as well.
> 
> Fixes: 81b2b328a2 ("hvmloader: use Xen private header for elf structs")
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>

I would have preferred this patch to come after the one that is
actually justified for 4.15, so that it could be held off to after
4.15.  After all I see no substantive reason why this should get a
freeze exception.

However, it looks fine based on code review and I don't want to add
risk by asking you to transpose the two patches, so:

Release-Acked-by: Ian Jackson <iwj@xenproject.org>

Ian.
Andrew Cooper March 1, 2021, 4:26 p.m. UTC | #3
On 01/03/2021 16:16, Ian Jackson wrote:
> Andrew Cooper writes ("[PATCH 1/3] tools/hvmloader: Drop machelf include as well"):
>> The logic behind switching to elfstructs applies to sun builds as well.
>>
>> Fixes: 81b2b328a2 ("hvmloader: use Xen private header for elf structs")
>> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
> I would have preferred this patch to come after the one that is
> actually justified for 4.15, so that it could be held off to after
> 4.15.  After all I see no substantive reason why this should get a
> freeze exception.

It is a bugfix to a very recent patch which already already got a
release ack.

If this doesn't get an ack, then 81b2b328a2 should be reverted.  (Except
obviously that would be a bad move.)

>
> However, it looks fine based on code review and I don't want to add
> risk by asking you to transpose the two patches, so:
>
> Release-Acked-by: Ian Jackson <iwj@xenproject.org>

Thanks.

~Andrew
diff mbox series

Patch

diff --git a/tools/firmware/hvmloader/32bitbios_support.c b/tools/firmware/hvmloader/32bitbios_support.c
index e726946a7b..6f28fb6bde 100644
--- a/tools/firmware/hvmloader/32bitbios_support.c
+++ b/tools/firmware/hvmloader/32bitbios_support.c
@@ -22,9 +22,6 @@ 
 
 #include <inttypes.h>
 #include <xen/libelf/elfstructs.h>
-#ifdef __sun__
-#include <sys/machelf.h>
-#endif
 
 #include "util.h"
 #include "config.h"