From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:53401) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SxRLP-0000B1-Tp for qemu-devel@nongnu.org; Fri, 03 Aug 2012 19:31:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SxRLP-0001Oj-3D for qemu-devel@nongnu.org; Fri, 03 Aug 2012 19:31:47 -0400 Received: from e7.ny.us.ibm.com ([32.97.182.137]:57631) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SxRLO-0001Nc-VE for qemu-devel@nongnu.org; Fri, 03 Aug 2012 19:31:47 -0400 Received: from /spool/local by e7.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 3 Aug 2012 19:31:46 -0400 Received: from d01relay04.pok.ibm.com (d01relay04.pok.ibm.com [9.56.227.236]) by d01dlp03.pok.ibm.com (Postfix) with ESMTP id A8714C9003E for ; Fri, 3 Aug 2012 19:31:41 -0400 (EDT) Received: from d03av03.boulder.ibm.com (d03av03.boulder.ibm.com [9.17.195.169]) by d01relay04.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q73NVesT104990 for ; Fri, 3 Aug 2012 19:31:41 -0400 Received: from d03av03.boulder.ibm.com (loopback [127.0.0.1]) by d03av03.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q73NVeJO025357 for ; Fri, 3 Aug 2012 17:31:40 -0600 From: Anthony Liguori Date: Fri, 3 Aug 2012 18:31:38 -0500 Message-Id: <1344036698-4427-1-git-send-email-aliguori@us.ibm.com> Subject: [Qemu-devel] [PATCH] fips: fix build on !Linux List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paul Moore , Anthony Liguori Commit 0f66998 makes -enable-fips conditional on Linux hosts but then uses it unconditionally in vl.c. Fix this by moving the fips handling to os-posix.c and adding a condition. Cc: Paul Moore Signed-off-by: Anthony Liguori --- os-posix.c | 5 +++++ vl.c | 3 --- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/os-posix.c b/os-posix.c index daf3d6f..79fa228 100644 --- a/os-posix.c +++ b/os-posix.c @@ -188,6 +188,11 @@ void os_parse_cmd_args(int index, const char *optarg) case QEMU_OPTION_daemonize: daemonize = 1; break; +#if defined(CONFIG_LINUX) + case QEMU_OPTION_enablefips: + fips_set_state(true); + break; +#endif } return; } diff --git a/vl.c b/vl.c index 8cda85f..6d2ce45 100644 --- a/vl.c +++ b/vl.c @@ -3199,9 +3199,6 @@ int main(int argc, char **argv, char **envp) case QEMU_OPTION_qtest_log: qtest_log = optarg; break; - case QEMU_OPTION_enablefips: - fips_set_state(true); - break; default: os_parse_cmd_args(popt->index, optarg); } -- 1.7.5.4