|
 |
e4cbec |
From c32c8f3cfd9d02abd2034ed0035165faf8386c9d Mon Sep 17 00:00:00 2001
|
|
|
e4cbec |
Message-Id: <c32c8f3cfd9d02abd2034ed0035165faf8386c9d@dist-git>
|
|
|
e4cbec |
From: Pavel Hrdina <phrdina@redhat.com>
|
|
|
e4cbec |
Date: Wed, 22 May 2019 14:10:36 +0200
|
|
|
e4cbec |
Subject: [PATCH] cli: fix cpu secure option to actually work
|
|
|
e4cbec |
|
|
|
e4cbec |
The 'secure' option is processed after the model is already set.
|
|
|
e4cbec |
CPU security options are resolved while setting CPU model so we need
|
|
|
e4cbec |
to know the 'secure' option value before we set the CPU model.
|
|
|
e4cbec |
|
|
|
e4cbec |
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
|
|
e4cbec |
(cherry picked from commit 06c2f873972fd4c60a57c8b8f07fe3cec4ddfcf4)
|
|
|
e4cbec |
|
|
|
e4cbec |
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1582667
|
|
|
e4cbec |
|
|
|
e4cbec |
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
|
|
e4cbec |
Reviewed-by: Cole Robinson <crobinso@redhat.com>
|
|
|
e4cbec |
---
|
|
|
e4cbec |
virtinst/cli.py | 2 +-
|
|
|
e4cbec |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
e4cbec |
|
|
|
e4cbec |
diff --git a/virtinst/cli.py b/virtinst/cli.py
|
|
|
e4cbec |
index 4adfd3af..2cd86ca6 100644
|
|
|
e4cbec |
--- a/virtinst/cli.py
|
|
|
e4cbec |
+++ b/virtinst/cli.py
|
|
|
e4cbec |
@@ -1528,11 +1528,11 @@ class ParserCPU(VirtCLIParser):
|
|
|
e4cbec |
|
|
|
e4cbec |
|
|
|
e4cbec |
_register_virt_parser(ParserCPU)
|
|
|
e4cbec |
+ParserCPU.add_arg("secure", "secure", is_onoff=True)
|
|
|
e4cbec |
ParserCPU.add_arg(None, "model", cb=ParserCPU.set_model_cb)
|
|
|
e4cbec |
ParserCPU.add_arg("mode", "mode")
|
|
|
e4cbec |
ParserCPU.add_arg("match", "match")
|
|
|
e4cbec |
ParserCPU.add_arg("vendor", "vendor")
|
|
|
e4cbec |
-ParserCPU.add_arg("secure", "secure", is_onoff=True)
|
|
|
e4cbec |
|
|
|
e4cbec |
ParserCPU.add_arg(None, "force", is_list=True, cb=ParserCPU.set_feature_cb)
|
|
|
e4cbec |
ParserCPU.add_arg(None, "require", is_list=True, cb=ParserCPU.set_feature_cb)
|
|
|
e4cbec |
--
|
|
|
e4cbec |
2.21.0
|
|
|
e4cbec |
|