On 04/10/2018 10:49 AM, Ján Tomko wrote:
> Exit early if possible to simplify the logic.
>
> Signed-off-by: Ján Tomko <jtomko@xxxxxxxxxx>
> ---
> src/qemu/qemu_command.c | 18 ++++++++++++------
> 1 file changed, 12 insertions(+), 6 deletions(-)
>
Reviewed-by: John Ferlan <jferlan@xxxxxxxxxx>
John
> diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
> index dfeba54ee..ba279e640 100644
> --- a/src/qemu/qemu_command.c
> +++ b/src/qemu/qemu_command.c
> @@ -9974,16 +9974,22 @@ qemuBuildSeccompSandboxCommandLine(virCommandPtr cmd,
> virQEMUDriverConfigPtr cfg,
> virQEMUCapsPtr qemuCaps)
> {
Could also use
bool has_seccomp_cap = virQEMUCapsGet(qemuCaps,
QEMU_CAPS_SECCOMP_SANDBOX);
??
Then use - doesn't matter probably because the compiler will fix it.
> - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SECCOMP_SANDBOX)) {
> - if (cfg->seccompSandbox == 0)
> - virCommandAddArgList(cmd, "-sandbox", "off", NULL);
> - else if (cfg->seccompSandbox > 0)
> - virCommandAddArgList(cmd, "-sandbox", "on", NULL);
> - } else if (cfg->seccompSandbox > 0) {
> + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SECCOMP_SANDBOX) &&
> + cfg->seccompSandbox > 0) {
> virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
> _("QEMU does not support seccomp sandboxes"));
> return -1;
> }
> +
> + if (cfg->seccompSandbox == 0) {
> + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SECCOMP_SANDBOX))
> + virCommandAddArgList(cmd, "-sandbox", "off", NULL);
> + return 0;
> + }
> +
> + if (cfg->seccompSandbox > 0)
> + virCommandAddArgList(cmd, "-sandbox", "on", NULL);
> +
> return 0;
>
> }
>
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
