On Fri, Nov 04, 2011 at 12:17:15PM +0000, Daniel P. Berrange wrote:
From: "Daniel P. Berrange" <berrange(a)redhat.com>
All constants related to events should have a prefix of
VIR_DOMAIN_EVENT_
* include/libvirt/libvirt.h.in, src/qemu/qemu_domain.c:
Rename VIR_DOMAIN_DISK_CHANGE_MISSING_ON_START to
VIR_DOMAIN_EVENT_DISK_CHANGE_MISSING_ON_START
---
include/libvirt/libvirt.h.in | 4 ++--
src/qemu/qemu_domain.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in
index 7181f62..aa320b6 100644
--- a/include/libvirt/libvirt.h.in
+++ b/include/libvirt/libvirt.h.in
@@ -3069,12 +3069,12 @@ typedef void
(*virConnectDomainEventBlockJobCallback)(virConnectPtr conn,
void *opaque);
/**
- * virConnectDomainEventDisChangeReason:
+ * virConnectDomainEventDiskChangeReason:
*
* The reason describing why this callback is called
*/
typedef enum {
- VIR_DOMAIN_DISK_CHANGE_MISSING_ON_START = 0, /* oldSrcPath is set */
+ VIR_DOMAIN_EVENT_DISK_CHANGE_MISSING_ON_START = 0, /* oldSrcPath is set */
} virConnectDomainEventDiskChangeReason;
/**
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 5295783..3e755d7 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -1652,7 +1652,7 @@ qemuDomainCheckDiskPresence(struct qemud_driver *driver,
disk->dst, vm->def->name, uuid, disk->src);
event = virDomainEventDiskChangeNewFromObj(vm, disk->src, NULL,
disk->info.alias,
-
VIR_DOMAIN_DISK_CHANGE_MISSING_ON_START);
+
VIR_DOMAIN_EVENT_DISK_CHANGE_MISSING_ON_START);
if (event)
qemuDomainEventQueue(driver, event);
--
1.7.6.4
Ouch, yes ACK we should fix before the release,
Daniel
--
Daniel Veillard | libxml Gnome XML XSLT toolkit
http://xmlsoft.org/
daniel(a)veillard.com | Rpmfind RPM search engine
http://rpmfind.net/
http://veillard.com/ | virtualization library
http://libvirt.org/