aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/lguest/core.c
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2009-06-13 00:27:10 -0400
committerRusty Russell <rusty@rustcorp.com.au>2009-06-12 08:57:11 -0400
commit5dac051bc6030963181b69faddd9e0ad04f85fa8 (patch)
tree4a0456e1d971bbe9f68f4ac13d31716c12fbb618 /drivers/lguest/core.c
parent659a0e6633567246edcb7bd400c7e2bece9237d9 (diff)
lguest: remove obsolete LHREQ_BREAK call
We no longer need an efficient mechanism to force the Guest back into host userspace, as each device is serviced without bothering the main Guest process (aka. the Launcher). Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'drivers/lguest/core.c')
-rw-r--r--drivers/lguest/core.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c
index 508569c9571a..a6974e9b8ebf 100644
--- a/drivers/lguest/core.c
+++ b/drivers/lguest/core.c
@@ -209,10 +209,6 @@ int run_guest(struct lg_cpu *cpu, unsigned long __user *user)
209 if (signal_pending(current)) 209 if (signal_pending(current))
210 return -ERESTARTSYS; 210 return -ERESTARTSYS;
211 211
212 /* If Waker set break_out, return to Launcher. */
213 if (cpu->break_out)
214 return -EAGAIN;
215
216 /* Check if there are any interrupts which can be delivered now: 212 /* Check if there are any interrupts which can be delivered now:
217 * if so, this sets up the hander to be executed when we next 213 * if so, this sets up the hander to be executed when we next
218 * run the Guest. */ 214 * run the Guest. */
@@ -231,13 +227,12 @@ int run_guest(struct lg_cpu *cpu, unsigned long __user *user)
231 break; 227 break;
232 228
233 /* If the Guest asked to be stopped, we sleep. The Guest's 229 /* If the Guest asked to be stopped, we sleep. The Guest's
234 * clock timer or LHREQ_BREAK from the Waker will wake us. */ 230 * clock timer will wake us. */
235 if (cpu->halted) { 231 if (cpu->halted) {
236 set_current_state(TASK_INTERRUPTIBLE); 232 set_current_state(TASK_INTERRUPTIBLE);
237 /* Just before we sleep, make sure nothing snuck in 233 /* Just before we sleep, make sure no interrupt snuck in
238 * which we should be doing. */ 234 * which we should be doing. */
239 if (interrupt_pending(cpu, &more) < LGUEST_IRQS 235 if (interrupt_pending(cpu, &more) < LGUEST_IRQS)
240 || cpu->break_out)
241 set_current_state(TASK_RUNNING); 236 set_current_state(TASK_RUNNING);
242 else 237 else
243 schedule(); 238 schedule();