[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20110822132525.GB27902@router-fw-old.local.net-space.pl>
Date: Mon, 22 Aug 2011 15:25:25 +0200
From: Daniel Kiper <dkiper@...-space.pl>
To: Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>
Cc: Daniel Kiper <dkiper@...-space.pl>, olaf@...fle.de,
xen-devel@...ts.xensource.com, ian.campbell@...rix.com,
kexec@...ts.infradead.org, linux-kernel@...r.kernel.org,
horms@...ge.net.au, vgoyal@...hat.com
Subject: Re: [PATCH 1/4] xen: Take into account Xen control interface changes since Xen Ver. 4.1
On Sun, Aug 21, 2011 at 11:56:50PM -0400, Konrad Rzeszutek Wilk wrote:
> > xc_interface_open() receive three arguments instead of void and returns
> > pointer to xc_interface type instead of int since Xen Ver. 4.1. Take into
> > account that and allow kexec-tools compilation with all versions of Xen.
> >
> > Signed-off-by: Daniel Kiper <dkiper@...-space.pl>
> > ---
> > kexec/crashdump-xen.c | 15 ++++++++++++++-
> > 1 files changed, 14 insertions(+), 1 deletions(-)
> >
> > diff --git a/kexec/crashdump-xen.c b/kexec/crashdump-xen.c
> > index b347764..9dfabf8 100644
> > --- a/kexec/crashdump-xen.c
> > +++ b/kexec/crashdump-xen.c
> > @@ -126,19 +126,32 @@ unsigned long xen_architecture(struct crash_elf_info
> *elf_info)
> > {
> > unsigned long machine = elf_info->machine;
> > #ifdef HAVE_LIBXENCTRL
> > - int xc, rc;
> > + int rc;
> > xen_capabilities_info_t capabilities;
> > +#ifdef XENCTRL_HAS_XC_INTERFACE
> > + xc_interface *xc;
> > +#else
> > + int xc;
> > +#endif
>
> Where is the #endif for HAVE_LIBXENCTRL?
At the end of this function. It is not included in this patch.
Daniel
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists