Mailing List Archive: [PATCH 1/4] xen: Take into account Xen control interface changes since Xen Ver. 4.1

[PATCH 1/4] xen: Take into account Xen control interface changes since Xen Ver. 4.1

Aug 21, 2011, 6:51 AM

Post #1 of 4 (260 views)

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@net-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

if (!xen_present())
goto out;

memset(capabilities, '0', XEN_CAPABILITIES_INFO_LEN);

+#ifdef XENCTRL_HAS_XC_INTERFACE
+ xc = xc_interface_open(NULL, NULL, 0);
+ if ( !xc ) {
+ fprintf(stderr, "failed to open xen control interface.\n");
+ goto out;
+ }
+#else
xc = xc_interface_open();
if ( xc == -1 ) {
fprintf(stderr, "failed to open xen control interface.\n");
goto out;
}
+#endif

rc = xc_version(xc, XENVER_capabilities, &capabilities[0]);
if ( rc == -1 ) {
--
1.5.6.5

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

Re: [PATCH 1/4] xen: Take into account Xen control interface changes since Xen Ver. 4.1 [ In reply to ]

konrad.wilk at oracle

Aug 21, 2011, 8:56 PM

Post #2 of 4 (259 views)

Permalink

> 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@net-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?

>
> if (!xen_present())
> goto out;
>
> memset(capabilities, '0', XEN_CAPABILITIES_INFO_LEN);
>
> +#ifdef XENCTRL_HAS_XC_INTERFACE
> + xc = xc_interface_open(NULL, NULL, 0);
> + if ( !xc ) {
> + fprintf(stderr, "failed to open xen control interface.\n");
> + goto out;
> + }
> +#else
> xc = xc_interface_open();
> if ( xc == -1 ) {
> fprintf(stderr, "failed to open xen control interface.\n");
> goto out;
> }
> +#endif
>
> rc = xc_version(xc, XENVER_capabilities, &capabilities[0]);
> if ( rc == -1 ) {
> --
> 1.5.6.5
>

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

Re: [PATCH 1/4] xen: Take into account Xen control interface changes since Xen Ver. 4.1 [ In reply to ]

belerajendra753 at gmail

Aug 21, 2011, 11:24 PM

Post #3 of 4 (255 views)

Permalink

Dear Friends,
I am pursuing Ph.D. in virtualization,
I want to study detail architecture and implementation of Xen
As I wanted to start from scratch ,can you suggest some guidance or resource
for it.
Thanking you
Rajendra Bele
Pune,India

On Sun, Aug 21, 2011 at 7:36 PM, Daniel Kiper <dkiper@net-space.pl> 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@net-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
>
> if (!xen_present())
> goto out;
>
> memset(capabilities, '0', XEN_CAPABILITIES_INFO_LEN);
>
> +#ifdef XENCTRL_HAS_XC_INTERFACE
> + xc = xc_interface_open(NULL, NULL, 0);
> + if ( !xc ) {
> + fprintf(stderr, "failed to open xen control interface.\n");
> + goto out;
> + }
> +#else
> xc = xc_interface_open();
> if ( xc == -1 ) {
> fprintf(stderr, "failed to open xen control interface.\n");
> goto out;
> }
> +#endif
>
> rc = xc_version(xc, XENVER_capabilities, &capabilities[0]);
> if ( rc == -1 ) {
> --
> 1.5.6.5
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xensource.com
> http://lists.xensource.com/xen-devel
>

Re: [PATCH 1/4] xen: Take into account Xen control interface changes since Xen Ver. 4.1 [ In reply to ]

dkiper at net-space

Aug 22, 2011, 6:25 AM

Post #4 of 4 (255 views)

Permalink

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@net-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

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel