* [Qemu-devel] Odd code in cpus.c
@ 2011-07-29 8:34 Frediano Ziglio
2011-07-29 8:49 ` Jan Kiszka
0 siblings, 1 reply; 3+ messages in thread
From: Frediano Ziglio @ 2011-07-29 8:34 UTC (permalink / raw)
To: Anthony Liguori; +Cc: qemu-devel
I don't know that much this code however qemu_kvm_init_cpu_signals
seems a bit strange and duplicate to me, in cpus.c
static void qemu_kvm_init_cpu_signals(CPUState *env)
{
int r;
sigset_t set;
struct sigaction sigact;
memset(&sigact, 0, sizeof(sigact));
sigact.sa_handler = dummy_signal;
sigaction(SIG_IPI, &sigact, NULL);
#ifdef CONFIG_IOTHREAD
pthread_sigmask(SIG_BLOCK, NULL, &set);
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);
}
#else
sigemptyset(&set);
sigaddset(&set, SIG_IPI);
sigaddset(&set, SIGIO);
sigaddset(&set, SIGALRM);
pthread_sigmask(SIG_BLOCK, &set, NULL);
pthread_sigmask(SIG_BLOCK, NULL, &set);
sigdelset(&set, SIGIO);
sigdelset(&set, SIGALRM);
#endif
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);
}
}
if CONFIG_IOTHREAD is set you get
static void qemu_kvm_init_cpu_signals(CPUState *env)
{
int r;
sigset_t set;
struct sigaction sigact;
memset(&sigact, 0, sizeof(sigact));
sigact.sa_handler = dummy_signal;
sigaction(SIG_IPI, &sigact, NULL);
pthread_sigmask(SIG_BLOCK, NULL, &set);
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);
}
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);
}
}
which seems to set kvm signal twice with same values (taking into
account that in kvm_set_signal_mask the set is copied before the call
to kvm_vcpu_ioctl).
Frediano
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [Qemu-devel] Odd code in cpus.c
2011-07-29 8:34 [Qemu-devel] Odd code in cpus.c Frediano Ziglio
@ 2011-07-29 8:49 ` Jan Kiszka
2011-07-29 8:51 ` Paolo Bonzini
0 siblings, 1 reply; 3+ messages in thread
From: Jan Kiszka @ 2011-07-29 8:49 UTC (permalink / raw)
To: Frediano Ziglio; +Cc: Paolo Bonzini, qemu-devel
On 2011-07-29 10:34, Frediano Ziglio wrote:
> I don't know that much this code however qemu_kvm_init_cpu_signals
> seems a bit strange and duplicate to me, in cpus.c
>
>
> static void qemu_kvm_init_cpu_signals(CPUState *env)
> {
> int r;
> sigset_t set;
> struct sigaction sigact;
>
> memset(&sigact, 0, sizeof(sigact));
> sigact.sa_handler = dummy_signal;
> sigaction(SIG_IPI, &sigact, NULL);
>
> #ifdef CONFIG_IOTHREAD
> pthread_sigmask(SIG_BLOCK, NULL, &set);
> 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);
> }
> #else
> sigemptyset(&set);
> sigaddset(&set, SIG_IPI);
> sigaddset(&set, SIGIO);
> sigaddset(&set, SIGALRM);
> pthread_sigmask(SIG_BLOCK, &set, NULL);
>
> pthread_sigmask(SIG_BLOCK, NULL, &set);
> sigdelset(&set, SIGIO);
> sigdelset(&set, SIGALRM);
> #endif
> 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);
> }
> }
>
>
> if CONFIG_IOTHREAD is set you get
>
>
> static void qemu_kvm_init_cpu_signals(CPUState *env)
> {
> int r;
> sigset_t set;
> struct sigaction sigact;
>
> memset(&sigact, 0, sizeof(sigact));
> sigact.sa_handler = dummy_signal;
> sigaction(SIG_IPI, &sigact, NULL);
>
> pthread_sigmask(SIG_BLOCK, NULL, &set);
> 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);
> }
> 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);
> }
> }
>
>
> which seems to set kvm signal twice with same values (taking into
> account that in kvm_set_signal_mask the set is copied before the call
> to kvm_vcpu_ioctl).
Indeed. Harmless fortunately. I suspect the duplicate bits in the #ifdef
CONFIG_IOTHREAD block were simply forgotten. Paolo?
Jan
--
Siemens AG, Corporate Technology, CT T DE IT 1
Corporate Competence Center Embedded Linux
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [Qemu-devel] Odd code in cpus.c
2011-07-29 8:49 ` Jan Kiszka
@ 2011-07-29 8:51 ` Paolo Bonzini
0 siblings, 0 replies; 3+ messages in thread
From: Paolo Bonzini @ 2011-07-29 8:51 UTC (permalink / raw)
To: Jan Kiszka; +Cc: Frediano Ziglio, qemu-devel
On 07/29/2011 10:49 AM, Jan Kiszka wrote:
>> >
>> > which seems to set kvm signal twice with same values (taking into
>> > account that in kvm_set_signal_mask the set is copied before the call
>> > to kvm_vcpu_ioctl).
> Indeed. Harmless fortunately. I suspect the duplicate bits in the #ifdef
> CONFIG_IOTHREAD block were simply forgotten. Paolo?
Yes, perhaps a rebase conflict was resolved erroneously. Can probably
get in via qemu-trivial.
Paolo
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-07-29 8:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-29 8:34 [Qemu-devel] Odd code in cpus.c Frediano Ziglio
2011-07-29 8:49 ` Jan Kiszka
2011-07-29 8:51 ` Paolo Bonzini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).