|
 |
d0fc41 |
From 6f6e1f51128a0e4bcbaf7e7cd7169d7644dabda2 Mon Sep 17 00:00:00 2001
|
|
|
d0fc41 |
From: Cole Robinson <crobinso@redhat.com>
|
|
|
d0fc41 |
Date: Wed, 9 Oct 2013 13:52:07 +0200
|
|
|
d0fc41 |
Subject: [RHEL-7.0 virt-manager PATCH] cli: rng devices accepts options also
|
|
|
d0fc41 |
when the short form is used
|
|
|
d0fc41 |
|
|
|
d0fc41 |
(cherry picked from commit 16a190a0dc319f7f912cde81d07a0170c5a9fdf2)
|
|
|
d0fc41 |
|
|
|
d0fc41 |
Conflicts:
|
|
|
d0fc41 |
virtinst/cli.py
|
|
|
d0fc41 |
---
|
|
|
d0fc41 |
virtinst/cli.py | 27 +++++++++++++--------------
|
|
|
d0fc41 |
1 file changed, 13 insertions(+), 14 deletions(-)
|
|
|
d0fc41 |
|
|
|
d0fc41 |
diff --git a/virtinst/cli.py b/virtinst/cli.py
|
|
|
d0fc41 |
index 99fcef0..c7488a3 100644
|
|
|
d0fc41 |
--- a/virtinst/cli.py
|
|
|
d0fc41 |
+++ b/virtinst/cli.py
|
|
|
d0fc41 |
@@ -1929,8 +1929,7 @@ def parse_rng(guest, optstring, dev=None):
|
|
|
d0fc41 |
return None
|
|
|
d0fc41 |
|
|
|
d0fc41 |
opts = parse_optstr(optstring, remove_first="type")
|
|
|
d0fc41 |
- dev_type = opts.get("type")
|
|
|
d0fc41 |
- if dev_type == "none":
|
|
|
d0fc41 |
+ if opts.get("type") == "none":
|
|
|
d0fc41 |
return None
|
|
|
d0fc41 |
|
|
|
d0fc41 |
if not dev:
|
|
|
d0fc41 |
@@ -1938,21 +1937,21 @@ def parse_rng(guest, optstring, dev=None):
|
|
|
d0fc41 |
|
|
|
d0fc41 |
set_param = _build_set_param(dev, opts)
|
|
|
d0fc41 |
|
|
|
d0fc41 |
- if dev_type.startswith("/"):
|
|
|
d0fc41 |
- # if the provided type begins with '/' then assume it is the name of
|
|
|
d0fc41 |
- # the RNG device and that its type is "random".
|
|
|
d0fc41 |
- dev.device = dev_type
|
|
|
d0fc41 |
+ # Allow --rng /dev/random
|
|
|
d0fc41 |
+ if opts.get("type", "").startswith("/"):
|
|
|
d0fc41 |
+ dev.device = opts.pop("type")
|
|
|
d0fc41 |
dev.type = "random"
|
|
|
d0fc41 |
else:
|
|
|
d0fc41 |
set_param("type", "type")
|
|
|
d0fc41 |
- set_param("backend_source_host", "backend_host")
|
|
|
d0fc41 |
- set_param("backend_source_service", "backend_service")
|
|
|
d0fc41 |
- set_param("backend_source_mode", "backend_mode")
|
|
|
d0fc41 |
- set_param("backend_type", "backend_type")
|
|
|
d0fc41 |
- set_param("device", "device")
|
|
|
d0fc41 |
- set_param("model", "model")
|
|
|
d0fc41 |
- set_param("rate_bytes", "rate_bytes")
|
|
|
d0fc41 |
- set_param("rate_period", "rate_period")
|
|
|
d0fc41 |
+
|
|
|
d0fc41 |
+ set_param("backend_source_host", "backend_host")
|
|
|
d0fc41 |
+ set_param("backend_source_service", "backend_service")
|
|
|
d0fc41 |
+ set_param("backend_source_mode", "backend_mode")
|
|
|
d0fc41 |
+ set_param("backend_type", "backend_type")
|
|
|
d0fc41 |
+ set_param("device", "device")
|
|
|
d0fc41 |
+ set_param("model", "model")
|
|
|
d0fc41 |
+ set_param("rate_bytes", "rate_bytes")
|
|
|
d0fc41 |
+ set_param("rate_period", "rate_period")
|
|
|
d0fc41 |
|
|
|
d0fc41 |
return dev
|
|
|
d0fc41 |
|
|
|
d0fc41 |
--
|
|
|
d0fc41 |
1.8.3.2
|
|
|
d0fc41 |
|