Skip to contentSkip to conversation

qtest: don't report signals if qtest driver enabled

PATCH In review Michael S. Tsirkin 2 participants 3 messages Feb 4, 2014 – Feb 5, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 qtest: don't report signals if qtest driver enabled

qtest driver always uses signals to kill qemu no need to report it, whatever the accelerator state.

Add API to detect qtest driver, and suppress reporting signals in this case.

---
 include/sysemu/qtest.h | 2 ++
 qtest.c                | 5 +++++
 vl.c                   | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)
include/sysemu/qtest.h +2 -0
index 112a661..6aca8e4 100644
@@ -23,6 +23,8 @@ static inline bool qtest_enabled(void)
     return qtest_allowed;
 }
 
+bool qtest_driver(void);
+
 int qtest_init_accel(void);
 void qtest_init(const char *qtest_chrdev, const char *qtest_log);
 
qtest.c +5 -0
index dcf1301..a738afc 100644
@@ -528,3 +528,8 @@ void qtest_init(const char *qtest_chrdev, const char *qtest_log)
 
     qtest_chr = chr;
 }
+
+bool qtest_driver(void)
+{
+    return qtest_chr;
+}
vl.c +1 -1
index 60dbbcb..dddbbce 100644
@@ -1748,7 +1748,7 @@ static int qemu_shutdown_requested(void)
 
 static void qemu_kill_report(void)
 {
-    if (!qtest_enabled() && shutdown_signal != -1) {
+    if (!qtest_driver() && shutdown_signal != -1) {
         fprintf(stderr, "qemu: terminating on signal %d", shutdown_signal);
         if (shutdown_pid == 0) {
             /* This happens for eg ^C at the terminal, so it's worth
Signature · 1 line
MST
Tested-by on v1 1/1
#1 lore raw

Am 04.02.2014 19:06, schrieb Michael S. Tsirkin:

Quoted 8 lines

qtest driver always uses signals to kill qemu no need to report it, whatever the accelerator state.

Add API to detect qtest driver, and suppress reporting signals in this case.

We could do some bikeshedding about better names for qtest_driver(), but I'm happy to learn that it was just noise and not a real issue.

I'll queue a copy for my qom-test work, but through whose queue should this best go? PMM directly?

Thanks,
Andreas

Signature · 2 lines
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
#2 lore raw
Quoted 12 lines · Andreas Färber

Am 04.02.2014 19:06, schrieb Michael S. Tsirkin:

Quoted 8 lines

qtest driver always uses signals to kill qemu no need to report it, whatever the accelerator state.

Add API to detect qtest driver, and suppress reporting signals in this case.

Quoted 8 lines

We could do some bikeshedding about better names for qtest_driver(), but I'm happy to learn that it was just noise and not a real issue.

I'll queue a copy for my qom-test work, but through whose queue should this best go? PMM directly?

Thanks,
Andreas

It affects acpi tests so for now I have it on my queue.

Quoted 3 lines
Signature · 2 lines
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg