[Qemu-devel] [PATCH] core: remove qemu_service_io

[Qemu-devel] [PATCH] core: remove qemu_service_io

[Frediano Ziglio]

qemu_service_io was mainly an alias to qemu_notify_event,
currently used only by PPC for timer hack, so call
qemu_notify_event directly.

Signed-off-by: Frediano Ziglio <freddy77@gmail.com>
---
 arch_init.c          |    5 -----
 qemu-common.h        |    3 ---
 qemu-tool.c          |    4 ----
 target-ppc/kvm_ppc.c |    2 +-
 4 files changed, 1 insertions(+), 13 deletions(-)

diff --git a/arch_init.c b/arch_init.c
index 9a5a0e3..a6c69c7 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -459,11 +459,6 @@ int ram_load(QEMUFile *f, void *opaque, int version_id)
     return 0;
 }
 
-void qemu_service_io(void)
-{
-    qemu_notify_event();
-}
-
 #ifdef HAS_AUDIO
 struct soundhw {
     const char *name;
diff --git a/qemu-common.h b/qemu-common.h
index 404c421..5e87bdf 100644
--- a/qemu-common.h
+++ b/qemu-common.h
@@ -276,9 +276,6 @@ void cpu_exec_init_all(void);
 void cpu_save(QEMUFile *f, void *opaque);
 int cpu_load(QEMUFile *f, void *opaque, int version_id);
 
-/* 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);
 
diff --git a/qemu-tool.c b/qemu-tool.c
index eb89fe0..e9f7fe1 100644
--- a/qemu-tool.c
+++ b/qemu-tool.c
@@ -29,10 +29,6 @@ struct QEMUBH
     void *opaque;
 };
 
-void qemu_service_io(void)
-{
-}
-
 Monitor *cur_mon;
 
 int monitor_cur_is_qmp(void)
diff --git a/target-ppc/kvm_ppc.c b/target-ppc/kvm_ppc.c
index 867dc1d..c031fcb 100644
--- a/target-ppc/kvm_ppc.c
+++ b/target-ppc/kvm_ppc.c
@@ -88,7 +88,7 @@ void kvmppc_fdt_update(void *fdt)
 
 static void kvmppc_timer_hack(void *opaque)
 {
-    qemu_service_io();
+    qemu_notify_event();
     qemu_mod_timer(kvmppc_timer, qemu_get_clock_ns(vm_clock) + kvmppc_timer_rate);
 }
 
-- 
1.7.1

Re: [Qemu-devel] [PATCH] core: remove qemu_service_io

[Anthony Liguori]

On 09/22/2011 04:26 AM, Frediano Ziglio wrote:
> qemu_service_io was mainly an alias to qemu_notify_event,
> currently used only by PPC for timer hack, so call
> qemu_notify_event directly.
>
> Signed-off-by: Frediano Ziglio<freddy77@gmail.com>

Applied.  Thanks.

Regards,

Anthony Liguori

> ---
>   arch_init.c          |    5 -----
>   qemu-common.h        |    3 ---
>   qemu-tool.c          |    4 ----
>   target-ppc/kvm_ppc.c |    2 +-
>   4 files changed, 1 insertions(+), 13 deletions(-)
>
> diff --git a/arch_init.c b/arch_init.c
> index 9a5a0e3..a6c69c7 100644
> --- a/arch_init.c
> +++ b/arch_init.c
> @@ -459,11 +459,6 @@ int ram_load(QEMUFile *f, void *opaque, int version_id)
>       return 0;
>   }
>
> -void qemu_service_io(void)
> -{
> -    qemu_notify_event();
> -}
> -
>   #ifdef HAS_AUDIO
>   struct soundhw {
>       const char *name;
> diff --git a/qemu-common.h b/qemu-common.h
> index 404c421..5e87bdf 100644
> --- a/qemu-common.h
> +++ b/qemu-common.h
> @@ -276,9 +276,6 @@ void cpu_exec_init_all(void);
>   void cpu_save(QEMUFile *f, void *opaque);
>   int cpu_load(QEMUFile *f, void *opaque, int version_id);
>
> -/* 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);
>
> diff --git a/qemu-tool.c b/qemu-tool.c
> index eb89fe0..e9f7fe1 100644
> --- a/qemu-tool.c
> +++ b/qemu-tool.c
> @@ -29,10 +29,6 @@ struct QEMUBH
>       void *opaque;
>   };
>
> -void qemu_service_io(void)
> -{
> -}
> -
>   Monitor *cur_mon;
>
>   int monitor_cur_is_qmp(void)
> diff --git a/target-ppc/kvm_ppc.c b/target-ppc/kvm_ppc.c
> index 867dc1d..c031fcb 100644
> --- a/target-ppc/kvm_ppc.c
> +++ b/target-ppc/kvm_ppc.c
> @@ -88,7 +88,7 @@ void kvmppc_fdt_update(void *fdt)
>
>   static void kvmppc_timer_hack(void *opaque)
>   {
> -    qemu_service_io();
> +    qemu_notify_event();
>       qemu_mod_timer(kvmppc_timer, qemu_get_clock_ns(vm_clock) + kvmppc_timer_rate);
>   }
>