Francesco Romani has uploaded a new change for review.
Change subject: spice: support to agent file transfer disable ......................................................................
spice: support to agent file transfer disable
Spice has agent based file transfer support. This option can be disabled in QEMU, and libvirt has support to pass this flag to the underlying QEMU.
This patch expose this capability in VDSM, in the VM definition, implementing the VDSM part of bz983019. The new parameter is optional and enabled by default for backward compatibility.
No XML changes are produced at all unless the new parameter is specified.
Change-Id: Icc98a346baca4ab163ff30e891ae80535e49caa4 Bug-Url: https://bugzilla.redhat.com/983019 Signed-off-by: Francesco Romani fromani@redhat.com --- M debian/control M tests/vmTests.py M vdsm.spec.in M vdsm/virt/vm.py M vdsm_api/vdsmapi-schema.json 5 files changed, 40 insertions(+), 8 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/17/26917/1
diff --git a/debian/control b/debian/control index 45c2b1c..ddbaab3 100644 --- a/debian/control +++ b/debian/control @@ -20,7 +20,7 @@ python-cpopen (>= 1.3), python-dmidecode, python-ethtool (>=0.8), - python-libvirt (>= 1.0.2), + python-libvirt (>= 1.2.2), python-m2crypto, python-netaddr, python-nose, @@ -81,8 +81,8 @@ libnl1, libsanlock-client1 (>= 2.4), libsanlock-dev (>= 2.4), - libvirt-bin (>= 1.0.2), - libvirt0 (>= 1.0.2), + libvirt-bin (>= 1.2.2), + libvirt0 (>= 1.2.2), linux-image-generic (>= 3.6), logrotate, lvm2 (>= 2.02.95), @@ -98,7 +98,7 @@ python-dmidecode, python-ethtool (>= 0.8), python-ethtool (>= 0.8), - python-libvirt (>= 1.0.2), + python-libvirt (>= 1.2.2), python-m2crypto, python-netaddr, python-parted, @@ -294,7 +294,7 @@
Package: vdsm-hook-sriov Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, python (>=2.7.3), vdsm (>= ${source:Version}), libvirt-bin (>= 1.0.2-1) +Depends: ${shlibs:Depends}, ${misc:Depends}, python (>=2.7.3), vdsm (>= ${source:Version}), libvirt-bin (>= 1.2.2-1) Description: sr-iov support for VDSM sr-iov hook enable to add virtual functions exposed by the device directly to a virtual machine. diff --git a/tests/vmTests.py b/tests/vmTests.py index 91ee466..11695b3 100644 --- a/tests/vmTests.py +++ b/tests/vmTests.py @@ -421,6 +421,20 @@ passwdValidTo="1970-01-01T00:00:01" port="-1" tlsPort="-1" type="spice"> <channel mode="secure" name="main"/> + </graphics>""", + + """ + <graphics autoport="yes" listen="0" passwd="*****" + passwdValidTo="1970-01-01T00:00:01" port="-1" + tlsPort="-1" type="spice"> + <filetransfer enable="no"/> + </graphics>""", + + """ + <graphics autoport="yes" listen="0" passwd="*****" + passwdValidTo="1970-01-01T00:00:01" port="-1" + tlsPort="-1" type="spice"> + <channel mode="secure" name="main"/> </graphics>"""]
vmConfs = [ @@ -432,6 +446,16 @@ {'type': 'graphics', 'device': 'spice', 'specParams': { 'port': '-1', 'tlsPort': '-1', + 'spiceSecureChannels': 'smain'}}, + + {'type': 'graphics', 'device': 'spice', + 'specParams': { + 'port': '-1', 'tlsPort': '-1', + 'fileTransferEnable': 'false'}}, + + {'type': 'graphics', 'device': 'spice', + 'specParams': { + 'port': '-1', 'tlsPort': '-1', 'spiceSecureChannels': 'smain'}}]
self._verifyGraphicsXML(expectedXMLs, vmConfs, False) diff --git a/vdsm.spec.in b/vdsm.spec.in index fd47bf6..af339e2 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -131,7 +131,7 @@ %endif
%if 0%{?rhel} >= 7 || 0%{?fedora} >= 18 -Requires: libvirt-daemon >= 1.0.2-1 +Requires: libvirt-daemon >= 1.2.2-1 Requires: libvirt-daemon-config-nwfilter Requires: libvirt-daemon-driver-network Requires: libvirt-daemon-driver-nwfilter @@ -140,7 +140,7 @@ %if 0%{?rhel} Requires: libvirt >= 0.10.2-29.el6_5.4 %else -Requires: libvirt >= 1.0.2-1 +Requires: libvirt >= 1.2.2-1 %endif %endif Requires: libvirt-python, libvirt-lock-sanlock, libvirt-client diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py index d68c292..27c2aab 100644 --- a/vdsm/virt/vm.py +++ b/vdsm/virt/vm.py @@ -1415,6 +1415,10 @@ clipboard = XMLElement('clipboard', copypaste='no') graphics.appendChild(clipboard)
+ if not utils.tobool(self.specParams.get('fileTransferEnable', True)): + filetransfer = XMLElement('filetransfer', enable='no') + graphics.appendChild(filetransfer) + # handle deprecated channel name in a smart way, # not just chop 1st char! if graphicsAttrs['type'] == 'spice': diff --git a/vdsm_api/vdsmapi-schema.json b/vdsm_api/vdsmapi-schema.json index 0300a27..0a8c506 100644 --- a/vdsm_api/vdsmapi-schema.json +++ b/vdsm_api/vdsmapi-schema.json @@ -2523,12 +2523,16 @@ # @copyPasteEnable: #optional Specify if copy and paste is enabled. # Currently relevant for @spice devices only. # +# @fileTransferEnable: #optional Specify if file transfer is enabled. +# Currently relevant for @qxl devices only. +# # Since: 4.15.0 ## {'type': 'VmGraphicsDeviceSpecParams', 'data': {'port': 'uint', '*tlsPort': 'uint', '*keyMap': 'str', '*disableTicketing': 'bool', '*displayNetwork': 'str', - '*spiceSecureChannels': 'str', '*copyPasteEnable': 'bool'}} + '*spiceSecureChannels': 'str', '*copyPasteEnable': 'bool', + '*fileTransferEnable': 'bool'}}
## # @VmGraphicsDevice:
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: support to agent file transfer disable ......................................................................
Patch Set 1: Code-Review-1 Verified-1
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/492/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8166/ : UNSTABLE
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8279/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7376/ : SUCCESS
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: support to agent file transfer disable ......................................................................
Patch Set 2:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/493/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8168/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8281/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7378/ : SUCCESS
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: support to agent file transfer disable ......................................................................
Patch Set 3:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/499/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8221/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8334/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7431/ : SUCCESS
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: support to agent file transfer disable ......................................................................
Patch Set 4:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/500/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8225/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8338/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7435/ : SUCCESS
Francesco Romani has posted comments on this change.
Change subject: spice: support to agent file transfer disable ......................................................................
Patch Set 5:
(1 comment)
http://gerrit.ovirt.org/#/c/26917/5/vdsm.spec.in File vdsm.spec.in:
Line 130: Requires: dmidecode Line 131: %endif Line 132: Line 133: %if 0%{?rhel} >= 7 || 0%{?fedora} >= 18 Line 134: Requires: libvirt-daemon >= 1.2.2-1 We don't really *need* this, meaning it will work with older libvirts (e.g. 1.1.3 in F19), but of course the new feature won't work. Line 135: Requires: libvirt-daemon-config-nwfilter Line 136: Requires: libvirt-daemon-driver-network Line 137: Requires: libvirt-daemon-driver-nwfilter Line 138: Requires: libvirt-daemon-driver-qemu
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: support to agent file transfer disable ......................................................................
Patch Set 5:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/503/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8239/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8352/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7449/ : SUCCESS
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: support to agent file transfer disable ......................................................................
Patch Set 6:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/504/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8247/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8360/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7457/ : SUCCESS
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 7:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/524/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8387/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7597/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8507/ : FAILURE
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 8:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/525/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8394/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7604/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8514/ : SUCCESS
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 9:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/526/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8401/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7611/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8521/ : SUCCESS
Francesco Romani has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 9:
patch set 9: rebased
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 10:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/531/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8421/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7630/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8542/ : SUCCESS
Francesco Romani has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 11:
patch set 11: rebased
Francesco Romani has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 12:
patch set 12: rebased
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 11:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/532/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8432/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7642/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8553/ : SUCCESS
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 12:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/536/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8449/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7659/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8570/ : FAILURE
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 13:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8490/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7700/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8615/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/543/ : FAILURE
Francesco Romani has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 13:
patch set 13, 14: rebased
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 14:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8495/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7705/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8620/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/544/ : FAILURE
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 15:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8501/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7711/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8627/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/545/ : FAILURE
Francesco Romani has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 15:
rebased
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 16:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8507/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7717/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8633/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/546/ : FAILURE
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 17:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8517/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7727/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8644/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/548/ : FAILURE
Francesco Romani has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 17:
ensure compoatibility with legacy display (display* params)
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 18:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8540/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7750/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8667/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/550/ : FAILURE
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 19:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8546/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7756/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8673/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/551/ : FAILURE
Francesco Romani has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 19: Verified+1
verified using patched engine and by inspecting the domain XML in the VDSM logs.
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 20:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8552/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7762/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8679/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/552/ : FAILURE
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 21:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8557/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7767/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8684/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/553/ : FAILURE
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 22:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8601/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7811/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8729/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/558/ : FAILURE
Francesco Romani has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 22:
rebased
Francesco Romani has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 23:
rebased and (trivially) adapted to the last changes to 26895
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 23:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8611/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7821/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8739/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/562/ : FAILURE
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 24:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8701/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7911/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8832/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/576/ : FAILURE
Vinzenz Feenstra has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 25: Code-Review-1
(2 comments)
http://gerrit.ovirt.org/#/c/26917/25/vdsm.spec.in File vdsm.spec.in:
Line 138: Requires: libvirt-daemon-driver-nwfilter Line 139: Requires: libvirt-daemon-driver-qemu Line 140: %else Line 141: %if 0%{?rhel} Line 142: Requires: libvirt >= 0.10.2-29.el6_5.4 Does this RHEL6 version of libvirt support the filetransfer? Line 143: %else Line 144: Requires: libvirt >= 1.2.2-1 Line 145: %endif Line 146: %endif
http://gerrit.ovirt.org/#/c/26917/25/vdsm_api/vdsmapi-schema.json File vdsm_api/vdsmapi-schema.json:
Line 3251: 'data': {'acpiEnable': 'bool', 'clientIp': 'str', 'copyPasteEnable': 'bool', Line 3252: 'cpuShares': 'str', '*cpuType': 'str', '*custom': 'StringMap', Line 3253: '*devices': ['VmDevice'], 'display': 'VmDisplayType', 'displayIp': 'str', Line 3254: 'displayPort': 'int', 'displaySecurePort': 'int', Line 3255: '*emulatedMachine': 'str', 'fileTransferEnable': 'bool', '*keyboardLayout': 'str', If this is optional it needs to be prefixed with * Line 3256: 'kvmEnable': 'bool', '*maxVCpus': 'uint', 'memSize': 'uint', Line 3257: 'memGuaranteedSize': 'uint', 'nicModel': 'str', 'nice': 'int', Line 3258: '*pauseCode': 'str', 'pid': 'uint', 'smp': 'uint', '*smpCoresPerSocket': 'uint', Line 3259: '*smpThreadsPerCore': 'uint', 'status': 'VmStatus',
Francesco Romani has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 25:
(2 comments)
http://gerrit.ovirt.org/#/c/26917/25/vdsm.spec.in File vdsm.spec.in:
Line 138: Requires: libvirt-daemon-driver-nwfilter Line 139: Requires: libvirt-daemon-driver-qemu Line 140: %else Line 141: %if 0%{?rhel} Line 142: Requires: libvirt >= 0.10.2-29.el6_5.4
Does this RHEL6 version of libvirt support the filetransfer?
Actually not, we require libvirt-0.10.2-35.el6.x86_64. Will fix. Line 143: %else Line 144: Requires: libvirt >= 1.2.2-1 Line 145: %endif Line 146: %endif
http://gerrit.ovirt.org/#/c/26917/25/vdsm_api/vdsmapi-schema.json File vdsm_api/vdsmapi-schema.json:
Line 3251: 'data': {'acpiEnable': 'bool', 'clientIp': 'str', 'copyPasteEnable': 'bool', Line 3252: 'cpuShares': 'str', '*cpuType': 'str', '*custom': 'StringMap', Line 3253: '*devices': ['VmDevice'], 'display': 'VmDisplayType', 'displayIp': 'str', Line 3254: 'displayPort': 'int', 'displaySecurePort': 'int', Line 3255: '*emulatedMachine': 'str', 'fileTransferEnable': 'bool', '*keyboardLayout': 'str',
If this is optional it needs to be prefixed with *
Right, stupid typo. Will fix. Line 3256: 'kvmEnable': 'bool', '*maxVCpus': 'uint', 'memSize': 'uint', Line 3257: 'memGuaranteedSize': 'uint', 'nicModel': 'str', 'nice': 'int', Line 3258: '*pauseCode': 'str', 'pid': 'uint', 'smp': 'uint', '*smpCoresPerSocket': 'uint', Line 3259: '*smpThreadsPerCore': 'uint', 'status': 'VmStatus',
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 25:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8761/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8897/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/7971/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/585/ : FAILURE
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 26:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8825/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/8961/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/8035/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/593/ : FAILURE
Francesco Romani has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 26:
addressed Vinzenz's comment and rebased.
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 27:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8866/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/9002/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/8076/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/599/ : FAILURE
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 28:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8915/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/9052/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/8125/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/607/ : FAILURE
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 29:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8978/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/9119/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/8190/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/613/ : FAILURE
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 30:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/8998/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/9139/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/8210/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/616/ : FAILURE
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 31:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/9005/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/9146/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/8217/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/617/ : FAILURE
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 32:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/9040/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/9181/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/8252/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/620/ : FAILURE
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 33:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/9068/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/9209/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/8280/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/621/ : FAILURE
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 34:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/9114/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/9257/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/8326/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/622/ : FAILURE
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 35:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/9139/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/9282/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/8351/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/625/ : FAILURE
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 36:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/9149/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/9292/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/8361/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/628/ : FAILURE
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 37:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/9190/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/9333/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/8402/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/632/ : FAILURE
Francesco Romani has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 37: Verified+1 Code-Review-1
Verified with 26917 using a patched engine and checking the XML in the logs for the creation flow and the virsh dumpxml output after migrations.
Code review -1 because of the requirements which are at risk of ruling out F19
Michal Skrivanek has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 37:
just curious - doesn't the check for VIR_MIGRATE_ABORT_ON_ERROR take care of F19?
Francesco Romani has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 37:
This patch can actually run against an old libvirt, since all the communication involved happens through XML; In that scenario, of course the feature won't work and any setting will be silently ignored.
For VDSM there is no problem then, but engine cannot expose a feature which won't work. I guess we can report this by piggybacking on ABORT_ON_IO_ERROR but this is quite ugly :(
Michal Skrivanek has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 37:
but in http://gerrit.ovirt.org/#/c/23273/6/vdsm/caps.py,cm we remove 3.4+ from reported cluster levels...so there should b no issue(just remove the .spec change)
Francesco Romani has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 37:
Doing this way we will be out of luck with fedora 20 and with fedora 19 with virt-preview, as they both provide libvirt 1.1.3 which will provide ABORT_ON_EIO_ERROR but not the filetransfer disable option. However, I can amend the _getVersionInfo helper to deal with this case.
Francesco Romani has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 37:
changes: * no functional behaviour, reworked the dependencies handling. Dropped strict spec-file dependency except for RHEL, handle cluster compatibility at run time.
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 38:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/9273/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/9416/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/8485/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/642/ : FAILURE
Vinzenz Feenstra has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 38: Code-Review+1
Francesco Romani has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 38: Verified+1
Verified - recovery/migration flow: the setting is passed around correctly. - migration flow: inspected the XML in the logs, it is correct. - verified on F19 the clusterLevel check using the logs
Michal Skrivanek has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 38: Code-Review-1
(1 comment)
I'm still not happy with the version check… for abort_on_eio it makes sense as it was fixing the already broken. but here introducing a tiny little feature and blocking 3.5 cluster level because of it…doesn't sound right to me
http://gerrit.ovirt.org/#/c/26917/38/vdsm/caps.py File vdsm/caps.py:
Line 589: logging.error('libvirt does not support the SPICE control' Line 590: ' features, (file transfer disable), support' Line 591: ' for clusterLevel >= 3.5 is disabled.' Line 592: ' Consider upgrading to libvirt >= 1.2.2') Line 593: maxClusterVer = '3.5' I'd use 3.4 and 3.3 below and change the comparison accordingly @577
Would make it more obvious…:) Line 594: if not hasattr(libvirt, 'VIR_MIGRATE_ABORT_ON_ERROR'): Line 595: logging.error('VIR_MIGRATE_ABORT_ON_ERROR not found in libvirt,' Line 596: ' support for clusterLevel >= 3.4 is disabled.' Line 597: ' For Fedora 19 users, please consider upgrading'
Francesco Romani has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 38:
(1 comment)
I'll try to summarize the point.
- I agree dropping the clusterLevel for this is an extreme measure :) - RHEL libvirt will be OK (there are fixed bugzillas to ensure this) in d/s, so no issue here. - libvirt u/s will be fine starting with 1.2.2 included. This will rule out F19, even with virt-preview enabled; F20 will be OK with virt-preview enabled only, not with stock packages. - for the above reason, just requiring libvirt >= 1.2.2 is probably too extreme as well - if coupled with old libvirt, VDSM will still work just fine since all the interaction is done using XML fields; - there is no way to detect the support for this feature except for the version check :( - if we just drop any requirement of libvirt we have to move the version check on the engine somehow and we grey out/disable the support engine-side. I'm not sure this way is better than the others.
http://gerrit.ovirt.org/#/c/26917/38/vdsm/caps.py File vdsm/caps.py:
Line 589: logging.error('libvirt does not support the SPICE control' Line 590: ' features, (file transfer disable), support' Line 591: ' for clusterLevel >= 3.5 is disabled.' Line 592: ' Consider upgrading to libvirt >= 1.2.2') Line 593: maxClusterVer = '3.5'
I'd use 3.4 and 3.3 below and change the comparison accordingly @577
Will change. Line 594: if not hasattr(libvirt, 'VIR_MIGRATE_ABORT_ON_ERROR'): Line 595: logging.error('VIR_MIGRATE_ABORT_ON_ERROR not found in libvirt,' Line 596: ' support for clusterLevel >= 3.4 is disabled.' Line 597: ' For Fedora 19 users, please consider upgrading'
Francesco Romani has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 38:
Just to think aloud: at the best of my knowledge, nobody in the full stack engine -> VDSM -> libvirt -> QEMU is gonna complain (or worse cease to work) if we just let this feature in but it is not supported by libvirt (being < 1.2.2). It is "just" we're gonna to expose to the user a feature which will not actually do anything.
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 39:
Build Successful
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/9578/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/8646/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/9433/ : SUCCESS
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 40:
Build Successful
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/9247/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/10031/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_virt_functional_tests_gerrit/855/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/10186/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_verify-error-codes_merged/5113/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit-tests_merged/3270/ : SUCCESS
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 41:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/10281/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/11066/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_virt_functional_tests_gerrit/1305/ : There was an infra issue, please contact infra@ovirt.org
http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/11223/ : FAILURE
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 42:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/10291/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/11076/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_virt_functional_tests_gerrit/1314/ : There was an infra issue, please contact infra@ovirt.org
http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/11234/ : FAILURE
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 43:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/10299/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/11084/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_virt_functional_tests_gerrit/1320/ : There was an infra issue, please contact infra@ovirt.org
http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/11241/ : FAILURE
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 44:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_virt_functional_tests_gerrit/1435/ : There was an infra issue, please contact infra@ovirt.org
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/10790/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/11732/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/11575/ : SUCCESS
Dan Kenigsberg has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 44: Code-Review-1
Please add spec dependency on libvirt-0.10.2-35.el6, https://bugzilla.redhat.com/show_bug.cgi?id=983018
Michal Skrivanek has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 44:
note that's EL 6.6 only. Engine can know whether to send it or not based on cluster level, so is it ok for vdsm to just do a noop if not on supported libvirt?
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 45:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_install-rpm-sanity-el6_created/598/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_install-rpm-sanity-fc20_created/579... : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/13411/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/12621/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_virt_functional_tests_gerrit/1931/ : There was an infra issue, please contact infra@ovirt.org
http://jenkins.ovirt.org/job/vdsm_master_install-rpm-sanity-el7_created/37/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_install-rpm-sanity-fc21_created/33/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created_staging/187/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/13573/ : FAILURE
Francesco Romani has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 45: Verified+1
No code changes since long time. Rebased, re-verifed using tests (new path) and in the old path after rebase to spot obvious regressions.
Francesco Romani has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 45: Code-Review-1
need to sort out RHEL 7.x...
Francesco Romani has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 46:
rebased to keep it current. Unfortunately, looks like we need to wait until RHEL 7.1.
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 46:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_install-rpm-sanity-fc21_created/145... : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_install-rpm-sanity-el6_created/710/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/13900/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_install-rpm-sanity-fc20_created/692... : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_install-rpm-sanity-el7_created/150/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_virt_functional_tests_gerrit/2010/ : There was an infra issue, please contact infra@ovirt.org
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/13111/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/14064/ : FAILURE
Francesco Romani has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 46: -Code-Review
Francesco Romani has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 47:
rebased. If RHEL6.x is no longer supported in master, we're good to go, at last.
Francesco Romani has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 47: Verified-1
...but RHEL 7 requirement is broken :(
Dan Kenigsberg has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 47: Code-Review-1
(2 comments)
http://gerrit.ovirt.org/#/c/26917/47/vdsm.spec.in File vdsm.spec.in:
Line 165: Requires: libguestfs-tools-c >= 1:1.26.7-2 Line 166: %endif Line 167: Line 168: %if 0%{?rhel} >= 7 || 0%{?fedora} Line 169: Requires: libvirt-daemon >= 1.2.2 latest centos has http://mirror.centos.org/centos-7/7/updates/x86_64/Packages/libvirt-1.1.1-29... Line 170: Requires: libvirt-daemon-config-nwfilter Line 171: Requires: libvirt-daemon-driver-network Line 172: Requires: libvirt-daemon-driver-nwfilter Line 173: Requires: libvirt-daemon-driver-qemu
Line 172: Requires: libvirt-daemon-driver-nwfilter Line 173: Requires: libvirt-daemon-driver-qemu Line 174: %else Line 175: %if 0%{?rhel} Line 176: Requires: libvirt >= 0.10.2-35.el6_5.4 http://mirror.centos.org/centos-6/6/updates/x86_64/Packages/libvirt-0.10.2-4... provides this. ack. Line 177: %else Line 178: Requires: libvirt >= 1.2.2 Line 179: %endif Line 180: %endif
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 47:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_install-rpm-sanity-fc21_created/191... : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_install-rpm-sanity-el7_created/196/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/13530/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/14487/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_install-rpm-sanity-el6_created/756/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/14319/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_virt_functional_tests_gerrit/2070/ : There was an infra issue, please contact infra@ovirt.org
http://jenkins.ovirt.org/job/vdsm_master_install-rpm-sanity-fc20_created/739... : FAILURE
Francesco Romani has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 47:
turns out we need a bugfix on libvirt side: https://bugzilla.redhat.com/show_bug.cgi?id=1174859
Michal Skrivanek has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 47:
(1 comment)
http://gerrit.ovirt.org/#/c/26917/47/vdsm.spec.in File vdsm.spec.in:
Line 165: Requires: libguestfs-tools-c >= 1:1.26.7-2 Line 166: %endif Line 167: Line 168: %if 0%{?rhel} >= 7 || 0%{?fedora} Line 169: Requires: libvirt-daemon >= 1.2.2
latest centos has http://mirror.centos.org/centos-7/7/updates/x86_64/Packag
It breaks compatibility with 7.0, yes. Do we need to keep it in master? It's going to be 7.1(at least) for 3.6. Even the first real builds will be after 7.1 GA. So do we need to hold off still? Line 170: Requires: libvirt-daemon-config-nwfilter Line 171: Requires: libvirt-daemon-driver-network Line 172: Requires: libvirt-daemon-driver-nwfilter Line 173: Requires: libvirt-daemon-driver-qemu
automation@ovirt.org has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 48:
* Update tracker::#983019::OK * Check Bug-Url::OK * Check Public Bug::#983019::OK, public bug * Check Product::#983019::OK, Correct product Red Hat Enterprise Virtualization Manager * Check TR::SKIP, not in a monitored branch (ovirt-3.5 ovirt-3.4 ovirt-3.3 ovirt-3.2) * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])
Francesco Romani has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 48:
rebased
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 48:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_install-rpm-sanity-fc21_created/379... : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/15470/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/15301/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_virt_functional_tests_gerrit/2276/ : There was an infra issue, please contact infra@ovirt.org
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/14513/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_install-rpm-sanity-fc20_created/926... : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_install-rpm-sanity-el7_created/386/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_install-rpm-sanity-el6_created/944/ : SUCCESS
automation@ovirt.org has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 49:
* Update tracker::#983019::OK * Check Bug-Url::OK * Check Public Bug::#983019::OK, public bug * Check Product::#983019::OK, Correct product Red Hat Enterprise Virtualization Manager * Check TR::SKIP, not in a monitored branch (ovirt-3.5 ovirt-3.4 ovirt-3.3 ovirt-3.2) * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])
Francesco Romani has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 49:
another day, another rebase. We "just" need RHEL 7.1.
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 49:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_install-rpm-sanity-el7_created/479/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_install-rpm-sanity-fc21_created/471... : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_virt_functional_tests_gerrit/2470/ : There was an infra issue, please contact infra@ovirt.org
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/15864/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_install-rpm-sanity-el6_created/1037... : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/15063/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/16034/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created_staging/840/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_install-rpm-sanity-fc20_created/102... : FAILURE
Michal Skrivanek has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 49: Code-Review+1
with 7.1 out of the door is there still any reason to not merge it? Centos 7.1 will follow soon, now we can be really sure it is going to be before 3.6;-)
automation@ovirt.org has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 50:
* Update tracker::#983019::OK * Check Bug-Url::OK * Check Public Bug::#983019::OK, public bug * Check Product::#983019::OK, Correct product Red Hat Enterprise Virtualization Manager * Check TR::SKIP, not in a monitored branch (ovirt-3.5 ovirt-3.4 ovirt-3.3 ovirt-3.2) * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 50:
Build Started (1/2) -> http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/17345/
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 50:
Build Started (2/2) -> http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/17519/
Francesco Romani has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 50: Verified+1
re-verified using unit tests (make check)
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 50:
Build Successful
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/17345/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/17519/ : SUCCESS
Dan Kenigsberg has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 50: Code-Review+2
Dan Kenigsberg has submitted this change and it was merged.
Change subject: spice: allow to disable the agent file transfer ......................................................................
spice: allow to disable the agent file transfer
Spice has agent based file transfer support. This option can be disabled in QEMU, and libvirt has support to pass this flag to the underlying QEMU.
This patch expose this capability in VDSM, in the VM definition, implementing the VDSM part of bz983019. The new parameter is optional and enabled by default for backward compatibility.
No XML changes are produced at all unless the new parameter is specified.
Change-Id: Icc98a346baca4ab163ff30e891ae80535e49caa4 Bug-Url: https://bugzilla.redhat.com/983019 Signed-off-by: Francesco Romani fromani@redhat.com Reviewed-on: https://gerrit.ovirt.org/26917 Reviewed-by: Dan Kenigsberg danken@redhat.com --- M tests/deviceTests.py M vdsm/rpc/vdsmapi-schema.json M vdsm/virt/vmdevices/graphics.py 3 files changed, 35 insertions(+), 7 deletions(-)
Approvals: Dan Kenigsberg: Looks good to me, approved Francesco Romani: Verified
automation@ovirt.org has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 51:
* Update tracker::#983019::OK * Set MODIFIED::bug 983019::::#983019::::IGNORE, not oVirt prod but Red Hat Enterprise Virtualization Manager
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 51:
Build Started (1/9) -> http://jenkins.ovirt.org/job/vdsm_master_create-rpms-el7-x86_64_merged/833/
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 51:
Build Started (2/9) -> http://jenkins.ovirt.org/job/vdsm_master_create-rpms-fc21-x86_64_merged/799/
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 51:
Build Started (3/9) -> http://jenkins.ovirt.org/job/vdsm_master-libgfapi_create-rpms-fc21-x86_64_me...
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 51:
Build Started (4/9) -> http://jenkins.ovirt.org/job/vdsm_master-libgfapi_create-rpms-fc20-x86_64_me...
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 51:
Build Started (5/9) -> http://jenkins.ovirt.org/job/vdsm_master-libgfapi_create-rpms-el7-x86_64_mer...
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 51:
Build Started (6/9) -> http://jenkins.ovirt.org/job/vdsm_master_create-rpms-fc20-x86_64_merged/833/
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 51:
Build Started (7/9) -> http://jenkins.ovirt.org/job/vdsm_master_create-rpms-el6-x86_64_merged/828/
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 51:
Build Started (8/9) -> http://jenkins.ovirt.org/job/vdsm_master_unit-tests_merged/4808/
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 51:
Build Started (9/9) -> http://jenkins.ovirt.org/job/vdsm_master-libgfapi_create-rpms-el6-x86_64_mer...
oVirt Jenkins CI Server has posted comments on this change.
Change subject: spice: allow to disable the agent file transfer ......................................................................
Patch Set 51:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_create-rpms-el6-x86_64_merged/828/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master-libgfapi_create-rpms-fc21-x86_64_me... : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit-tests_merged/4808/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_create-rpms-fc21-x86_64_merged/799/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master-libgfapi_create-rpms-el6-x86_64_mer... : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_create-rpms-el7-x86_64_merged/833/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master-libgfapi_create-rpms-el7-x86_64_mer... : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master-libgfapi_create-rpms-fc20-x86_64_me... : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_create-rpms-fc20-x86_64_merged/833/ : SUCCESS
vdsm-patches@lists.fedorahosted.org