openkylin
/
virt-manager
mirror of https://gitee.com/openkylin/virt-manager.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

virt-install: Warn about performance for `--osinfo generic` too 

Currently we skip the warning if the user explicitly requests
`--osinfo generic`. Upcoming changes to the defaults here will make
it tempting to specify `--osinfo generic` just to make things work,
and we want to dissuade that, so enable the warning for that case too.

Signed-off-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Cole Robinson 2022-02-12 12:04:59 -05:00
parent 9c54c116fa
commit e7249fa79f
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
virtinst/cli.py
View File

@ -1843,8 +1843,6 @@ class OSVariantData(object):
if osobj:
self._name = osobj.name
def is_generic_requested(self):
return self._detect is False or self._name == "generic"
def is_detect(self):
return self._detect
def is_require(self):

22
virtinst/virtinstall.py
View File

@ -354,18 +354,22 @@ def _show_memory_warnings(guest):
"Were you trying to specify GiB?"), rammb)
def show_guest_warnings(options, guest, osdata):
def _needs_accurate_osinfo(guest):
# Limit it to hvm x86 guests which presently our defaults
# only really matter for
return guest.os.is_x86() and guest.os.is_hvm()
def show_guest_warnings(options, guest):
if options.pxe and not supports_pxe(guest):
log.warning(
_("The guest's network configuration may not support PXE"))
# Limit it to hvm x86 guests which presently our defaults
# only really matter for
if (guest.osinfo.name == "generic" and
not osdata.is_generic_requested() and
guest.os.is_x86() and guest.os.is_hvm()):
log.warning(_("No operating system detected, VM performance may "
"suffer. Specify an OS with --osinfo for optimal results."))
if guest.osinfo.is_generic() and _needs_accurate_osinfo(guest):
log.warning(
_("Using --osinfo {osname}, VM performance may suffer. "
"Specify an accurate OS for optimal results.").format(
osname=guest.osinfo.name))
_show_memory_warnings(guest)
@ -596,7 +600,7 @@ def build_guest_instance(conn, options):
cli.validate_mac(net.conn, net.macaddr)
validate_required_options(options, guest, installer)
show_guest_warnings(options, guest, osdata)
show_guest_warnings(options, guest)
return guest, installer