From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:43738)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <pmoore@redhat.com>) id 1SyNS3-0008H1-Dy
	for qemu-devel@nongnu.org; Mon, 06 Aug 2012 09:34:37 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <pmoore@redhat.com>) id 1SyNRy-0003gO-GB
	for qemu-devel@nongnu.org; Mon, 06 Aug 2012 09:34:31 -0400
Received: from mx1.redhat.com ([209.132.183.28]:24170)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <pmoore@redhat.com>) id 1SyNRy-0003g6-7t
	for qemu-devel@nongnu.org; Mon, 06 Aug 2012 09:34:26 -0400
From: Paul Moore <pmoore@redhat.com>
Date: Mon, 06 Aug 2012 09:34:17 -0400
Message-ID: <1604161.8PAmDW4GJb@sifl>
In-Reply-To: <1344036698-4427-1-git-send-email-aliguori@us.ibm.com>
References: <1344036698-4427-1-git-send-email-aliguori@us.ibm.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 7Bit
Content-Type: text/plain; charset="us-ascii"
Subject: Re: [Qemu-devel] [PATCH] fips: fix build on !Linux
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Anthony Liguori <aliguori@us.ibm.com>
Cc: qemu-devel@nongnu.org

On Friday, August 03, 2012 06:31:38 PM Anthony Liguori wrote:
> 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.

Sorry for not catching this, thanks for the fix.

> Cc: Paul Moore <pmoore@redhat.com>
> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
> ---
>  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);
>              }
-- 
paul moore
security and virtualization @ redhat