From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:37910) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SxRPg-0001jM-FI for qemu-devel@nongnu.org; Fri, 03 Aug 2012 19:36:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SxRPf-00021l-HH for qemu-devel@nongnu.org; Fri, 03 Aug 2012 19:36:12 -0400 Received: from e6.ny.us.ibm.com ([32.97.182.146]:49277) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SxRPf-00021d-C0 for qemu-devel@nongnu.org; Fri, 03 Aug 2012 19:36:11 -0400 Received: from /spool/local by e6.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 3 Aug 2012 19:36:07 -0400 Received: from d01relay02.pok.ibm.com (d01relay02.pok.ibm.com [9.56.227.234]) by d01dlp01.pok.ibm.com (Postfix) with ESMTP id A9BB638C8041 for ; Fri, 3 Aug 2012 19:35:07 -0400 (EDT) Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by d01relay02.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q73NZ7iK126222 for ; Fri, 3 Aug 2012 19:35:07 -0400 Received: from d01av01.pok.ibm.com (loopback [127.0.0.1]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q74560ZY007192 for ; Sat, 4 Aug 2012 01:06:00 -0400 From: Anthony Liguori In-Reply-To: <1344036698-4427-1-git-send-email-aliguori@us.ibm.com> References: <1344036698-4427-1-git-send-email-aliguori@us.ibm.com> Date: Fri, 03 Aug 2012 18:35:04 -0500 Message-ID: <87a9ybeehj.fsf@codemonkey.ws> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Subject: Re: [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 writes: > 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. Applied. Regards, Anthony Liguori > > 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