diff options
| author |   Eric Blake <eblake@redhat.com> | 2012-03-23 14:23:43 -0600 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2012-03-23 14:29:00 -0600 |
| commit | 9b6860f5ceaded1bf3a5ed6ad550fab059637e32 (patch) | |
| tree | 24bfbe3c30ded6bf0d6a225197a069875f625aaf | |
| parent | Add qemu support for ppc64 on FC16 or above for rpm packaging (diff) | |
| download | libvirt-9b6860f5ceaded1bf3a5ed6ad550fab059637e32.tar.gz libvirt-9b6860f5ceaded1bf3a5ed6ad550fab059637e32.tar.bz2 libvirt-9b6860f5ceaded1bf3a5ed6ad550fab059637e32.zip | |
build: fix incorrect enum declaration
Recent changes have caused build failures on systems where pdwtags works:
commit a26a196 mistakenly exported a public variable
commits a26a196, 57ddcc2, 487c063 all had copy-paste bugs in
hand-updating the golden API rather than rerunning pdwtags
* include/libvirt/libvirt.h.in (virDomainEventTrayChangeReason):
Make this a typedef, not external storage.
* src/remote_protocol-structs (remote_procedure): Fix spelling.
| -rw-r--r-- | include/libvirt/libvirt.h.in | 2 | ||||
| -rw-r--r-- | src/remote_protocol-structs | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index c702e6631..8bb5c5754 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -3684,7 +3684,7 @@ typedef void (*virConnectDomainEventDiskChangeCallback)(virConnectPtr conn, * * The reason describing why the callback was called */ -enum { +typedef enum { VIR_DOMAIN_EVENT_TRAY_CHANGE_OPEN = 0, VIR_DOMAIN_EVENT_TRAY_CHANGE_CLOSE, diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index 474e5740e..9b2414f18 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -1654,13 +1654,13 @@ struct remote_domain_event_tray_change_msg { remote_nonnull_domain dom; remote_nonnull_string devAlias; int reason; -} +}; struct remote_domain_event_pmwakeup_msg { remote_nonnull_domain dom; -} +}; struct remote_domain_event_pmsuspend_msg { remote_nonnull_domain dom; -} +}; struct remote_domain_managed_save_args { remote_nonnull_domain dom; u_int flags; @@ -2189,7 +2189,7 @@ enum remote_procedure { REMOTE_PROC_DOMAIN_GET_METADATA = 265, REMOTE_PROC_DOMAIN_BLOCK_REBASE = 266, REMOTE_PROC_DOMAIN_PM_WAKEUP = 267, - REMOTE_PROC_DOMAIN_TRAY_CHANGE = 268, - REMOTE_PROC_DOMAIN_PMWAKEUP = 269, - REMOTE_PROC_DOMAIN_PMSUSPEND = 270, + REMOTE_PROC_DOMAIN_EVENT_TRAY_CHANGE = 268, + REMOTE_PROC_DOMAIN_EVENT_PMWAKEUP = 269, + REMOTE_PROC_DOMAIN_EVENT_PMSUSPEND = 270, }; |