changeset:   17121:ca2cf5c1adcc
user:        Keir Fraser <keir.fraser@citrix.com>
date:        Tue Feb 26 14:46:57 2008 +0000
summary:     ioemu: Do not sue xce_handle directly as a file descriptor.

diff -r 76479f25cdac -r ca2cf5c1adcc tools/ioemu/hw/xen_console.c
--- a/tools/ioemu/hw/xen_console.c	Tue Feb 26 14:46:07 2008 +0000
+++ b/tools/ioemu/hw/xen_console.c	Tue Feb 26 14:46:57 2008 +0000
@@ -381,7 +381,7 @@ static void xencons_startup(void *opaque
 	qemu_set_fd_handler2(xs_fileno(dom->xsh), NULL, NULL, NULL, NULL);
 
 	fprintf(stderr, "Console: connected to guest frontend\n");
-	if (qemu_set_fd_handler2(dom->xce_handle, NULL, xencons_ring_read, NULL, dom) < 0)
+	if (qemu_set_fd_handler2(xc_evtchn_fd(dom->xce_handle), NULL, xencons_ring_read, NULL, dom) < 0)
 		return;
 
 	qemu_chr_add_handlers(dom->chr, xencons_can_receive, xencons_receive,
diff -r 76479f25cdac -r ca2cf5c1adcc tools/ioemu/hw/xenfb.c
--- a/tools/ioemu/hw/xenfb.c	Tue Feb 26 14:46:07 2008 +0000
+++ b/tools/ioemu/hw/xenfb.c	Tue Feb 26 14:46:57 2008 +0000
@@ -1160,7 +1160,7 @@ static int xenfb_register_console(struct
 			     xenfb);
 	dpy_resize(xenfb->ds, xenfb->width, xenfb->height);
 
-	if (qemu_set_fd_handler2(xenfb->evt_xch, NULL, xenfb_dispatch_channel, NULL, xenfb) < 0)
+	if (qemu_set_fd_handler2(xc_evtchn_fd(xenfb->evt_xch), NULL, xenfb_dispatch_channel, NULL, xenfb) < 0)
 	        return -1;
 	if (qemu_set_fd_handler2(xs_fileno(xenfb->xsh), NULL, xenfb_dispatch_store, NULL, xenfb) < 0)
 		return -1;