@@ -289,9 +289,10 @@ static void qemu_event_increment(void)
/* EAGAIN is fine, a read must be pending. */
if (ret < 0 && errno != EAGAIN) {
- fprintf(stderr, "qemu_event_increment: write() failed: %s\n",
- strerror(errno));
- exit (1);
+ static const char err[] = "qemu_event_increment: write() failed\n";
+
+ ret = write(STDERR_FILENO, err, sizeof err - 1u);
+ _exit(1);
}
}
@@ -119,7 +119,7 @@ extern int max_cpus;
extern int cursor_hide;
extern int graphic_rotate;
extern int no_quit;
-extern int no_shutdown;
+extern volatile int no_shutdown;
extern int semihosting_enabled;
extern int old_param;
extern int boot_menu;
@@ -215,7 +215,7 @@ int acpi_enabled = 1;
int no_hpet = 0;
int fd_bootchk = 1;
int no_reboot = 0;
-int no_shutdown = 0;
+volatile int no_shutdown = 0;
int cursor_hide = 1;
int graphic_rotate = 0;
uint8_t irq0override = 1;
@@ -1178,8 +1178,8 @@ typedef struct QEMUResetEntry {
static QTAILQ_HEAD(reset_handlers, QEMUResetEntry) reset_handlers =
QTAILQ_HEAD_INITIALIZER(reset_handlers);
static int reset_requested;
-static int shutdown_requested, shutdown_signal = -1;
-static pid_t shutdown_pid;
+static volatile int shutdown_requested, shutdown_signal = -1;
+static volatile pid_t shutdown_pid;
static int powerdown_requested;
static int debug_requested;
static int vmstop_requested;
Make variables volatile. "sig_atomic_t" should cover "int" and "pid_t", but where it doesn't, the patch should still do no harm. Also replace calls to functions that are not required to be async-signal-safe [1]. termsig_handler() -> qemu_system_killed(): shutdown_signal, shutdown_pid, no_shutdown [2] -> qemu_system_shutdown_request(): shutdown_requested -> qemu_notify_event() -> qemu_event_increment(): fprintf(), strerror(), exit() [1] http://pubs.opengroup.org/onlinepubs/9699919799/functions/V2_chap02.html#tag_15_04_03_03 [2] http://lists.nongnu.org/archive/html/qemu-devel/2011-09/msg01757.html Build tested only. Signed-off-by: Laszlo Ersek <lersek@redhat.com> --- cpus.c | 7 ++++--- sysemu.h | 2 +- vl.c | 6 +++--- 3 files changed, 8 insertions(+), 7 deletions(-)