Skip to contentSkip to conversation

chardev: Use real-time clock for open timer

PATCH Applied Jan Kiszka 4 participants 4 messages Nov 22, 2012 – Nov 26, 2012

lore
Share & tools
lore

Jan Kiszka

author
#0 lore raw

PATCH 1/1 chardev: Use real-time clock for open timer

The vm clock may be stopped, and then we won't get open events anymore. Seen with QMP sessions.

Reported-by Dietmar Maurer <[email protected]>
Tested-by Luiz Capitulino <[email protected]>
Signed-off-by Jan Kiszka <[email protected]>
---
 qemu-char.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
qemu-char.c +2 -2
index 88f4025..242b799 100644
@@ -134,9 +134,9 @@ static void qemu_chr_fire_open_event(void *opaque)
 void qemu_chr_generic_open(CharDriverState *s)
 {
     if (s->open_timer == NULL) {
-        s->open_timer = qemu_new_timer_ms(vm_clock,
+        s->open_timer = qemu_new_timer_ms(rt_clock,
                                           qemu_chr_fire_open_event, s);
-        qemu_mod_timer(s->open_timer, qemu_get_clock_ms(vm_clock) - 1);
+        qemu_mod_timer(s->open_timer, qemu_get_clock_ms(rt_clock) - 1);
     }
 }
Signature · 1 line
1.7.3.4
#1 lore raw

[Qemu-devel] for-1.3: [PATCH] chardev: Use real-time clock for open timer

To avoid it getting lost in qemu forest.

Applied
#2 lore raw
In reply to Jan Kiszka

Thanks, applied.

Quoted 29 lines · Jan Kiszka

The vm clock may be stopped, and then we won't get open events anymore. Seen with QMP sessions.

Reported-by Dietmar Maurer <[email protected]>
Tested-by Luiz Capitulino <[email protected]>
Signed-off-by Jan Kiszka <[email protected]>
---
 qemu-char.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
qemu-char.c +2 -3
index 88f4025..242b799 100644
@@ -134,9 +134,9 @@ static void qemu_chr_fire_open_event(void *opaque)
 void qemu_chr_generic_open(CharDriverState *s)
 {
     if (s->open_timer == NULL) {
-        s->open_timer = qemu_new_timer_ms(vm_clock,
+        s->open_timer = qemu_new_timer_ms(rt_clock,
                                           qemu_chr_fire_open_event, s);
-        qemu_mod_timer(s->open_timer, qemu_get_clock_ms(vm_clock) - 1);
+        qemu_mod_timer(s->open_timer, qemu_get_clock_ms(rt_clock) - 1);
     }
 }
 
--

1.7.3.4

Applied
#3 lore raw
In reply to Jan Kiszka
Quoted 6 lines · Jan Kiszka

The vm clock may be stopped, and then we won't get open events anymore. Seen with QMP sessions.

Reported-by Dietmar Maurer <[email protected]>
Tested-by Luiz Capitulino <[email protected]>
Signed-off-by Jan Kiszka <[email protected]>

Applied. Thanks.

Regards,

Anthony Liguori

Quoted 22 lines
---
 qemu-char.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
qemu-char.c +2 -2
index 88f4025..242b799 100644
@@ -134,9 +134,9 @@ static void qemu_chr_fire_open_event(void *opaque)
 void qemu_chr_generic_open(CharDriverState *s)
 {
     if (s->open_timer == NULL) {
-        s->open_timer = qemu_new_timer_ms(vm_clock,
+        s->open_timer = qemu_new_timer_ms(rt_clock,
                                           qemu_chr_fire_open_event, s);
-        qemu_mod_timer(s->open_timer, qemu_get_clock_ms(vm_clock) - 1);
+        qemu_mod_timer(s->open_timer, qemu_get_clock_ms(rt_clock) - 1);
     }
 }
Signature · 1 line
1.7.3.4