mirror of
https://github.com/virt-manager/virt-manager.git
synced 2025-02-25 18:55:27 -06:00
virtManager: add GUI elements for adding a RNG device
Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1001773 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano
Cole Robinson
parent
92db24aa12
commit
6f8ad1bf21
@ -2205,6 +2205,189 @@
|
|||||||
<property name="tab_fill">False</property>
|
<property name="tab_fill">False</property>
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkGrid" id="grid1">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">False</property>
|
||||||
|
<property name="row_spacing">6</property>
|
||||||
|
<property name="column_spacing">6</property>
|
||||||
|
<child>
|
||||||
|
<object class="GtkEntry" id="rng-device">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">True</property>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="left_attach">1</property>
|
||||||
|
<property name="top_attach">5</property>
|
||||||
|
<property name="width">1</property>
|
||||||
|
<property name="height">1</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkLabel" id="label5">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">False</property>
|
||||||
|
<property name="xalign">1</property>
|
||||||
|
<property name="label" translatable="yes">Device:</property>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="left_attach">0</property>
|
||||||
|
<property name="top_attach">5</property>
|
||||||
|
<property name="width">1</property>
|
||||||
|
<property name="height">1</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkLabel" id="label12">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">False</property>
|
||||||
|
<property name="xalign">1</property>
|
||||||
|
<property name="label" translatable="yes">Backend Mode:</property>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="left_attach">0</property>
|
||||||
|
<property name="top_attach">4</property>
|
||||||
|
<property name="width">1</property>
|
||||||
|
<property name="height">1</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkComboBox" id="rng-backend-mode">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">False</property>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="left_attach">1</property>
|
||||||
|
<property name="top_attach">4</property>
|
||||||
|
<property name="width">1</property>
|
||||||
|
<property name="height">1</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkLabel" id="label8">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">False</property>
|
||||||
|
<property name="xalign">1</property>
|
||||||
|
<property name="label" translatable="yes">Backend Type:</property>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="left_attach">0</property>
|
||||||
|
<property name="top_attach">3</property>
|
||||||
|
<property name="width">1</property>
|
||||||
|
<property name="height">1</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkComboBox" id="rng-backend-type">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">False</property>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="left_attach">1</property>
|
||||||
|
<property name="top_attach">3</property>
|
||||||
|
<property name="width">1</property>
|
||||||
|
<property name="height">1</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkLabel" id="label19">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">False</property>
|
||||||
|
<property name="xalign">1</property>
|
||||||
|
<property name="label" translatable="yes">Service:</property>
|
||||||
|
<property name="use_underline">True</property>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="left_attach">0</property>
|
||||||
|
<property name="top_attach">2</property>
|
||||||
|
<property name="width">1</property>
|
||||||
|
<property name="height">1</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkEntry" id="rng-service">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">True</property>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="left_attach">1</property>
|
||||||
|
<property name="top_attach">2</property>
|
||||||
|
<property name="width">1</property>
|
||||||
|
<property name="height">1</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkLabel" id="label17">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">False</property>
|
||||||
|
<property name="xalign">1</property>
|
||||||
|
<property name="label" translatable="yes">Host:</property>
|
||||||
|
<property name="use_underline">True</property>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="left_attach">0</property>
|
||||||
|
<property name="top_attach">1</property>
|
||||||
|
<property name="width">1</property>
|
||||||
|
<property name="height">1</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkEntry" id="rng-host">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">True</property>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="left_attach">1</property>
|
||||||
|
<property name="top_attach">1</property>
|
||||||
|
<property name="width">1</property>
|
||||||
|
<property name="height">1</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkLabel" id="label4">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">False</property>
|
||||||
|
<property name="xalign">1</property>
|
||||||
|
<property name="label" translatable="yes">_Type:</property>
|
||||||
|
<property name="use_underline">True</property>
|
||||||
|
<property name="mnemonic_widget">tpm-type</property>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="left_attach">0</property>
|
||||||
|
<property name="top_attach">0</property>
|
||||||
|
<property name="width">1</property>
|
||||||
|
<property name="height">1</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkComboBox" id="rng-type">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">False</property>
|
||||||
|
<signal name="changed" handler="on_rng_type_changed" swapped="no"/>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="left_attach">1</property>
|
||||||
|
<property name="top_attach">0</property>
|
||||||
|
<property name="width">1</property>
|
||||||
|
<property name="height">1</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="position">14</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child type="tab">
|
||||||
|
<object class="GtkLabel" id="label3">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">False</property>
|
||||||
|
<property name="label" translatable="yes">rng</property>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="position">14</property>
|
||||||
|
<property name="tab_fill">False</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
</object>
|
</object>
|
||||||
</child>
|
</child>
|
||||||
</object>
|
</object>
|
||||||
|
|||||||
@ -54,6 +54,7 @@ PAGE_FILESYSTEM = 10
|
|||||||
PAGE_SMARTCARD = 11
|
PAGE_SMARTCARD = 11
|
||||||
PAGE_USBREDIR = 12
|
PAGE_USBREDIR = 12
|
||||||
PAGE_TPM = 13
|
PAGE_TPM = 13
|
||||||
|
PAGE_RNG = 14
|
||||||
|
|
||||||
char_widget_mappings = {
|
char_widget_mappings = {
|
||||||
"source_path" : "char-path",
|
"source_path" : "char-path",
|
||||||
@ -106,6 +107,8 @@ class vmmAddHardware(vmmGObjectUI):
|
|||||||
"on_fs_source_browse_clicked": self.browse_fs_source,
|
"on_fs_source_browse_clicked": self.browse_fs_source,
|
||||||
|
|
||||||
"on_usbredir_type_changed": self.change_usbredir_type,
|
"on_usbredir_type_changed": self.change_usbredir_type,
|
||||||
|
|
||||||
|
"on_rng_type_changed": self.change_rng_type,
|
||||||
})
|
})
|
||||||
self.bind_escape_key_close()
|
self.bind_escape_key_close()
|
||||||
|
|
||||||
@ -304,6 +307,14 @@ class vmmAddHardware(vmmGObjectUI):
|
|||||||
combo = self.widget("tpm-type")
|
combo = self.widget("tpm-type")
|
||||||
uihelpers.build_tpm_type_combo(self.vm, combo)
|
uihelpers.build_tpm_type_combo(self.vm, combo)
|
||||||
|
|
||||||
|
# RNG widgets
|
||||||
|
combo = self.widget("rng-type")
|
||||||
|
self.build_rng_type_combo(combo)
|
||||||
|
combo = self.widget("rng-backend-type")
|
||||||
|
self.build_rng_backend_type_combo(combo)
|
||||||
|
combo = self.widget("rng-backend-mode")
|
||||||
|
self.build_rng_backend_mode_combo(combo)
|
||||||
|
|
||||||
# Available HW options
|
# Available HW options
|
||||||
is_local = not self.conn.is_remote()
|
is_local = not self.conn.is_remote()
|
||||||
is_storage_capable = self.conn.is_storage_capable()
|
is_storage_capable = self.conn.is_storage_capable()
|
||||||
@ -370,6 +381,7 @@ class vmmAddHardware(vmmGObjectUI):
|
|||||||
True, None)
|
True, None)
|
||||||
add_hw_option("TPM", "device_cpu", PAGE_TPM,
|
add_hw_option("TPM", "device_cpu", PAGE_TPM,
|
||||||
True, None)
|
True, None)
|
||||||
|
add_hw_option("RNG", "system-run", PAGE_RNG, True, None)
|
||||||
|
|
||||||
def reset_state(self):
|
def reset_state(self):
|
||||||
# Storage init
|
# Storage init
|
||||||
@ -468,6 +480,11 @@ class vmmAddHardware(vmmGObjectUI):
|
|||||||
widget = notebook.get_nth_page(page)
|
widget = notebook.get_nth_page(page)
|
||||||
widget.hide()
|
widget.hide()
|
||||||
|
|
||||||
|
# RNG params
|
||||||
|
self.widget("rng-device").set_text("/dev/random")
|
||||||
|
self.widget("rng-host").set_text("localhost")
|
||||||
|
self.widget("rng-service").set_text("708")
|
||||||
|
|
||||||
self.set_hw_selection(0)
|
self.set_hw_selection(0)
|
||||||
|
|
||||||
#########################
|
#########################
|
||||||
@ -554,6 +571,62 @@ class vmmAddHardware(vmmGObjectUI):
|
|||||||
format_list.get_child().set_text("")
|
format_list.get_child().set_text("")
|
||||||
|
|
||||||
########################
|
########################
|
||||||
|
def build_combo_with_values(self, combo, values, default=None):
|
||||||
|
dev_model = Gtk.ListStore(str, str)
|
||||||
|
combo.set_model(dev_model)
|
||||||
|
text = Gtk.CellRendererText()
|
||||||
|
combo.pack_start(text, True)
|
||||||
|
combo.add_attribute(text, 'text', 1)
|
||||||
|
dev_model.set_sort_column_id(0, Gtk.SortType.ASCENDING)
|
||||||
|
|
||||||
|
types = combo.get_model()
|
||||||
|
types.clear()
|
||||||
|
|
||||||
|
# [xml value, label]
|
||||||
|
for t in values:
|
||||||
|
types.append(t[0:2])
|
||||||
|
|
||||||
|
if default:
|
||||||
|
idx = -1
|
||||||
|
for rowid in range(len(combo.get_model())):
|
||||||
|
idx = 0
|
||||||
|
row = combo.get_model()[rowid]
|
||||||
|
if row[0] == default:
|
||||||
|
idx = rowid
|
||||||
|
break
|
||||||
|
combo.set_active(idx)
|
||||||
|
|
||||||
|
|
||||||
|
def build_rng_type_combo(self, combo):
|
||||||
|
types = []
|
||||||
|
for t in virtinst.VirtualRNGDevice.TYPES:
|
||||||
|
types.append([t, virtinst.VirtualRNGDevice.get_pretty_type(t)])
|
||||||
|
|
||||||
|
self.build_combo_with_values(combo, types,
|
||||||
|
virtinst.VirtualRNGDevice.TYPE_RANDOM)
|
||||||
|
|
||||||
|
|
||||||
|
def build_rng_backend_type_combo(self, combo):
|
||||||
|
default = virtinst.VirtualRNGDevice.BACKEND_TYPE_TCP
|
||||||
|
|
||||||
|
types = []
|
||||||
|
for t in virtinst.VirtualRNGDevice.BACKEND_TYPES:
|
||||||
|
pprint = virtinst.VirtualRNGDevice.get_pretty_backend_type(t)
|
||||||
|
types.append([t, pprint])
|
||||||
|
|
||||||
|
self.build_combo_with_values(combo, types, default)
|
||||||
|
|
||||||
|
|
||||||
|
def build_rng_backend_mode_combo(self, combo):
|
||||||
|
default = virtinst.VirtualRNGDevice.BACKEND_MODE_CONNECT
|
||||||
|
|
||||||
|
types = []
|
||||||
|
for t in virtinst.VirtualRNGDevice.BACKEND_MODES:
|
||||||
|
pprint = virtinst.VirtualRNGDevice.get_pretty_backend_type(t)
|
||||||
|
types.append([t, pprint])
|
||||||
|
|
||||||
|
self.build_combo_with_values(combo, types, default)
|
||||||
|
|
||||||
# get_config_* methods #
|
# get_config_* methods #
|
||||||
########################
|
########################
|
||||||
|
|
||||||
@ -765,6 +838,44 @@ class vmmAddHardware(vmmGObjectUI):
|
|||||||
typestr = typ.get_model().get_value(typ.get_active_iter(), 0)
|
typestr = typ.get_model().get_value(typ.get_active_iter(), 0)
|
||||||
return typestr
|
return typestr
|
||||||
|
|
||||||
|
# RNG getters
|
||||||
|
def get_config_rng_type(self):
|
||||||
|
src = self.widget("rng-type")
|
||||||
|
idx = src.get_active()
|
||||||
|
if idx < 0:
|
||||||
|
return None
|
||||||
|
|
||||||
|
selected_type = src.get_model()[idx][0]
|
||||||
|
return selected_type
|
||||||
|
|
||||||
|
def get_config_rng_device(self):
|
||||||
|
if self.get_config_rng_type() == virtinst.VirtualRNGDevice.TYPE_RANDOM:
|
||||||
|
return self.widget("rng-device").get_text()
|
||||||
|
|
||||||
|
return None
|
||||||
|
|
||||||
|
def get_config_rng_host(self):
|
||||||
|
if self.get_config_rng_type() == virtinst.VirtualRNGDevice.TYPE_EGD:
|
||||||
|
return self.widget("rng-host").get_text()
|
||||||
|
|
||||||
|
return None
|
||||||
|
|
||||||
|
def get_config_rng_service(self):
|
||||||
|
if self.get_config_rng_type() == virtinst.VirtualRNGDevice.TYPE_EGD:
|
||||||
|
return self.widget("rng-service").get_text()
|
||||||
|
|
||||||
|
return None
|
||||||
|
|
||||||
|
def get_config_rng_backend_type(self):
|
||||||
|
active = self.widget("rng-backend-type").get_active()
|
||||||
|
model = self.widget("rng-backend-type").get_model()
|
||||||
|
return model[active][0]
|
||||||
|
|
||||||
|
def get_config_rng_backend_mode(self):
|
||||||
|
active = self.widget("rng-backend-mode").get_active()
|
||||||
|
model = self.widget("rng-backend-mode").get_model()
|
||||||
|
return model[active][0]
|
||||||
|
|
||||||
################
|
################
|
||||||
# UI listeners #
|
# UI listeners #
|
||||||
################
|
################
|
||||||
@ -923,6 +1034,8 @@ class vmmAddHardware(vmmGObjectUI):
|
|||||||
return _("USB Redirection")
|
return _("USB Redirection")
|
||||||
if page == PAGE_TPM:
|
if page == PAGE_TPM:
|
||||||
return _("TPM")
|
return _("TPM")
|
||||||
|
if page == PAGE_RNG:
|
||||||
|
return _("Random Number Generator")
|
||||||
|
|
||||||
if page == PAGE_CHAR:
|
if page == PAGE_CHAR:
|
||||||
char_class = self.get_char_type()
|
char_class = self.get_char_type()
|
||||||
@ -984,6 +1097,18 @@ class vmmAddHardware(vmmGObjectUI):
|
|||||||
uihelpers.set_grid_row_visible(self.widget("usbredir-host-box"),
|
uihelpers.set_grid_row_visible(self.widget("usbredir-host-box"),
|
||||||
showhost)
|
showhost)
|
||||||
|
|
||||||
|
def change_rng_type(self, ignore1):
|
||||||
|
model = self.get_config_rng_type()
|
||||||
|
if model is None:
|
||||||
|
return
|
||||||
|
|
||||||
|
is_egd = model == virtinst.VirtualRNGDevice.TYPE_EGD
|
||||||
|
uihelpers.set_grid_row_visible(self.widget("rng-device"), not is_egd)
|
||||||
|
uihelpers.set_grid_row_visible(self.widget("rng-host"), is_egd)
|
||||||
|
uihelpers.set_grid_row_visible(self.widget("rng-service"), is_egd)
|
||||||
|
uihelpers.set_grid_row_visible(self.widget("rng-backend-mode"), is_egd)
|
||||||
|
uihelpers.set_grid_row_visible(self.widget("rng-backend-type"), is_egd)
|
||||||
|
|
||||||
# FS listeners
|
# FS listeners
|
||||||
def browse_fs_source(self, ignore1):
|
def browse_fs_source(self, ignore1):
|
||||||
self._browse_file(self.widget("fs-source"), isdir=True)
|
self._browse_file(self.widget("fs-source"), isdir=True)
|
||||||
@ -1160,6 +1285,8 @@ class vmmAddHardware(vmmGObjectUI):
|
|||||||
return self.validate_page_usbredir()
|
return self.validate_page_usbredir()
|
||||||
elif page_num == PAGE_TPM:
|
elif page_num == PAGE_TPM:
|
||||||
return self.validate_page_tpm()
|
return self.validate_page_tpm()
|
||||||
|
elif page_num == PAGE_RNG:
|
||||||
|
return self.validate_page_rng()
|
||||||
|
|
||||||
def validate_page_storage(self):
|
def validate_page_storage(self):
|
||||||
bus, device = self.get_config_disk_target()
|
bus, device = self.get_config_disk_target()
|
||||||
@ -1533,6 +1660,45 @@ class vmmAddHardware(vmmGObjectUI):
|
|||||||
except Exception, e:
|
except Exception, e:
|
||||||
return self.err.val_err(_("TPM device parameter error"), e)
|
return self.err.val_err(_("TPM device parameter error"), e)
|
||||||
|
|
||||||
|
def validate_page_rng(self):
|
||||||
|
conn = self.conn.get_backend()
|
||||||
|
model = self.get_config_rng_type()
|
||||||
|
|
||||||
|
if model == virtinst.VirtualRNGDevice.TYPE_RANDOM:
|
||||||
|
if not self.get_config_rng_device():
|
||||||
|
return self.err.val_err(_("RNG selection error."),
|
||||||
|
_("A device must be specified."))
|
||||||
|
elif model == virtinst.VirtualRNGDevice.TYPE_EGD:
|
||||||
|
if not self.get_config_rng_host():
|
||||||
|
return self.err.val_err(_("RNG selection error."),
|
||||||
|
_("The EGD host must be specified."))
|
||||||
|
|
||||||
|
if not self.get_config_rng_service():
|
||||||
|
return self.err.val_err(_("RNG selection error."),
|
||||||
|
_("The EGD service must be specified."))
|
||||||
|
else:
|
||||||
|
return self.err.val_err(_("RNG selection error."),
|
||||||
|
_("Invalid RNG type."))
|
||||||
|
|
||||||
|
value_mappings = {
|
||||||
|
"backend_mode" : "connect",
|
||||||
|
"backend_type" : self.get_config_rng_backend_type(),
|
||||||
|
"backend_source_mode" : self.get_config_rng_backend_mode(),
|
||||||
|
"backend_source_host" : self.get_config_rng_host(),
|
||||||
|
"backend_source_service" : self.get_config_rng_service(),
|
||||||
|
"device" : self.get_config_rng_device(),
|
||||||
|
}
|
||||||
|
|
||||||
|
try:
|
||||||
|
self._dev = virtinst.VirtualRNGDevice(conn)
|
||||||
|
self._dev.type = self.get_config_rng_type()
|
||||||
|
for param_name, val in value_mappings.items():
|
||||||
|
if self._dev.supports_property(param_name):
|
||||||
|
setattr(self._dev, param_name, val)
|
||||||
|
except Exception, e:
|
||||||
|
return self.err.val_err(_("TPM device parameter error"), e)
|
||||||
|
|
||||||
|
|
||||||
####################
|
####################
|
||||||
# Unsorted helpers #
|
# Unsorted helpers #
|
||||||
####################
|
####################
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user