Hi! Attached patch avoids void * arithmetic in xen/common/kexec.c Christoph _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
On Mon, 2007-01-22 at 10:48 +0100, Christoph Egger wrote:> #define ELFNOTE_ALIGN(_n_) (((_n_)+3)&~3) > -#define ELFNOTE_NAME(_n_) ((void*)(_n_) + sizeof(*(_n_))) > +#define ELFNOTE_NAME(_n_) ((char*)(_n_) + sizeof(*(_n_))) > #define ELFNOTE_DESC(_n_) (ELFNOTE_NAME(_n_) + ELFNOTE_ALIGN((_n_)->namesz)) > #define ELFNOTE_NEXT(_n_) (ELFNOTE_DESC(_n_) + ELFNOTE_ALIGN((_n_)->descsz)) > > @@ -75,10 +75,10 @@ void kexec_crash_save_cpu(void) > if ( cpu_test_and_set(cpu, crash_saved_cpus) ) > return; > > - prstatus = ELFNOTE_DESC(note); > - > - note = ELFNOTE_NEXT(note); > - xencore = ELFNOTE_DESC(note); > + prstatus = (ELF_Prstatus *)ELFNOTE_DESC(note); > + > + note = (Elf_Note *)ELFNOTE_NEXT(note);Perhaps you could include the cast in the ELFNOTE_NEXT() macro instead of repeating it everywhere it is used? Also, could the elfnote macros could be moved to a header? They are used in xen/common/elf.c too. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Christoph Egger
2007-Jan-22 14:08 UTC
Re: [Xen-devel] [PATCH] Cleanup for xen/common/kexec.c
On Monday 22 January 2007 12:57, Ian Campbell wrote:> On Mon, 2007-01-22 at 10:48 +0100, Christoph Egger wrote: > > #define ELFNOTE_ALIGN(_n_) (((_n_)+3)&~3) > > -#define ELFNOTE_NAME(_n_) ((void*)(_n_) + sizeof(*(_n_))) > > +#define ELFNOTE_NAME(_n_) ((char*)(_n_) + sizeof(*(_n_))) > > #define ELFNOTE_DESC(_n_) (ELFNOTE_NAME(_n_) + > > ELFNOTE_ALIGN((_n_)->namesz)) #define ELFNOTE_NEXT(_n_) > > (ELFNOTE_DESC(_n_) + ELFNOTE_ALIGN((_n_)->descsz)) > > > > @@ -75,10 +75,10 @@ void kexec_crash_save_cpu(void) > > if ( cpu_test_and_set(cpu, crash_saved_cpus) ) > > return; > > > > - prstatus = ELFNOTE_DESC(note); > > - > > - note = ELFNOTE_NEXT(note); > > - xencore = ELFNOTE_DESC(note); > > + prstatus = (ELF_Prstatus *)ELFNOTE_DESC(note); > > + > > + note = (Elf_Note *)ELFNOTE_NEXT(note); > > Perhaps you could include the cast in the ELFNOTE_NEXT() macro instead > of repeating it everywhere it is used?Here we go. Patch attached.> Also, could the elfnote macros could be moved to a header? They are used > in xen/common/elf.c too.They are similar but not equal. Christoph _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
On Mon, 2007-01-22 at 15:08 +0100, Christoph Egger wrote:> On Monday 22 January 2007 12:57, Ian Campbell wrote: > > Perhaps you could include the cast in the ELFNOTE_NEXT() macro instead > > of repeating it everywhere it is used? > > Here we go. Patch attached.Thanks, applied.> > > Also, could the elfnote macros could be moved to a header? They are used > > in xen/common/elf.c too. > > They are similar but not equal.They were roughly equivalent, the one in kexec.c had just further abstracted ELFNOTE_ALIGN and the one in elf.c had an extra const on ELFNOTE_NAME. I moved them into xen/elf.h. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel