Francesco Romani has uploaded a new change for review.

Change subject: vm: remove guest agent channels tunables ......................................................................

vm: remove guest agent channels tunables

We had tunables to disable vm/ga channels creation from a long time, but it was just on debug purposes and these settings should never be used in production.

Moreover, we acttually rely on the channel being here (see RHBZ#1126887). Since it is now possible the achive the same results through hooks, is time to drop these tunables.

Change-Id: I4774441d7bd6dcdbb58e38886eb522851d4af37c Relates-To: https://bugzilla.redhat.com/1126887 Signed-off-by: Francesco Romani fromani@redhat.com --- M client/vdsClient.py M tests/vmTestsData.py M vdsm/virt/vm.py 3 files changed, 6 insertions(+), 19 deletions(-)

git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/45/31245/1

diff --git a/client/vdsClient.py b/client/vdsClient.py index 2c09b28..ca82519 100644 --- a/client/vdsClient.py +++ b/client/vdsClient.py @@ -1869,7 +1869,6 @@ # 'want to reserve with the machine' 'o acpiEnable : If present will remove the default ' '-no-acpi switch', - 'o qgaEnable : use qemu-ga as guest agent', 'o spiceSecureChannels : comma-separated list of ' 'spice channel that will be encrypted', 'o spiceMonitors : number of emulated screen heads', diff --git a/tests/vmTestsData.py b/tests/vmTestsData.py index 02959fd..0990641 100644 --- a/tests/vmTestsData.py +++ b/tests/vmTestsData.py @@ -27,7 +27,6 @@ 'acpiEnable': 'true', 'cpuType': 'qemu64', 'smpCoresPerSocket': 1, 'smpThreadsPerCore': 1, 'smp': '1', 'cpuPinning': {}, 'numaTune': {}, 'maxVCpus': '160', - 'vmchannel': 'true', 'qgaEnable': 'true', 'tabletEnable': False, 'displayNetwork': 'mydisp', 'custom': {}, 'guestNumaNodes': []}, @@ -95,7 +94,6 @@ 'acpiEnable': 'true', 'cpuType': 'qemu64', 'smpCoresPerSocket': 1, 'smpThreadsPerCore': 1, 'smp': '1', 'cpuPinning': {}, 'numaTune': {}, 'maxVCpus': '160', - 'vmchannel': 'true', 'qgaEnable': 'true', 'tabletEnable': False, 'displayNetwork': 'mydisp', 'custom': {}, 'guestNumaNodes': []}, diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py index 591616d..714b718 100644 --- a/vdsm/virt/vm.py +++ b/vdsm/virt/vm.py @@ -2689,17 +2689,10 @@

domxml.appendNumaTune()

- if utils.tobool(self.conf.get('vmchannel', 'true')): - domxml._appendAgentDevice(self._guestSocketFile.decode('utf-8'), - _VMCHANNEL_DEVICE_NAME) - else: - self.log.warning('detected disabled vmchannel.' - ' This should be done ONLY for debug purposes' - ' and never in production environments') - if utils.tobool(self.conf.get('qgaEnable', 'true')): - domxml._appendAgentDevice( - self._qemuguestSocketFile.decode('utf-8'), - _QEMU_GA_DEVICE_NAME) + domxml._appendAgentDevice(self._guestSocketFile.decode('utf-8'), + _VMCHANNEL_DEVICE_NAME) + domxml._appendAgentDevice(self._qemuguestSocketFile.decode('utf-8'), + _QEMU_GA_DEVICE_NAME) domxml.appendInput()

if self.arch == caps.Architecture.PPC64: @@ -2841,8 +2834,7 @@ # So, run it after you have this info self._initVmStats() self.guestAgent = guestagent.GuestAgent( - self._guestSocketFile, self.cif.channelListener, self.log, - connect=utils.tobool(self.conf.get('vmchannel', 'true'))) + self._guestSocketFile, self.cif.channelListener, self.log)

self._guestCpuRunning = self._isDomainRunning() if self.lastStatus not in (vmstatus.MIGRATION_DESTINATION, @@ -4010,9 +4002,7 @@ snap.appendChild(_memorySnapshot(memoryVolPath)) else: snapFlags |= libvirt.VIR_DOMAIN_SNAPSHOT_CREATE_DISK_ONLY - - if utils.tobool(self.conf.get('qgaEnable', 'true')): - snapFlags |= libvirt.VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE + snapFlags |= libvirt.VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE

snapxml = snap.toprettyxml() self.log.debug(snapxml)