On 05/13/2011 01:18 PM, Eric Blake wrote:
> On 05/12/2011 11:14 AM, Cole Robinson wrote:
>>
>> Signed-off-by: Cole Robinson <[email protected]>
>> ---
>> src/libxl/libxl_conf.h | 6 +---
>> src/libxl/libxl_driver.c | 80
>> +++++++++++++--------------------------------
>> 2 files changed, 24 insertions(+), 62 deletions(-)
>
> The conversion wasn't complete:
>
> CC libvirt_driver_libxl_la-libxl_driver.lo
> libxl/libxl_driver.c: In function 'libxlDomainEventFlush':
> libxl/libxl_driver.c:136:30: error: 'libxmlDomainEventDispatchFunc'
> undeclared (first use in this function)
> libxl/libxl_driver.c:136:30: note: each undeclared identifier is
> reported only once for each function it appears in
> libxl/libxl_driver.c: In function 'libxlShutdown':
> libxl/libxl_driver.c:689:29: error: 'privconn' undeclared (first use in
> this function)
> libxl/libxl_driver.c: In function 'libxlStartup':
> libxl/libxl_driver.c:802:57: error: 'libxml_driver' undeclared (first
> use in this function)
> cc1: warnings being treated as errors
> libxl/libxl_driver.c: At top level:
> libxl/libxl_driver.c:117:1: error: 'libxlDomainEventDispatchFunc'
> defined but not used [-Wunused-function]
>
Urgh, yeah, thought I was actually building the driver but clearly was not.
Attached patch should fix the breakage, can you test if it works?
Thanks,
Cole
diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index 3598dd6..60557fc 100644
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -133,7 +133,7 @@ libxlDomainEventFlush(int timer ATTRIBUTE_UNUSED, void *opaque)
libxlDriverLock(driver);
virDomainEventStateFlush(driver->domainEventState,
- libxmlDomainEventDispatchFunc,
+ libxlDomainEventDispatchFunc,
driver);
libxlDriverUnlock(driver);
}
@@ -686,7 +686,7 @@ libxlShutdown(void)
VIR_FREE(libxl_driver->libDir);
VIR_FREE(libxl_driver->saveDir);
- virDomainEventStateFree(privconn->domainEventState);
+ virDomainEventStateFree(libxl_driver->domainEventState);
libxlDriverUnlock(libxl_driver);
virMutexDestroy(&libxl_driver->lock);
@@ -799,10 +799,10 @@ libxlStartup(int privileged) {
libxl_driver->domainEventState = virDomainEventStateNew(
libxlDomainEventFlush,
- libxml_driver,
+ libxl_driver,
NULL,
false);
- if (!libxml_driver->domainEventState)
+ if (!libxl_driver->domainEventState)
goto error;
libxl_driver->logger =
--
libvir-list mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/libvir-list