On Mon, 2014-08-18 at 13:40 -0300, Aline Manera wrote:

On 08/15/2014 12:29 PM, Paulo Vital wrote:

...

A numpy byte order bug cause the novnc handshake failure. To workaround this problem, we swap bytes after unmasking. After it's fixed on the numpy side, we can drop this patch.

Signed-off-by: Mark Wu <wudxw@linux.vnet.ibm.com> Signed-off-by: Paulo Vital <pvital@linux.vnet.ibm.com> --- src/kimchi/websocket.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)

You are modifying a third-party code, ie, this code was imported into Kimchi. As it is LGPLv3 and Kimchi backend is also LGPLv3, (*from my understanding*) there is any problem in change it UNLESS we properly document it. Please, check LGPLv3 to do it and inform the changes you are doing here.

And do you have a plan when the original problem will be fixed? If it is soon, we can hold this patch by now.

The problem resides on numpy library used by the Python WebSocket library (the file modified), and there is no solution provided in the upstream numpy project. So, the modification is necessary in this file, used by Kimchi. Reading the LGPLv3, I didn't see where the modification proposed could be documented. From what I understood about the license, the modification can be done using 2a or 4a statements (see file COPYING.LGPL or https://www.gnu.org/copyleft/lesser.html) and a simple note on README file mentioning that Python WebSocket library is used by Kimchi and both are under LGPLv3 is sufficient. However, IMO, this should be covered by a different patch that mention all other LGPLv3 third-part code imported into Kimchi, if exists.

...

diff --git a/src/kimchi/websocket.py b/src/kimchi/websocket.py index a98fc6d..870c453 100644 --- a/src/kimchi/websocket.py +++ b/src/kimchi/websocket.py @@ -16,7 +16,7 @@ as taken from http://docs.python.org/dev/library/ssl.html#certificates

'''

-import os, sys, time, errno, signal, socket, traceback, select +import os, sys, time, errno, signal, socket, traceback, select, platform import array, struct from base64 import b64encode, b64decode

@@ -251,7 +251,10 @@ Sec-WebSocket-Accept: %s\r data = numpy.frombuffer(buf, dtype=numpy.dtype('<u4'), offset=pstart, count=int(plen / 4)) #b = numpy.bitwise_xor(data, mask).data - b = numpy.bitwise_xor(data, mask).tostring() + if platform.machine().startswith('ppc'): + b = numpy.bitwise_xor(data, mask).byteswap().tostring() + else: + b = numpy.bitwise_xor(data, mask).tostring()

if plen % 4: #print("Partial unmask")

Could you provide a commit message with 80 characters? And then add a description explaining why this change is needed? On 08/15/2014 12:29 PM, Paulo Vital wrote:

From: Eli Qiao <taget@linux.vnet.ibm.com>

Signed-off-by: Eli Qiao <taget@linux.vnet.ibm.com> --- src/kimchi/osinfo.py | 5 +++-- src/kimchi/vmtemplate.py | 5 +++++ 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/kimchi/osinfo.py b/src/kimchi/osinfo.py index 1ad353c..6ee5e48 100644 --- a/src/kimchi/osinfo.py +++ b/src/kimchi/osinfo.py @@ -49,11 +49,12 @@ template_specs = {'x86': {'old': dict(common_spec, disk_bus='ide', nic_model='spapr-vlan', cdrom_bus='scsi', kbd_bus='usb', mouse_bus='usb', - memory=1280), + tablet_bus='usb', memory=1280), 'modern': dict(common_spec, disk_bus='virtio', nic_model='virtio', cdrom_bus='scsi', kbd_bus='usb', - mouse_bus='usb', memory=1280)}} + mouse_bus='usb', tablet_bus='usb', + memory=1280)}}

modern_version_bases = {'x86': {'debian': '6.0', 'ubuntu': '7.10', diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index 761bac5..ddb1f35 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -349,12 +349,17 @@ drive=drive-%(bus)s0-1-0,id=%(bus)s0-1-0'/> keyboard = """ <input type='kbd' bus='%(kbd_bus)s'> </input> """ + tablet = """ + <input type='tablet' bus='%(kbd_bus)s'> </input> + """

input_output = "" if 'mouse_bus' in self.info.keys(): input_output += mouse % self.info if 'kbd_bus' in self.info.keys(): input_output += keyboard % self.info + if 'tablet_bus' in self.info.keys(): + input_output += tablet % self.info if 'sound_model' in self.info.keys(): input_output += sound % self.info return input_output

On 08/15/2014 12:29 PM, Paulo Vital wrote:

From: Mark Wu <wudxw@linux.vnet.ibm.com>

This patches adds a sos plugin to collect kimchi's configuration, log files and other information for diagnosis.

Signed-off-by: Mark Wu <wudxw@linux.vnet.ibm.com>

Conflicts: contrib/kimchi.spec.fedora.in

I think the conflict has being already solved, right?

--- contrib/kimchi.spec.fedora.in | 3 +++ src/kimchi/Makefile.am | 4 +++- src/kimchi/sos.py | 37 +++++++++++++++++++++++++++++++++++++

Has it been testes on Ubuntu too? It is also has sosreport.

3 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 src/kimchi/sos.py

diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in index 5766784..78dd423 100644 --- a/contrib/kimchi.spec.fedora.in +++ b/contrib/kimchi.spec.fedora.in @@ -78,6 +78,8 @@ make %install rm -rf %{buildroot} make DESTDIR=%{buildroot} install +install -Dm 0644 src/kimchi/sos.py \ + %{buildroot}/%{python_sitelib}/sos/plugins/kimchi.py

%if 0%{?with_systemd} # Install the systemd scripts @@ -158,6 +160,7 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/kimchi/model/*.py* %{python_sitelib}/kimchi/API.json %{python_sitelib}/kimchi/plugins/*.py* +%{python_sitelib}/sos/plugins/kimchi.py* %{_datadir}/kimchi/doc/API.md %{_datadir}/kimchi/doc/README.md %{_datadir}/kimchi/doc/kimchi-guest.png diff --git a/src/kimchi/Makefile.am b/src/kimchi/Makefile.am index e2b5bea..a405782 100644 --- a/src/kimchi/Makefile.am +++ b/src/kimchi/Makefile.am @@ -19,10 +19,12 @@

SUBDIRS = control model

-kimchi_PYTHON = $(filter-out config.py, $(wildcard *.py)) +kimchi_PYTHON = $(filter-out config.py sos.py, $(wildcard *.py))

nodist_kimchi_PYTHON = config.py

+dist_noinst_PYTHON = sos.py + EXTRA_DIST = \ API.json \ config.py.in diff --git a/src/kimchi/sos.py b/src/kimchi/sos.py new file mode 100644 index 0000000..f43c4bd --- /dev/null +++ b/src/kimchi/sos.py

@@ -0,0 +1,37 @@ +### This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation; either version 2 of the License, or +## (at your option) any later version. + +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. + +## You should have received a copy of the GNU General Public License +## along with this program; if not, write to the Free Software +## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +

Without any copyright? Or mention to the project?

+ +from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin + + +class Kimchi(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin): + """kimchi-related information + """ + + plugin_name = 'kimchi' + + def setup(self): + self.add_copy_specs([ + "/etc/kimchi/", + "/var/log/kimchi*" + ]) + self.add_cmd_output("virsh pool-list --details") + rc, out, _ = self.get_command_output('virsh pool-list') + if rc == 0: + for pool in out.splitlines()[2:]: + if pool: + pool_name = pool.split()[0] + self.add_cmd_output("virsh vol-list --pool %s --details" + % pool_name)