Fix problems in the Xen inotify driver.

In xenInotifyXendDomainsDirLookup() the wrong UUID variable is used
to search in the config info list.

In xenInotifyEvent() the event is dispatched if it's NULL.

Both were introduced in bc898df2c74fe3c8efedfbbd430737bac950e65e.

diff --git a/src/xen/xen_inotify.c b/src/xen/xen_inotify.c
index 9e0407f0113f976a4e3e2f602e751075009741b7..aa3893ab331852924e0b634747a29cca81256de4 100644 (file)
--- a/src/xen/xen_inotify.c
+++ b/src/xen/xen_inotify.c
@@ -142,7 +142,7 @@ xenInotifyXendDomainsDirLookup(virConnectPtr conn, const char *filename,
            search for, and create a domain from the stored
            list info */
         for (i = 0 ; i < priv->configInfoList->count ; i++) {
-            if (!memcmp(uuid, priv->configInfoList->doms[i]->uuid, VIR_UUID_BUFLEN)) {
+            if (!memcmp(rawuuid, priv->configInfoList->doms[i]->uuid, VIR_UUID_BUFLEN)) {
                 *name = strdup(priv->configInfoList->doms[i]->name);
                 if (!*name) {
                     virXenInotifyError(NULL, VIR_ERR_INTERNAL_ERROR,
@@ -332,7 +332,7 @@ reread:
                 xenInotifyDomainEventFromFile(conn, fname,
                                               VIR_DOMAIN_EVENT_UNDEFINED,
                                               VIR_DOMAIN_EVENT_UNDEFINED_REMOVED);
-            if (!event)
+            if (event)
                 xenUnifiedDomainEventDispatch(conn->privateData, event);
             else
                 virXenInotifyError(NULL, VIR_ERR_INTERNAL_ERROR,