[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 01/48] qtest: don't report signals if qtest driver en
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 01/48] qtest: don't report signals if qtest driver enabled |
Date: |
Mon, 10 Feb 2014 19:36:18 +0100 |
From: "Michael S. Tsirkin" <address@hidden>
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.
Reported-by: Andreas Färber <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
include/sysemu/qtest.h | 2 ++
qtest.c | 5 +++++
vl.c | 2 +-
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/include/sysemu/qtest.h b/include/sysemu/qtest.h
index 112a661..6aca8e4 100644
--- a/include/sysemu/qtest.h
+++ b/include/sysemu/qtest.h
@@ -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);
diff --git a/qtest.c b/qtest.c
index dcf1301..a738afc 100644
--- a/qtest.c
+++ b/qtest.c
@@ -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;
+}
diff --git a/vl.c b/vl.c
index 383be1b..a7b00cd 100644
--- a/vl.c
+++ b/vl.c
@@ -1750,7 +1750,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
--
1.8.4.5
- [Qemu-devel] [PULL 00/48] QOM devices patch queue 2014-02-10, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 11/48] tosa: QOM'ify DAC, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 08/48] nand: Don't use qdev_create() in nand_init(), Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 09/48] i2c: Rename i2c_bus to I2CBus, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 01/48] qtest: don't report signals if qtest driver enabled,
Andreas Färber <=
- [Qemu-devel] [PULL 10/48] pxa2xx: QOM'ify I2C slave, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 12/48] z2: QOM'ify AER915, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 07/48] tests: Run qom-test for every architecture, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 16/48] lm832x: QOM'ify, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 14/48] ssd0303: QOM'ify, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 06/48] qom-test: Test shutdown in addition to startup, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 19/48] i2c: Drop FROM_I2C_SLAVE() macro, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 05/48] qom-test: Run for all available machines, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 13/48] wm8750: QOM'ify, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 03/48] ppcemb-softmmu: Drop Mac and e500 emulation, Andreas Färber, 2014/02/10