From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35629) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aozfN-0000pA-Dz for qemu-devel@nongnu.org; Sat, 09 Apr 2016 16:39:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aozfK-0008Sd-5u for qemu-devel@nongnu.org; Sat, 09 Apr 2016 16:39:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44818) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aozfK-0008SX-0H for qemu-devel@nongnu.org; Sat, 09 Apr 2016 16:39:34 -0400 From: Eduardo Habkost Date: Sat, 9 Apr 2016 17:37:44 -0300 Message-Id: <1460234267-20523-2-git-send-email-ehabkost@redhat.com> In-Reply-To: <1460234267-20523-1-git-send-email-ehabkost@redhat.com> References: <1460234267-20523-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH for-2.7 1/4] osdep: Move default qemu_hw_version() value to a macro List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , "Michael S. Tsirkin" , Marcel Apfelbaum , Igor Mammedov The macro will be used by code that will stop calling qemu_hw_version() at runtime and just need a constant value. Signed-off-by: Eduardo Habkost --- include/qemu/osdep.h | 9 +++++++++ util/osdep.c | 9 +-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index 408783f..1ad2fcb 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -298,6 +298,15 @@ static inline void qemu_timersub(const struct timeval *val1, void qemu_set_cloexec(int fd); +/* Starting on QEMU 2.5, qemu_hw_version() returns "2.5+" by default + * instead of QEMU_VERSION, so setting hw_version on MachineClass + * is no longer mandatory. + * + * Do NOT change this string, or it will break compatibility on all + * machine classes that don't set hw_version. + */ +#define QEMU_HW_VERSION "2.5+" + /* QEMU "hardware version" setting. Used to replace code that exposed * QEMU_VERSION to guests in the past and need to keep compatibilty. * Do not use qemu_hw_version() in new code. diff --git a/util/osdep.c b/util/osdep.c index d56d071..9a7a439 100644 --- a/util/osdep.c +++ b/util/osdep.c @@ -44,14 +44,7 @@ extern int madvise(caddr_t, size_t, int); static bool fips_enabled = false; -/* Starting on QEMU 2.5, qemu_hw_version() returns "2.5+" by default - * instead of QEMU_VERSION, so setting hw_version on MachineClass - * is no longer mandatory. - * - * Do NOT change this string, or it will break compatibility on all - * machine classes that don't set hw_version. - */ -static const char *hw_version = "2.5+"; +static const char *hw_version = QEMU_HW_VERSION; int socket_set_cork(int fd, int v) { -- 2.1.0