QVM86 / KQEMU for Windows updates

diff -u -p -r1.34 exec-all.h
@@ -607,6 +607,7 @@ int kqemu_init(CPUState *env);
 int kqemu_cpu_exec(CPUState *env);
 void kqemu_flush_page(CPUState *env, target_ulong addr);
 void kqemu_flush(CPUState *env, int global);
+void kqemu_cpu_interrupt(CPUState *env);
 
 static inline int kqemu_is_ok(CPUState *env)
 {

diff -u -p -r1.4 kqemu.c
@@ -456,11 +456,14 @@ int kqemu_cpu_exec(CPUState *env)
     }
 
 #ifdef _WIN32
-    DeviceIoControl(kqemu_fd, KQEMU_EXEC,
-		    kenv, sizeof(struct kqemu_cpu_state),
-		    kenv, sizeof(struct kqemu_cpu_state),
-		    &temp, NULL);
-    ret = kenv->retval;
+    if (DeviceIoControl(kqemu_fd, KQEMU_EXEC,
+                        kenv, sizeof(struct kqemu_cpu_state),
+                        kenv, sizeof(struct kqemu_cpu_state),
+                        &temp, NULL)) {
+        ret = kenv->retval;
+    } else {
+        ret = -1;
+    }
 #else
 #if KQEMU_VERSION >= 0x010100
     ioctl(kqemu_fd, KQEMU_EXEC, kenv);

@@ -544,6 +547,15 @@ int kqemu_cpu_exec(CPUState *env)
         exit(1);
     }
     return 0;
+}
+
+void kqemu_cpu_interrupt(CPUState *env)
+{
+#if defined(_WIN32) && KQEMU_VERSION >= 0x010101
+    /* cancelling the I/O request causes KQEMU to finish executing the 
+       current block and successfully returning. */
+    CancelIo(kqemu_fd);
+#endif
 }
 
 #endif

diff -u -p -r1.133 vl.c
@@ -875,6 +875,9 @@ static void host_alarm_handler(int host_
                            qemu_get_clock(rt_clock))) {
         /* stop the cpu because a timer occured */
         cpu_interrupt(global_env, CPU_INTERRUPT_EXIT);
+#ifdef USE_KQEMU
+        kqemu_cpu_interrupt(global_env);
+#endif
     }
 }
 

103 lines not on this page · raw message

@@ -1,7 +1,7 @@
 #ifndef KQEMU_H
 #define KQEMU_H
 
-#define KQEMU_VERSION 0x010100
+#define KQEMU_VERSION 0x010101
 
 struct kqemu_segment_cache {
     uint32_t selector;

diff -u -p -r1.3 kqemu.h
@@ -1,7 +1,11 @@
 #ifndef KQEMU_H
 #define KQEMU_H
 
+#ifdef _WIN32
+#define KQEMU_VERSION 0x010101
+#else
 #define KQEMU_VERSION 0x010000
+#endif
 
 struct kqemu_segment_cache {
     uint32_t selector;

diff -u -p -r1.11 qvm86-host.c
@@ -832,7 +832,7 @@ qvm86_handle_exception (qvm86_state * qs
       soft_int (vector);
       /* Return to userspace if there are signals pending, otherwise
          resume guest execution.  */
-      if (host_do_sched())
+      if (host_do_sched(qs))
 	return 2;
       else
 	return 0;

diff -u -p -r1.5 qvm86-linux.c
@@ -67,7 +67,7 @@ MODULE_LICENSE("GPL");
 /* Give other tasks a chance to run.  Returns nonzero if this task has
    signals pending.  */
 int
-host_do_sched()
+host_do_sched (qvm86_state *qs)
 {
   if (need_resched())
       schedule();

128 lines not on this page · raw message

diff -u -p -r1.4 qvm86.h
@@ -244,6 +244,9 @@ typedef struct
   /* This will be nonzero if a fatal error occured.  Usually due to
      something not yet implemented.  Ideally this would never happen.  */
   int die;
+
+  /* This pointer is exclusively for use by specific host code. */
+  void *host_opaque;
 } qvm86_state;
 
 void qvm86_init (qvm86_state * qs, struct kqemu_init * init);

@@ -252,7 +255,7 @@ void qvm86_init_device (qvm86_state *);
 void qvm86_cleanup_device (qvm86_state *);
 /* Give other tasks a chance to run.  Returns nonzero if this task has
    signals pending.  */
-int host_do_sched(void);
+int host_do_sched (qvm86_state *);
 /* Allocate a contiguous block of physical memory.  The returned block must
    be suitable for use with host_phys_addr.  */
 void * host_alloc_pages (int);