[libvirt] [PATCH] xenapi: Fix compile error in previous commit

--- I'm pushing this under the trivial compile error fix rule. src/xenapi/xenapi_utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/xenapi/xenapi_utils.c b/src/xenapi/xenapi_utils.c index c161b22..f61e09d 100644 --- a/src/xenapi/xenapi_utils.c +++ b/src/xenapi/xenapi_utils.c @@ -225,7 +225,7 @@ xenapiNormalExitEnum2virDomainLifecycle(enum xen_on_normal_exit action) enum virDomainLifecycleCrashAction xenapiCrashExitEnum2virDomainLifecycle(enum xen_on_crash_behaviour action) { - enum virDomainLifecycleCrashAction num = VIR_DOMAIN_LIFECYCLE_CRASH__RESTART; + enum virDomainLifecycleCrashAction num = VIR_DOMAIN_LIFECYCLE_CRASH_RESTART; if (action == XEN_ON_CRASH_BEHAVIOUR_DESTROY) num = VIR_DOMAIN_LIFECYCLE_CRASH_DESTROY; else if (action == XEN_ON_CRASH_BEHAVIOUR_RESTART) -- 1.7.0.4

On 08/20/2010 03:31 PM, Matthias Bolte wrote:
---
I'm pushing this under the trivial compile error fix rule.
{ - enum virDomainLifecycleCrashAction num = VIR_DOMAIN_LIFECYCLE_CRASH__RESTART; + enum virDomainLifecycleCrashAction num = VIR_DOMAIN_LIFECYCLE_CRASH_RESTART;
Oops - serves me right for testing on my RHEL 6 beta box (which lacks xen support) instead of my normal Fedora 13 box (where the compiler would have caught it as part of my review). And thanks for the quick fix. -- Eric Blake eblake@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org

Eric Blake wrote:
On 08/20/2010 03:31 PM, Matthias Bolte wrote:
---
I'm pushing this under the trivial compile error fix rule.
{ - enum virDomainLifecycleCrashAction num = VIR_DOMAIN_LIFECYCLE_CRASH__RESTART; + enum virDomainLifecycleCrashAction num = VIR_DOMAIN_LIFECYCLE_CRASH_RESTART;
Oops - serves me right for testing on my RHEL 6 beta box (which lacks xen support) instead of my normal Fedora 13 box (where the compiler would have caught it as part of my review). And thanks for the quick fix.
Grrrr. Sorry about that. BTW, you don't only need xen but Citrix xenserver right? I have xen installed, including the opensource xenapi headers/libs. But looking at my build logs, xenapi was not detected during configure. Regards, Jim

2010/8/21 Jim Fehlig <jfehlig@novell.com>:
Eric Blake wrote:
On 08/20/2010 03:31 PM, Matthias Bolte wrote:
---
I'm pushing this under the trivial compile error fix rule.
{ - enum virDomainLifecycleCrashAction num = VIR_DOMAIN_LIFECYCLE_CRASH__RESTART; + enum virDomainLifecycleCrashAction num = VIR_DOMAIN_LIFECYCLE_CRASH_RESTART;
Oops - serves me right for testing on my RHEL 6 beta box (which lacks xen support) instead of my normal Fedora 13 box (where the compiler would have caught it as part of my review). And thanks for the quick fix.
Grrrr. Sorry about that. BTW, you don't only need xen but Citrix xenserver right? I have xen installed, including the opensource xenapi headers/libs. But looking at my build logs, xenapi was not detected during configure.
Regards, Jim
The xenapi driver requires libxenserver which can be found here: http://community.citrix.com/display/xs/Download+SDKs Matthias

On 08/20/2010 04:33 PM, Matthias Bolte wrote:
The xenapi driver requires libxenserver which can be found here:
A word of warning - the 5.6.0-1 tarball comes with no ./configure script. The Makefile is broken out of the box - it wants to install directly into /usr rather than /usr/local, and it is missing definitions for $(INSTALL_PROG) and $(LIBDIR). Also, it fails to install include/xen/api/xen_all.h. I had to do: sudo make install INSTALL_PROG='$(INSTALL)' LIBDIR=lib64 sudo cp include/xen/api/xen_all.h /usr/include/xen/api for my x86_64 Fedora box. -- Eric Blake eblake@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org

On 08/20/2010 04:38 PM, Eric Blake wrote:
On 08/20/2010 04:33 PM, Matthias Bolte wrote:
The xenapi driver requires libxenserver which can be found here:
A word of warning - the 5.6.0-1 tarball comes with no ./configure script. The Makefile is broken out of the box - it wants to install directly into /usr rather than /usr/local, and it is missing definitions for $(INSTALL_PROG) and $(LIBDIR). Also, it fails to install include/xen/api/xen_all.h. I had to do:
sudo make install INSTALL_PROG='$(INSTALL)' LIBDIR=lib64 sudo cp include/xen/api/xen_all.h /usr/include/xen/api
That's still incomplete. Instead, this one-liner works: sudo make install INSTALL_PROG='$(INSTALL)' LIBDIR=lib64 \ LIBXENAPI_HDRS='include/xen/api/*.h' -- Eric Blake eblake@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org

On Sat, Aug 21, 2010 at 12:33:32AM +0200, Matthias Bolte wrote:
2010/8/21 Jim Fehlig <jfehlig@novell.com>:
Eric Blake wrote:
On 08/20/2010 03:31 PM, Matthias Bolte wrote:
---
I'm pushing this under the trivial compile error fix rule.
{ - enum virDomainLifecycleCrashAction num = VIR_DOMAIN_LIFECYCLE_CRASH__RESTART; + enum virDomainLifecycleCrashAction num = VIR_DOMAIN_LIFECYCLE_CRASH_RESTART;
Oops - serves me right for testing on my RHEL 6 beta box (which lacks xen support) instead of my normal Fedora 13 box (where the compiler would have caught it as part of my review). And thanks for the quick fix.
Grrrr. Sorry about that. BTW, you don't only need xen but Citrix xenserver right? I have xen installed, including the opensource xenapi headers/libs. But looking at my build logs, xenapi was not detected during configure.
Regards, Jim
The xenapi driver requires libxenserver which can be found here:
Hmm, shouldn't it work with the libxen from xen-unstable.hg too - that is the original XenAPI client library IIUC ? Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://deltacloud.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|
participants (4)
-
Daniel P. Berrange
-
Eric Blake
-
Jim Fehlig
-
Matthias Bolte