From: "Roger Pau Monné" <roger.pau@citrix.com>
To: Jan Beulich <jbeulich@suse.com>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>,
George Dunlap <george.dunlap@citrix.com>,
Ian Jackson <iwj@xenproject.org>, Julien Grall <julien@xen.org>,
Stefano Stabellini <sstabellini@kernel.org>, Wei Liu <wl@xen.org>,
<xen-devel@lists.xenproject.org>
Subject: Re: [PATCH for-4.15] elfstructs: add relocation defines for i386
Date: Wed, 24 Feb 2021 16:25:58 +0100 [thread overview]
Message-ID: <YDZwBsNBY+uyLbcB@Air-de-Roger> (raw)
In-Reply-To: <2db1f1db-6a99-c0a1-98c8-2af2ffc7ca75@suse.com>
On Wed, Feb 24, 2021 at 04:01:13PM +0100, Jan Beulich wrote:
> On 24.02.2021 15:58, Roger Pau Monne wrote:
> > Those are need by the rombios relocation code in hvmloader. Fixes the
> > following build error:
> >
> > 32bitbios_support.c: In function 'relocate_32bitbios':
> > 32bitbios_support.c:130:18: error: 'R_386_PC32' undeclared (first use in this function); did you mean 'R_X86_64_PC32'?
> > case R_386_PC32:
> > ^~~~~~~~~~
> > R_X86_64_PC32
> > 32bitbios_support.c:130:18: note: each undeclared identifier is reported only once for each function it appears in
> > 32bitbios_support.c:134:18: error: 'R_386_32' undeclared (first use in this function)
> > case R_386_32:
> > ^~~~~~~~
> >
> > Only add the two defines that are actually used, which seems to match
> > what we do for amd64.
> >
> > Fixes: 81b2b328a26c1b ('hvmloader: use Xen private header for elf structs')
> > Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
>
> In principle
> Reviewed-by: Jan Beulich <jbeulich@suse.com>
>
> But ...
>
> > --- a/xen/include/xen/elfstructs.h
> > +++ b/xen/include/xen/elfstructs.h
> > @@ -348,6 +348,9 @@ typedef struct {
> > #define ELF32_R_TYPE(i) ((unsigned char) (i))
> > #define ELF32_R_INFO(s,t) (((s) << 8) + (unsigned char)(t))
> >
> > +#define R_386_32 1 /* Direct 32 bit */
> > +#define R_386_PC32 2 /* PC relative 32 bit */
> > +
> > typedef struct {
> > Elf64_Addr r_offset; /* where to do it */
> > Elf64_Xword r_info; /* index & type of relocation */
>
> ... I'm heavily inclined to move this a few lines down to where
> the other relocation types get defined, and add a respective
> comment.
I've placed it together with the other 32bit ELF relocation structures
and macros, but I see the rest of the relocation defines are a bit
below, feel free to move it. For a comment:
/*
* Relocation definitions required by the rombios hvmloader relocation
* code.
*/
Does seem fine?
Thanks, Roger.
next prev parent reply other threads:[~2021-02-24 15:26 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-24 14:58 [PATCH for-4.15] elfstructs: add relocation defines for i386 Roger Pau Monne
2021-02-24 15:01 ` Jan Beulich
2021-02-24 15:25 ` Roger Pau Monné [this message]
2021-02-24 15:25 ` Ian Jackson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YDZwBsNBY+uyLbcB@Air-de-Roger \
--to=roger.pau@citrix.com \
--cc=andrew.cooper3@citrix.com \
--cc=george.dunlap@citrix.com \
--cc=iwj@xenproject.org \
--cc=jbeulich@suse.com \
--cc=julien@xen.org \
--cc=sstabellini@kernel.org \
--cc=wl@xen.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).