qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Anthony Liguori <aliguori@us.ibm.com>
To: qemu-devel@nongnu.org
Cc: Paul Moore <pmoore@redhat.com>, Anthony Liguori <aliguori@us.ibm.com>
Subject: [Qemu-devel] [PATCH] fips: fix build on !Linux
Date: Fri,  3 Aug 2012 18:31:38 -0500	[thread overview]
Message-ID: <1344036698-4427-1-git-send-email-aliguori@us.ibm.com> (raw)

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 <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);
             }
-- 
1.7.5.4

             reply	other threads:[~2012-08-03 23:31 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-03 23:31 Anthony Liguori [this message]
2012-08-03 23:35 ` [Qemu-devel] [PATCH] fips: fix build on !Linux Anthony Liguori
2012-08-06 13:34 ` Paul Moore

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1344036698-4427-1-git-send-email-aliguori@us.ibm.com \
    --to=aliguori@us.ibm.com \
    --cc=pmoore@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).