cliconfig: Remove --default-qemu-user

Libvirt has given us this info in capabilities for a long time,
this shouldn't matter anymore
This commit is contained in:
Cole Robinson 2018-10-06 12:28:16 -04:00
parent a4097b7691
commit e6738d9827
5 changed files with 1 additions and 15 deletions

View File

@ -313,8 +313,6 @@ class my_rpm(distutils.core.Command):
class configure(distutils.core.Command):
user_options = [
("prefix=", None, "installation prefix"),
("qemu-user=", None,
"user libvirt uses to launch qemu processes (default=root)"),
("libvirt-package-names=", None,
"list of libvirt distro packages virt-manager will check for on "
"first run. comma separated string (default=none)"),
@ -341,7 +339,6 @@ class configure(distutils.core.Command):
def initialize_options(self):
self.prefix = sysprefix
self.qemu_user = None
self.libvirt_package_names = None
self.kvm_package_names = None
self.askpass_package_names = None
@ -355,8 +352,6 @@ class configure(distutils.core.Command):
template = ""
template += "[config]\n"
template += "prefix = %s\n" % self.prefix
if self.qemu_user is not None:
template += "default_qemu_user = %s\n" % self.qemu_user
if self.libvirt_package_names is not None:
template += "libvirt_packages = %s\n" % self.libvirt_package_names
if self.kvm_package_names is not None:

View File

@ -8,7 +8,6 @@
%global with_guestfs 0
%global stable_defaults 0
%global askpass_package "openssh-askpass"
%global qemu_user "qemu"
%global libvirt_packages "libvirt-daemon-kvm,libvirt-daemon-config-network"
%global kvm_packages ""
%global preferred_distros "fedora,rhel"
@ -110,10 +109,6 @@ machine).
%build
%if %{qemu_user}
%global _qemu_user --qemu-user=%{qemu_user}
%endif
%if %{kvm_packages}
%global _kvm_packages --kvm-package-names=%{kvm_packages}
%endif
@ -139,7 +134,6 @@ machine).
%endif
./setup.py configure \
%{?_qemu_user} \
%{?_kvm_packages} \
%{?_libvirt_packages} \
%{?_askpass_package} \

View File

@ -175,7 +175,6 @@ class vmmConfig(object):
# the keyring
self.keyring = None
self.default_qemu_user = CLIConfig.default_qemu_user
self.preferred_distros = CLIConfig.preferred_distros
self.hv_packages = CLIConfig.hv_packages
self.libvirt_packages = CLIConfig.libvirt_packages

View File

@ -70,7 +70,6 @@ class _CLIConfig(object):
self.cfgpath = _cfgpath
self.version = __version__
self.default_qemu_user = _get_param("default_qemu_user", "root")
self.stable_defaults = bool(int(_get_param("stable_defaults", "0")))
self.preferred_distros = _split_list(

View File

@ -274,8 +274,7 @@ class DeviceDisk(Device):
if conn.is_remote() or not conn.is_qemu_system():
return None, []
from virtcli import CLIConfig
user = CLIConfig.default_qemu_user
user = None
try:
for secmodel in conn.caps.host.secmodels:
if secmodel.model != "dac":