[13/16] qemu-kvm: Remove handle_io_window

Commit Message

Jan Kiszka May 13, 2011, 12:14 p.m. UTC

Disentangle the logic around handle_io_window in kvm_run.

Signed-off-by: Jan Kiszka <[e-mail]>
---
 qemu-kvm.c |    9 +--------
 1 files changed, 1 insertions(+), 8 deletions(-)

Patch

diff --git a/qemu-kvm.c b/qemu-kvm.c
index b1405fd..2af70c5 100644
--- a/qemu-kvm.c
+++ b/qemu-kvm.c
@@ -339,11 +339,6 @@  static int handle_mmio(CPUState *env)
     return 0;
 }
 
-static int handle_io_window(kvm_context_t kvm)
-{
-    return 1;
-}
-
 static int handle_shutdown(kvm_context_t kvm, CPUState *env)
 {
     /* stop the current vcpu from going back to guest mode */
@@ -422,8 +417,7 @@  static int kvm_run(CPUState *env)
 
 #if !defined(__s390__)
     if (r == -1) {
-        r = handle_io_window(kvm);
-        goto more;
+        return 1;
     }
 #endif
     if (1) {
@@ -483,7 +477,6 @@  static int kvm_run(CPUState *env)
             break;
         }
     }
-more:
     if (!r) {
         goto again;
     }