diff options
| author | Ian Campbell <ian.campbell@citrix.com> | 2010-12-23 15:25:57 +0000 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2010-12-23 15:25:57 +0000 |
| commit | 3e446a35ee82c738367e8f90e3bc9166687043a8 (patch) | |
| tree | d2ed5fd210a798cb5c54007a08e8bd2b9e9a221f /tools/xenstore/xenstored_domain.c | |
| parent | 252cb308e37470915d0f64c730e4e2e829ec2512 (diff) | |
| download | xen-3e446a35ee82c738367e8f90e3bc9166687043a8.tar.gz xen-3e446a35ee82c738367e8f90e3bc9166687043a8.tar.bz2 xen-3e446a35ee82c738367e8f90e3bc9166687043a8.zip | |
libxc: convert evtchn interfaces to use an opaque handle type
This makes the interface consistent with the changes made to the main
interface in 21483:779c0ef9682c.
Also fix some references to "struct xc_interface" which should have
been simply "xc_interface" in tools/xenpaging, and update QEMU_TAG to
pull in the corresponding qemu change.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'tools/xenstore/xenstored_domain.c')
| -rw-r--r-- | tools/xenstore/xenstored_domain.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index 7aa87cd022..654185d4bb 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -36,7 +36,7 @@ static xc_interface **xc_handle; static evtchn_port_t virq_port; -int xce_handle = -1; +xc_evtchn *xce_handle = NULL; struct domain { @@ -580,8 +580,7 @@ static int dom0_init(void) return 0; } -/* Returns the event channel handle. */ -int domain_init(void) +void domain_init(void) { int rc; @@ -595,9 +594,9 @@ int domain_init(void) talloc_set_destructor(xc_handle, close_xc_handle); - xce_handle = xc_evtchn_open(); + xce_handle = xc_evtchn_open(NULL, 0); - if (xce_handle < 0) + if (xce_handle == NULL) barf_perror("Failed to open evtchn device"); if (dom0_init() != 0) @@ -606,8 +605,6 @@ int domain_init(void) if ((rc = xc_evtchn_bind_virq(xce_handle, VIRQ_DOM_EXC)) == -1) barf_perror("Failed to bind to domain exception virq port"); virq_port = rc; - - return xce_handle; } void domain_entry_inc(struct connection *conn, struct node *node) |