ia64/xen-unstable

changeset 17125:ca2cf5c1adcc

ioemu: Do not sue xce_handle directly as a file descriptor.

xce handles are not supposed to be used as file descriptors, but
xc_evtchn_fd() be used.

Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Tue Feb 26 14:46:57 2008 +0000 (2008-02-26)
parents 76479f25cdac
children 580bcd4c9642
files tools/ioemu/hw/xen_console.c tools/ioemu/hw/xenfb.c
line diff
     1.1 --- a/tools/ioemu/hw/xen_console.c	Tue Feb 26 14:46:07 2008 +0000
     1.2 +++ b/tools/ioemu/hw/xen_console.c	Tue Feb 26 14:46:57 2008 +0000
     1.3 @@ -381,7 +381,7 @@ static void xencons_startup(void *opaque
     1.4  	qemu_set_fd_handler2(xs_fileno(dom->xsh), NULL, NULL, NULL, NULL);
     1.5  
     1.6  	fprintf(stderr, "Console: connected to guest frontend\n");
     1.7 -	if (qemu_set_fd_handler2(dom->xce_handle, NULL, xencons_ring_read, NULL, dom) < 0)
     1.8 +	if (qemu_set_fd_handler2(xc_evtchn_fd(dom->xce_handle), NULL, xencons_ring_read, NULL, dom) < 0)
     1.9  		return;
    1.10  
    1.11  	qemu_chr_add_handlers(dom->chr, xencons_can_receive, xencons_receive,
     2.1 --- a/tools/ioemu/hw/xenfb.c	Tue Feb 26 14:46:07 2008 +0000
     2.2 +++ b/tools/ioemu/hw/xenfb.c	Tue Feb 26 14:46:57 2008 +0000
     2.3 @@ -1160,7 +1160,7 @@ static int xenfb_register_console(struct
     2.4  			     xenfb);
     2.5  	dpy_resize(xenfb->ds, xenfb->width, xenfb->height);
     2.6  
     2.7 -	if (qemu_set_fd_handler2(xenfb->evt_xch, NULL, xenfb_dispatch_channel, NULL, xenfb) < 0)
     2.8 +	if (qemu_set_fd_handler2(xc_evtchn_fd(xenfb->evt_xch), NULL, xenfb_dispatch_channel, NULL, xenfb) < 0)
     2.9  	        return -1;
    2.10  	if (qemu_set_fd_handler2(xs_fileno(xenfb->xsh), NULL, xenfb_dispatch_store, NULL, xenfb) < 0)
    2.11  		return -1;