[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 01/49] qtest: don't report signals if qtest driver
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL v2 01/49] qtest: don't report signals if qtest driver enabled |
Date: |
Mon, 17 Feb 2014 23:24:11 +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 v2 00/49] QOM devices patch queue 2014-02-17, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 02/49] ppcemb-softmmu: Drop Mac and e500 emulation, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 04/49] tests: Fix gcov paths for relocated device sources, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 01/49] qtest: don't report signals if qtest driver enabled,
Andreas Färber <=
- [Qemu-devel] [PULL v2 03/49] target-ppc: Make ppc40x CPUs available in ppcemb, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 05/49] qom-test: Run for all available machines, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 07/49] tests: Run qom-test for every architecture, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 08/49] nand: Don't use qdev_create() in nand_init(), Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 06/49] qom-test: Test shutdown in addition to startup, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 10/49] pxa2xx: QOM'ify I2C slave, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 11/49] tosa: QOM'ify DAC, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 12/49] z2: QOM'ify AER915, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 13/49] wm8750: QOM'ify, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 09/49] i2c: Rename i2c_bus to I2CBus, Andreas Färber, 2014/02/17