summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2012-08-03 18:28:37 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2012-08-03 18:28:37 -0500
commit70678b82274309e9df98b8ce359118f36697cadb (patch)
tree2368dbef378f82cb8c57b37a09f5f262b479b885
parentb34bd5e5c8f356ec206e5a306ee3a9b6f42c4315 (diff)
downloadqemu-70678b82274309e9df98b8ce359118f36697cadb.tar.gz
qemu-70678b82274309e9df98b8ce359118f36697cadb.tar.bz2
qemu-70678b82274309e9df98b8ce359118f36697cadb.zip
fips: fix build on !Linux
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>
-rw-r--r--os-posix.c5
-rw-r--r--vl.c3
2 files changed, 5 insertions, 3 deletions
diff --git a/os-posix.c b/os-posix.c
index daf3d6f6f3..79fa2288e4 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 8cda85f084..6d2ce45fef 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);
}