* [Qemu-devel] [PATCH] fips: fix build on !Linux
@ 2012-08-03 23:31 Anthony Liguori
2012-08-03 23:35 ` Anthony Liguori
2012-08-06 13:34 ` Paul Moore
0 siblings, 2 replies; 3+ messages in thread
From: Anthony Liguori @ 2012-08-03 23:31 UTC (permalink / raw)
To: qemu-devel; +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 <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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH] fips: fix build on !Linux
2012-08-03 23:31 [Qemu-devel] [PATCH] fips: fix build on !Linux Anthony Liguori
@ 2012-08-03 23:35 ` Anthony Liguori
2012-08-06 13:34 ` Paul Moore
1 sibling, 0 replies; 3+ messages in thread
From: Anthony Liguori @ 2012-08-03 23:35 UTC (permalink / raw)
To: qemu-devel; +Cc: Paul Moore
Anthony Liguori <aliguori@us.ibm.com> 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 <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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] fips: fix build on !Linux
2012-08-03 23:31 [Qemu-devel] [PATCH] fips: fix build on !Linux Anthony Liguori
2012-08-03 23:35 ` Anthony Liguori
@ 2012-08-06 13:34 ` Paul Moore
1 sibling, 0 replies; 3+ messages in thread
From: Paul Moore @ 2012-08-06 13:34 UTC (permalink / raw)
To: Anthony Liguori; +Cc: qemu-devel
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-08-06 13:34 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-03 23:31 [Qemu-devel] [PATCH] fips: fix build on !Linux Anthony Liguori
2012-08-03 23:35 ` Anthony Liguori
2012-08-06 13:34 ` Paul Moore
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).