diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2007-10-21 21:24:10 -0400 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2007-10-23 01:49:55 -0400 |
commit | 15045275c32bf6d15d32c2eca8157be9c0ba6e45 (patch) | |
tree | 32ef90c875b22cb1bbb94e38f557a690f1c0c6f8 /drivers/lguest/core.c | |
parent | 0ca49ca946409f87a8cd0b14d5acb6dea58de6f3 (diff) |
Remove old lguest I/O infrrasructure.
This patch gets rid of the old lguest host I/O infrastructure and
replaces it with a single hypercall "LHCALL_NOTIFY" which takes an
address.
The main change is the removal of io.c: that mainly did inter-guest
I/O, which virtio doesn't yet support.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'drivers/lguest/core.c')
-rw-r--r-- | drivers/lguest/core.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c index 41b26e592d3..3aec29ec771 100644 --- a/drivers/lguest/core.c +++ b/drivers/lguest/core.c | |||
@@ -202,13 +202,12 @@ int run_guest(struct lguest *lg, unsigned long __user *user) | |||
202 | if (lg->hcall) | 202 | if (lg->hcall) |
203 | do_hypercalls(lg); | 203 | do_hypercalls(lg); |
204 | 204 | ||
205 | /* It's possible the Guest did a SEND_DMA hypercall to the | 205 | /* It's possible the Guest did a NOTIFY hypercall to the |
206 | * Launcher, in which case we return from the read() now. */ | 206 | * Launcher, in which case we return from the read() now. */ |
207 | if (lg->dma_is_pending) { | 207 | if (lg->pending_notify) { |
208 | if (put_user(lg->pending_dma, user) || | 208 | if (put_user(lg->pending_notify, user)) |
209 | put_user(lg->pending_key, user+1)) | ||
210 | return -EFAULT; | 209 | return -EFAULT; |
211 | return sizeof(unsigned long)*2; | 210 | return sizeof(lg->pending_notify); |
212 | } | 211 | } |
213 | 212 | ||
214 | /* Check for signals */ | 213 | /* Check for signals */ |
@@ -288,9 +287,6 @@ static int __init init(void) | |||
288 | if (err) | 287 | if (err) |
289 | goto unmap; | 288 | goto unmap; |
290 | 289 | ||
291 | /* The I/O subsystem needs some things initialized. */ | ||
292 | lguest_io_init(); | ||
293 | |||
294 | /* We might need to reserve an interrupt vector. */ | 290 | /* We might need to reserve an interrupt vector. */ |
295 | err = init_interrupts(); | 291 | err = init_interrupts(); |
296 | if (err) | 292 | if (err) |