Patchwork [1/2] Pass QEMUIOWorker to qemu_notify_event

login
register
mail settings
Submitter Marcelo Tosatti
Date March 12, 2010, 2:45 a.m.
Message ID <20100312024808.111854028@redhat.com>
Download mbox | patch
Permalink /patch/47661/
State New
Headers show

Comments

Marcelo Tosatti - March 12, 2010, 2:45 a.m.
This can be used later to introduce generic iothread workers.

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Anthony Liguori - March 22, 2010, 9:16 p.m.
On 03/11/2010 08:45 PM, Marcelo Tosatti wrote:
> This can be used later to introduce generic iothread workers.
>
> Signed-off-by: Marcelo Tosatti<mtosatti@redhat.com>
>    

Could you rebase this?  It failed to apply in a strange way that made me 
nervous...

Regards,

Anthony Liguori

> Index: qemu-ioworker/async.c
> ===================================================================
> --- qemu-ioworker.orig/async.c
> +++ qemu-ioworker/async.c
> @@ -180,7 +180,7 @@ void qemu_bh_schedule(QEMUBH *bh)
>       bh->scheduled = 1;
>       bh->idle = 0;
>       /* stop the currently executing CPU to execute the BH ASAP */
> -    qemu_notify_event();
> +    qemu_notify_event(main_io_worker);
>   }
>
>   void qemu_bh_cancel(QEMUBH *bh)
> Index: qemu-ioworker/hw/mac_dbdma.c
> ===================================================================
> --- qemu-ioworker.orig/hw/mac_dbdma.c
> +++ qemu-ioworker/hw/mac_dbdma.c
> @@ -655,7 +655,7 @@ void DBDMA_register_channel(void *dbdma,
>
>   void DBDMA_schedule(void)
>   {
> -    qemu_notify_event();
> +    qemu_notify_event(main_io_worker);
>   }
>
>   static void
> Index: qemu-ioworker/hw/virtio-net.c
> ===================================================================
> --- qemu-ioworker.orig/hw/virtio-net.c
> +++ qemu-ioworker/hw/virtio-net.c
> @@ -359,7 +359,7 @@ static void virtio_net_handle_rx(VirtIOD
>
>       /* We now have RX buffers, signal to the IO thread to break out of the
>        * select to re-poll the tap file descriptor */
> -    qemu_notify_event();
> +    qemu_notify_event(main_io_worker);
>   }
>
>   static int virtio_net_can_receive(VLANClientState *nc)
> Index: qemu-ioworker/qemu-common.h
> ===================================================================
> --- qemu-ioworker.orig/qemu-common.h
> +++ qemu-ioworker/qemu-common.h
> @@ -234,11 +234,17 @@ typedef uint64_t pcibus_t;
>   void cpu_save(QEMUFile *f, void *opaque);
>   int cpu_load(QEMUFile *f, void *opaque, int version_id);
>
> +typedef struct QEMUIOWorker {
> +    void *opaque;
> +} QEMUIOWorker;
> +
>   /* Force QEMU to stop what it's doing and service IO */
>   void qemu_service_io(void);
>
>   /* Force QEMU to process pending events */
> -void qemu_notify_event(void);
> +void qemu_notify_event(QEMUIOWorker *worker);
> +
> +extern QEMUIOWorker *main_io_worker;
>
>   /* Unblock cpu */
>   void qemu_cpu_kick(void *env);
> Index: qemu-ioworker/vl.c
> ===================================================================
> --- qemu-ioworker.orig/vl.c
> +++ qemu-ioworker/vl.c
> @@ -274,6 +274,9 @@ uint8_t qemu_uuid[16];
>   static QEMUBootSetHandler *boot_set_handler;
>   static void *boot_set_opaque;
>
> +QEMUIOWorker iothread_worker;
> +QEMUIOWorker *main_io_worker =&iothread_worker;
> +
>   #ifdef SIGRTMIN
>   #define SIG_IPI (SIGRTMIN+4)
>   #else
> @@ -885,7 +888,7 @@ void qemu_mod_timer(QEMUTimer *ts, int64
>           }
>           /* Interrupt execution to force deadline recalculation.  */
>           if (use_icount)
> -            qemu_notify_event();
> +            qemu_notify_event(main_io_worker);
>       }
>   }
>
> @@ -1062,7 +1065,7 @@ static void host_alarm_handler(int host_
>           }
>   #endif
>           timer_alarm_pending = 1;
> -        qemu_notify_event();
> +        qemu_notify_event(main_io_worker);
>       }
>   }
>
> @@ -2928,7 +2931,7 @@ static int ram_load(QEMUFile *f, void *o
>
>   void qemu_service_io(void)
>   {
> -    qemu_notify_event();
> +    qemu_notify_event(main_io_worker);
>   }
>
>   /***********************************************************/
> @@ -3180,26 +3183,26 @@ void qemu_system_reset_request(void)
>       } else {
>           reset_requested = 1;
>       }
> -    qemu_notify_event();
> +    qemu_notify_event(main_io_worker);
>   }
>
>   void qemu_system_shutdown_request(void)
>   {
>       shutdown_requested = 1;
> -    qemu_notify_event();
> +    qemu_notify_event(main_io_worker);
>   }
>
>   void qemu_system_powerdown_request(void)
>   {
>       powerdown_requested = 1;
> -    qemu_notify_event();
> +    qemu_notify_event(main_io_worker);
>   }
>
>   #ifdef CONFIG_IOTHREAD
>   static void qemu_system_vmstop_request(int reason)
>   {
>       vmstop_requested = reason;
> -    qemu_notify_event();
> +    qemu_notify_event(main_io_worker);
>   }
>   #endif
>
> @@ -3341,7 +3344,7 @@ void qemu_cpu_kick(void *env)
>       return;
>   }
>
> -void qemu_notify_event(void)
> +void qemu_notify_event(QEMUIOWorker *worker)
>   {
>       CPUState *env = cpu_single_env;
>
> @@ -3727,7 +3730,7 @@ void qemu_init_vcpu(void *_env)
>           tcg_init_vcpu(env);
>   }
>
> -void qemu_notify_event(void)
> +void qemu_notify_event(QEMUIOWorker *worker)
>   {
>       qemu_event_increment();
>   }
>
>
>
>
>
>
Marcelo Tosatti - March 25, 2010, 1:47 p.m.
Rebased to latest qemu.git.

Patch

Index: qemu-ioworker/async.c
===================================================================
--- qemu-ioworker.orig/async.c
+++ qemu-ioworker/async.c
@@ -180,7 +180,7 @@  void qemu_bh_schedule(QEMUBH *bh)
     bh->scheduled = 1;
     bh->idle = 0; 
     /* stop the currently executing CPU to execute the BH ASAP */
-    qemu_notify_event();
+    qemu_notify_event(main_io_worker);
 }
 
 void qemu_bh_cancel(QEMUBH *bh)
Index: qemu-ioworker/hw/mac_dbdma.c
===================================================================
--- qemu-ioworker.orig/hw/mac_dbdma.c
+++ qemu-ioworker/hw/mac_dbdma.c
@@ -655,7 +655,7 @@  void DBDMA_register_channel(void *dbdma,
 
 void DBDMA_schedule(void)
 {
-    qemu_notify_event();
+    qemu_notify_event(main_io_worker);
 }
 
 static void
Index: qemu-ioworker/hw/virtio-net.c
===================================================================
--- qemu-ioworker.orig/hw/virtio-net.c
+++ qemu-ioworker/hw/virtio-net.c
@@ -359,7 +359,7 @@  static void virtio_net_handle_rx(VirtIOD
 
     /* We now have RX buffers, signal to the IO thread to break out of the
      * select to re-poll the tap file descriptor */
-    qemu_notify_event();
+    qemu_notify_event(main_io_worker);
 }
 
 static int virtio_net_can_receive(VLANClientState *nc)
Index: qemu-ioworker/qemu-common.h
===================================================================
--- qemu-ioworker.orig/qemu-common.h
+++ qemu-ioworker/qemu-common.h
@@ -234,11 +234,17 @@  typedef uint64_t pcibus_t;
 void cpu_save(QEMUFile *f, void *opaque);
 int cpu_load(QEMUFile *f, void *opaque, int version_id);
 
+typedef struct QEMUIOWorker {
+    void *opaque;
+} QEMUIOWorker;
+
 /* Force QEMU to stop what it's doing and service IO */
 void qemu_service_io(void);
 
 /* Force QEMU to process pending events */
-void qemu_notify_event(void);
+void qemu_notify_event(QEMUIOWorker *worker);
+
+extern QEMUIOWorker *main_io_worker;
 
 /* Unblock cpu */
 void qemu_cpu_kick(void *env);
Index: qemu-ioworker/vl.c
===================================================================
--- qemu-ioworker.orig/vl.c
+++ qemu-ioworker/vl.c
@@ -274,6 +274,9 @@  uint8_t qemu_uuid[16];
 static QEMUBootSetHandler *boot_set_handler;
 static void *boot_set_opaque;
 
+QEMUIOWorker iothread_worker;
+QEMUIOWorker *main_io_worker = &iothread_worker;
+
 #ifdef SIGRTMIN
 #define SIG_IPI (SIGRTMIN+4)
 #else
@@ -885,7 +888,7 @@  void qemu_mod_timer(QEMUTimer *ts, int64
         }
         /* Interrupt execution to force deadline recalculation.  */
         if (use_icount)
-            qemu_notify_event();
+            qemu_notify_event(main_io_worker);
     }
 }
 
@@ -1062,7 +1065,7 @@  static void host_alarm_handler(int host_
         }
 #endif
         timer_alarm_pending = 1;
-        qemu_notify_event();
+        qemu_notify_event(main_io_worker);
     }
 }
 
@@ -2928,7 +2931,7 @@  static int ram_load(QEMUFile *f, void *o
 
 void qemu_service_io(void)
 {
-    qemu_notify_event();
+    qemu_notify_event(main_io_worker);
 }
 
 /***********************************************************/
@@ -3180,26 +3183,26 @@  void qemu_system_reset_request(void)
     } else {
         reset_requested = 1;
     }
-    qemu_notify_event();
+    qemu_notify_event(main_io_worker);
 }
 
 void qemu_system_shutdown_request(void)
 {
     shutdown_requested = 1;
-    qemu_notify_event();
+    qemu_notify_event(main_io_worker);
 }
 
 void qemu_system_powerdown_request(void)
 {
     powerdown_requested = 1;
-    qemu_notify_event();
+    qemu_notify_event(main_io_worker);
 }
 
 #ifdef CONFIG_IOTHREAD
 static void qemu_system_vmstop_request(int reason)
 {
     vmstop_requested = reason;
-    qemu_notify_event();
+    qemu_notify_event(main_io_worker);
 }
 #endif
 
@@ -3341,7 +3344,7 @@  void qemu_cpu_kick(void *env)
     return;
 }
 
-void qemu_notify_event(void)
+void qemu_notify_event(QEMUIOWorker *worker)
 {
     CPUState *env = cpu_single_env;
 
@@ -3727,7 +3730,7 @@  void qemu_init_vcpu(void *_env)
         tcg_init_vcpu(env);
 }
 
-void qemu_notify_event(void)
+void qemu_notify_event(QEMUIOWorker *worker)
 {
     qemu_event_increment();
 }