From 1dacd88ddcf33eb6ed044c4080e3ef5e3de4b6b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Wed, 23 Mar 2022 19:57:27 +0400 Subject: [PATCH] include: move TFR to osdep.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The macro requires EINTR, which has its header included in osdep.h. (Not sure what TFR stands for, perhaps "Test For Retry". Rename it ?) Signed-off-by: Marc-André Lureau Message-Id: <20220323155743.1585078-17-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- include/qemu-common.h | 2 -- include/qemu/osdep.h | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/qemu-common.h b/include/qemu-common.h index f9b3f85b81..db8b03be51 100644 --- a/include/qemu-common.h +++ b/include/qemu-common.h @@ -10,8 +10,6 @@ #ifndef QEMU_COMMON_H #define QEMU_COMMON_H -#define TFR(expr) do { if ((expr) != -1) break; } while (errno == EINTR) - /* Copyright string for -version arguments, About dialogs, etc */ #define QEMU_COPYRIGHT "Copyright (c) 2003-2022 " \ "Fabrice Bellard and the QEMU Project developers" diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index 240b48707e..489a5d1aad 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -226,6 +226,8 @@ extern "C" { #define ESHUTDOWN 4099 #endif +#define TFR(expr) do { if ((expr) != -1) break; } while (errno == EINTR) + /* time_t may be either 32 or 64 bits depending on the host OS, and * can be either signed or unsigned, so we can't just hardcode a * specific maximum value. This is not a C preprocessor constant,