[Qemu-devel] [PATCH 1/2] cleanup, Remove duplicated code

[Qemu-devel] [PATCH 1/2] cleanup, Remove duplicated code

[Lai Jiangshan]

These two blocks of code are exactly the same, remove one.

Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
---
 cpus.c |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/cpus.c b/cpus.c
index 857f96f..f45a438 100644
--- a/cpus.c
+++ b/cpus.c
@@ -565,14 +565,6 @@ static void qemu_kvm_init_cpu_signals(CPUState *env)
         fprintf(stderr, "kvm_set_signal_mask: %s\n", strerror(-r));
         exit(1);
     }
-
-    sigdelset(&set, SIG_IPI);
-    sigdelset(&set, SIGBUS);
-    r = kvm_set_signal_mask(env, &set);
-    if (r) {
-        fprintf(stderr, "kvm_set_signal_mask: %s\n", strerror(-r));
-        exit(1);
-    }
 }
 
 static void qemu_tcg_init_cpu_signals(void)
-- 
1.7.4.4

[Qemu-devel] [PATCH 2/2] cleanup, save a syscall

[Lai Jiangshan]

Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
---
 main-loop.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/main-loop.c b/main-loop.c
index 60e9748..692381c 100644
--- a/main-loop.c
+++ b/main-loop.c
@@ -142,14 +142,12 @@ static int qemu_signal_init(void)
      */
     sigemptyset(&set);
     sigaddset(&set, SIG_IPI);
-    pthread_sigmask(SIG_BLOCK, &set, NULL);
-
-    sigemptyset(&set);
     sigaddset(&set, SIGIO);
     sigaddset(&set, SIGALRM);
     sigaddset(&set, SIGBUS);
     pthread_sigmask(SIG_BLOCK, &set, NULL);
 
+    sigdelset(&set, SIG_IPI);
     sigfd = qemu_signalfd(&set);
     if (sigfd == -1) {
         fprintf(stderr, "failed to create signalfd\n");
-- 
1.7.4.4

Re: [Qemu-devel] [PATCH 1/2] cleanup, Remove duplicated code

[Anthony Liguori]

On 01/12/2012 03:05 AM, Lai Jiangshan wrote:
> These two blocks of code are exactly the same, remove one.
>
> Signed-off-by: Lai Jiangshan<laijs@cn.fujitsu.com>

Applied all.  Thanks.

Regards,

Anthony Liguori

> ---
>   cpus.c |    8 --------
>   1 files changed, 0 insertions(+), 8 deletions(-)
>
> diff --git a/cpus.c b/cpus.c
> index 857f96f..f45a438 100644
> --- a/cpus.c
> +++ b/cpus.c
> @@ -565,14 +565,6 @@ static void qemu_kvm_init_cpu_signals(CPUState *env)
>           fprintf(stderr, "kvm_set_signal_mask: %s\n", strerror(-r));
>           exit(1);
>       }
> -
> -    sigdelset(&set, SIG_IPI);
> -    sigdelset(&set, SIGBUS);
> -    r = kvm_set_signal_mask(env,&set);
> -    if (r) {
> -        fprintf(stderr, "kvm_set_signal_mask: %s\n", strerror(-r));
> -        exit(1);
> -    }
>   }
>
>   static void qemu_tcg_init_cpu_signals(void)