- Kimchi-devel - oVirt List Archives

[PATCH v2] [Kimchi 0/2] Issue #998 Not all static strings are externalized
by pkulkark＠linux.vnet.ibm.com 20 Oct '16

20 Oct '16

From: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> v2: Rebased to latest master v1: This patch set externalizes all the static string that should be externalized to support globalization. Also contains the updated .pot and .po files Pooja Kulkarni (2): Issue #998 Not all static strings are externalized Issue #998 Updated .pot and .po files po/POTFILES.in | 1 + po/de_DE.po | 286 +++++++++++++++++++++++++++- po/en_US.po | 267 ++++++++++++++++++++++++++- po/es_ES.po | 286 +++++++++++++++++++++++++++- po/fr_FR.po | 286 +++++++++++++++++++++++++++- po/it_IT.po | 287 ++++++++++++++++++++++++++++- po/ja_JP.po | 286 +++++++++++++++++++++++++++- po/kimchi.pot | 267 ++++++++++++++++++++++++++- po/ko_KR.po | 284 +++++++++++++++++++++++++++- po/pt_BR.po | 286 +++++++++++++++++++++++++++- po/ru_RU.po | 286 +++++++++++++++++++++++++++- po/zh_CN.po | 284 +++++++++++++++++++++++++++- po/zh_TW.po | 284 +++++++++++++++++++++++++++- ui/js/src/kimchi.guest_storage_add.main.js | 12 +- ui/js/src/kimchi.storagepool_add_main.js | 12 +- ui/pages/guest-edit.html.tmpl | 14 +- ui/pages/i18n.json.tmpl | 18 ++ 17 files changed, 3307 insertions(+), 139 deletions(-) -- 2.1.0

2 3

[PATCH v3][Kimchi] Issue: #1008 Issues while editing a VEPA network
by Ramon Medeiros 20 Oct '16

20 Oct '16

The list of interfaces was being appended to a non-clean list. Just create it and add the results. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- Changes: v3: Only list interfaces that are not being used when creating VEPA interface v2: Create empty result var ui/js/src/kimchi.api.js | 2 +- ui/js/src/kimchi.network_edit_main.js | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 55fd55f..3dccfe9 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -693,7 +693,7 @@ var kimchi = { getVEPAInterfaces : function(suc, err) { wok.requestJSON({ - url : 'plugins/kimchi/interfaces?module=^(?!mlx5_core|mlx5-core).*$', + url : 'plugins/kimchi/interfaces?_inuse=false&module=^(?!mlx5_core|mlx5-core).*$', type : 'GET', contentType : 'application/json', dataType : 'json', diff --git a/ui/js/src/kimchi.network_edit_main.js b/ui/js/src/kimchi.network_edit_main.js index 4dd830a..21f4c45 100644 --- a/ui/js/src/kimchi.network_edit_main.js +++ b/ui/js/src/kimchi.network_edit_main.js @@ -94,12 +94,13 @@ kimchi.setupNetworkFormEventForEdit = function(network) { var loadIfaces = function(interfaceFilterArray){ var buildInterfaceOpts = function(result) { var currentIfaces = network['interfaces']; + ifaces = []; for (var i = 0; i < currentIfaces.length; i++) { kimchi.getInterface(currentIfaces[i], function(iface) { - result.push(iface); + ifaces.push(iface); } , null, true); } - kimchi.createInterfacesOpts(result, interfaceFilterArray); + kimchi.createInterfacesOpts(ifaces, interfaceFilterArray); for (var i = 0; i < currentIfaces.length; i++) { $("#networkDestinationID option[value='" + currentIfaces[i] + "']").attr('selected','selected'); -- 2.7.4

2 5

[PATCH] [Wok] Added util method for formatting timestamp as per locale.
by pkulkark＠linux.vnet.ibm.com 20 Oct '16

20 Oct '16

From: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> Signed-off-by: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> --- ui/js/src/wok.utils.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ui/js/src/wok.utils.js b/ui/js/src/wok.utils.js index dcec823..121a51f 100644 --- a/ui/js/src/wok.utils.js +++ b/ui/js/src/wok.utils.js @@ -258,6 +258,13 @@ wok.numberLocaleConverter = function numberConverter(number, locale){ return number; } +wok.timestampConverter = function timestampconverter(timestamp, locale){ + var dte = new Date(timestamp) + var options = { year: 'numeric', month: 'long', day: 'numeric', hour: 'numeric', + minute: 'numeric', second: 'numeric', timeZoneName: 'short'}; + return dte.toLocaleString(locale, options); +} + wok.localeConverters = { "date-locale-converter": { to: function(date){ -- 2.1.0

3 2

[PATCH] [Wok] Fix Ginger Base issue #122: Get immediate children while looking for selected options
by Aline Manera 18 Oct '16

18 Oct '16

There would be more than one list in the same page, so looking for all the selected options may cause problems. Fix that to only get the immediate children of the list widget. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- ui/js/src/wok.list.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/js/src/wok.list.js b/ui/js/src/wok.list.js index 1d4e526..a92db19 100644 --- a/ui/js/src/wok.list.js +++ b/ui/js/src/wok.list.js @@ -173,7 +173,7 @@ wok.widget.List.prototype = (function() { },function(event) { var grid = event.data.grid; grid.selectedIndex = []; - $("li :checkbox:checked", this.bodyContainer).map(function() { + $("li > :checkbox:checked", this.bodyContainer).map(function() { return $(this).parent().index(); }).each(function() { grid.selectedIndex.push(this); -- 2.7.4

2 2

[PATCH v2][Kimchi] Issue: #1008 Issues while editing a VEPA network
by Ramon Medeiros 17 Oct '16

17 Oct '16

The list of interfaces was being appended to a non-clean list. Just create it and add the results. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- Changes: v2: Create empty result var ui/js/src/kimchi.network_edit_main.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ui/js/src/kimchi.network_edit_main.js b/ui/js/src/kimchi.network_edit_main.js index 4dd830a..21f4c45 100644 --- a/ui/js/src/kimchi.network_edit_main.js +++ b/ui/js/src/kimchi.network_edit_main.js @@ -94,12 +94,13 @@ kimchi.setupNetworkFormEventForEdit = function(network) { var loadIfaces = function(interfaceFilterArray){ var buildInterfaceOpts = function(result) { var currentIfaces = network['interfaces']; + ifaces = []; for (var i = 0; i < currentIfaces.length; i++) { kimchi.getInterface(currentIfaces[i], function(iface) { - result.push(iface); + ifaces.push(iface); } , null, true); } - kimchi.createInterfacesOpts(result, interfaceFilterArray); + kimchi.createInterfacesOpts(ifaces, interfaceFilterArray); for (var i = 0; i < currentIfaces.length; i++) { $("#networkDestinationID option[value='" + currentIfaces[i] + "']").attr('selected','selected'); -- 2.7.4

2 1

[PATCH] [Kimchi] USB xhci hotplug: Check controller, define in template, add test in Power
by Lucio Correia 17 Oct '16

17 Oct '16

- Today it is not possible to hotplug a PCI in Power Systems without an USB xhci controller existing in the VM. This commit checks if there is such controller in the VM, displaying an error message if not. - When creating VMs using Kimchi in a Power System, the USB xhci controller is defined by default to have PCI hotplug support. - From now on all templates are created with xhci usb controller, so a hotplug must be performed flawlessly. If anything wrong the test case will fail. Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- i18n.py | 1 + model/vmhostdevs.py | 34 ++++++++++++++++++++++++++++++++++ tests/test_model.py | 25 +++++++++++++++++++++++++ vmtemplate.py | 17 +++++++++++++++++ 4 files changed, 77 insertions(+) diff --git a/i18n.py b/i18n.py index 82c679b..159021d 100644 --- a/i18n.py +++ b/i18n.py @@ -150,6 +150,7 @@ messages = { "KCHVMHDEV0005E": _('The device %(name)s is probably in use by the host. Unable to attach it to the guest.'), "KCHVMHDEV0006E": _('Hot-(un)plug of device %(name)s is not supported.'), "KCHVMHDEV0007E": _('Failed to attach %(device)s to %(vm)s'), + "KCHVMHDEV0008E": _('VM %(vmid)s does not have an USB XHCI controller to accept PCI hotplug.'), "KCHVMIF0001E": _("Interface %(iface)s does not exist in virtual machine %(name)s"), "KCHVMIF0002E": _("Network %(network)s specified for virtual machine %(name)s does not exist"), diff --git a/model/vmhostdevs.py b/model/vmhostdevs.py index e289f03..edb6e36 100644 --- a/model/vmhostdevs.py +++ b/model/vmhostdevs.py @@ -43,6 +43,9 @@ from wok.plugins.kimchi.xmlutils.qemucmdline import QEMU_NAMESPACE CMDLINE_FIELD_NAME = 'spapr-pci-host-bridge.mem_win_size' +USB_MODELS_PCI_HOTPLUG = ["piix3-uhci", "piix4-uhci", "ehci", "ich9-ehci1", + "ich9-uhci1", "ich9-uhci2", "ich9-uhci3", + "vt82c686b-uhci", "pci-ohci", "nec-xhci"] WINDOW_SIZE_BAR = 0x800000000 @@ -135,6 +138,28 @@ class VMHostDevsModel(object): return '<devices>%s</devices>' % hostdevs + def have_xhci_usb_controller(self, vmid): + dom = VMModel.get_vm(vmid, self.conn) + + root = objectify.fromstring(dom.XMLDesc(0)) + + try: + controllers = root.devices.controller + + except AttributeError: + return False + + for controller in controllers: + + if 'model' not in controller.attrib: + continue + + if controller.attrib['type'] == 'usb' and \ + controller.attrib['model'] in USB_MODELS_PCI_HOTPLUG: + return True + + return False + def _get_pci_device_xml(self, dev_info, slot, is_multifunction): if 'detach_driver' not in dev_info: dev_info['detach_driver'] = 'kvm' @@ -234,6 +259,15 @@ class VMHostDevsModel(object): dom = VMModel.get_vm(vmid, self.conn) driver = 'vfio' if self.caps.kernel_vfio else 'kvm' + # 'vfio' systems requires a xhci usb controller in order to support + # pci hotplug on Power. + if driver == 'vfio' and platform.machine().startswith('ppc') and \ + DOM_STATE_MAP[dom.info()[0]] != "shutoff" and \ + not self.have_xhci_usb_controller(vmid): + msg = WokMessage('KCHVMHDEV0008E', {'vmid': vmid}) + cb(msg.get_text(), False) + raise InvalidOperation("KCHVMHDEV0008E", {'vmid': vmid}) + # Attach all PCI devices in the same IOMMU group affected_names = self.devs_model.get_list( _passthrough_affected_by=dev_info['name']) diff --git a/tests/test_model.py b/tests/test_model.py index 082cb9d..4ddd0d2 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -1626,6 +1626,31 @@ class ModelTests(unittest.TestCase): volumes = inst.storagevolumes_get_list(args['name']) self.assertEquals(len(volumes), 2) + def _host_is_power(): + import platform + return platform.machine().startswith('ppc') + + @unittest.skipUnless(_host_is_power(), 'Only required for Power hosts') + def test_pci_hotplug_requires_xhci_usb_controller(self): + config.set("authentication", "method", "pam") + inst = model.Model(None, objstore_loc=self.tmp_store) + tpl_params = {'name': 'test', 'memory': 1024, 'cdrom': UBUNTU_ISO} + inst.templates_create(tpl_params) + + with RollbackContext() as rollback: + vm_params = {'name': 'kimchi-vm1', 'template': '/templates/test'} + task1 = inst.vms_create(vm_params) + inst.task_wait(task1['id']) + rollback.prependDefer(utils.rollback_wrapper, inst.vm_delete, + 'kimchi-vm1') + # Start vm + inst.vm_start('kimchi-vm1') + rollback.prependDefer(utils.rollback_wrapper, inst.vm_poweroff, + 'kimchi-vm1') + # check if create VM has USB XHCI controller + self.assertTrue( + inst.vmhostdevs_have_xhci_usb_controller('kimchi-vm1')) + class BaseModelTests(unittest.TestCase): class FoosModel(object): diff --git a/vmtemplate.py b/vmtemplate.py index 0288330..56b339f 100644 --- a/vmtemplate.py +++ b/vmtemplate.py @@ -18,6 +18,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA import os +import platform import stat import time import urlparse @@ -358,6 +359,18 @@ class VMTemplate(object): self.info['os_version']) return unicode(interfaces, 'utf-8') + def _get_usb_controller(self): + # powerkvm systems must include xhci controller model + if not platform.machine().startswith('ppc'): + return '' + + return """ + <controller type='usb' index='0' model='nec-xhci'> + <address type='pci' domain='0x0000' + bus='0x00' slot='0x0f' function='0x0'/> + </controller> + """ + def _get_input_output_xml(self): sound = """ <sound model='%(sound_model)s' /> @@ -469,6 +482,9 @@ class VMTemplate(object): # cpu_info element params['cpu_info_xml'] = self._get_cpu_xml() + # usb controller xhci + params['usb_controller'] = self._get_usb_controller() + xml = """ <domain type='%(domain)s'> %(qemu-stream-cmdline)s @@ -503,6 +519,7 @@ class VMTemplate(object): %(interfaces)s %(graphics)s %(input_output)s + %(usb_controller)s %(serial)s <memballoon model='virtio' /> </devices> -- 2.7.4

2 1

[PATCH] [Kimchi 0/2] Issue #998 Not all static strings are externalized
by pkulkark＠linux.vnet.ibm.com 17 Oct '16

17 Oct '16

From: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> This patch set externalizes all the static string that should be externalized to support globalization. Also contains the updated .pot and .po files Pooja Kulkarni (2): Issue #998 Not all static strings are externalized Issue #998 Updated .pot and .po files po/POTFILES.in | 1 + po/de_DE.po | 254 ++++++++++++++++++++++++++-- po/en_US.po | 239 +++++++++++++++++++++++++-- po/es_ES.po | 254 ++++++++++++++++++++++++++-- po/fr_FR.po | 254 ++++++++++++++++++++++++++-- po/it_IT.po | 255 +++++++++++++++++++++++++++-- po/ja_JP.po | 254 ++++++++++++++++++++++++++-- po/kimchi.pot | 239 +++++++++++++++++++++++++-- po/ko_KR.po | 254 ++++++++++++++++++++++++++-- po/pt_BR.po | 254 ++++++++++++++++++++++++++-- po/ru_RU.po | 254 ++++++++++++++++++++++++++-- po/zh_CN.po | 254 ++++++++++++++++++++++++++-- po/zh_TW.po | 254 ++++++++++++++++++++++++++-- ui/js/src/kimchi.guest_storage_add.main.js | 12 +- ui/js/src/kimchi.storagepool_add_main.js | 12 +- ui/pages/guest-edit.html.tmpl | 14 +- ui/pages/i18n.json.tmpl | 18 ++ 17 files changed, 2937 insertions(+), 139 deletions(-) -- 2.1.0

3 6

[PATCH] [Kimchi] Improve multifunction attach/detach operations
by Lucio Correia 14 Oct '16

14 Oct '16

Multifunction PCI device attach/detach operations now need to be performed on all functions simultaneously. For older libvirt versions, without that support, the functions must be attached/detached individually. This patch tries to attach all functions simultaneously and fallback to individual attach/detach in case it fails. Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- model/vmhostdevs.py | 64 ++++++++++++++++++++++------------------------------- 1 file changed, 27 insertions(+), 37 deletions(-) diff --git a/model/vmhostdevs.py b/model/vmhostdevs.py index 0c89959..e289f03 100644 --- a/model/vmhostdevs.py +++ b/model/vmhostdevs.py @@ -232,15 +232,7 @@ class VMHostDevsModel(object): raise dom = VMModel.get_vm(vmid, self.conn) - # Due to libvirt limitation, we don't support live assigne device - # to vfio driver. - driver = ('vfio' if DOM_STATE_MAP[dom.info()[0]] == "shutoff" and - self.caps.kernel_vfio else 'kvm') - - # on powerkvm systems it must be vfio driver. - distro, _, _ = platform.linux_distribution() - if distro == 'IBM_PowerKVM': - driver = 'vfio' + driver = 'vfio' if self.caps.kernel_vfio else 'kvm' # Attach all PCI devices in the same IOMMU group affected_names = self.devs_model.get_list( @@ -296,34 +288,27 @@ class VMHostDevsModel(object): slot = self._available_slot(dom) with RollbackContext() as rollback: - # multifunction hotplug is a special case where all functions - # must be attached together within one xml file, the same does - # not happen to multifunction coldplug - where each function - # is attached individually - if DOM_STATE_MAP[dom.info()[0]] != 'shutoff' and \ - is_multifunction: + # multifuction: try to attach all functions together within one + # xml file. It requires libvirt support. + if is_multifunction: xmlstr = self._get_pci_devices_xml(pci_infos, slot, driver) try: dom.attachDeviceFlags(xmlstr, device_flags) except libvirt.libvirtError: - msg = WokMessage('KCHVMHDEV0007E', - {'device': pci_info['name'], - 'vm': vmid}) - cb(msg.get_text(), False) - wok_log.error( - 'Failed to attach mutifunction device VM %s: \n%s', - vmid, xmlstr) - raise - - rollback.prependDefer(dom.detachDeviceFlags, xmlstr, - device_flags) - rollback.commitAll() - if DOM_STATE_MAP[dom.info()[0]] == "shutoff": - cb('OK', True) - return - + # If operation fails, we try the other way, where each + # function is attached individually + pass + else: + rollback.prependDefer(dom.detachDeviceFlags, xmlstr, + device_flags) + rollback.commitAll() + if DOM_STATE_MAP[dom.info()[0]] == "shutoff": + cb('OK', True) + return + + # attach each function individually (multi or single function) for pci_info in pci_infos: pci_info['detach_driver'] = driver xmlstr = self._get_pci_device_xml(pci_info, @@ -638,7 +623,14 @@ class VMHostDevModel(object): raise InvalidOperation('KCHVMHDEV0006E', {'name': dev_info['name']}) - if self._hotunplug_multifunction_pci(dom, hostdev, dev_name): + # check for multifunction and detach all functions together + try: + multi = self._unplug_multifunction_pci(dom, hostdev, dev_name) + except libvirt.libvirtError: + multi = False + + # successfully detached all functions: finish operation + if multi: if is_3D_device: devsmodel = VMHostDevsModel(conn=self.conn) devsmodel.update_mmio_guest(vmid, False) @@ -647,6 +639,7 @@ class VMHostDevModel(object): cb('OK', True) return + # detach each function individually for e in hostdev: if DeviceModel.deduce_dev_name(e, self.conn) == dev_name: xmlstr = etree.tostring(e) @@ -685,14 +678,11 @@ class VMHostDevModel(object): return devices - def _hotunplug_multifunction_pci(self, dom, hostdev, dev_name): - if DOM_STATE_MAP[dom.info()[0]] == "shutoff": - return False - - domain, bus, slot, _ = dev_name.split('_')[1:] + def _unplug_multifunction_pci(self, dom, hostdev, dev_name): # get all devices attached to the guest in the same domain+bus+slot # that the one we are going to detach because they must be detached # together + domain, bus, slot, _ = dev_name.split('_')[1:] devices = self._get_devices_same_addr(hostdev, int(domain, 16), int(bus, 16), -- 2.7.4

2 1

[PATCH] [Kimchi] Improve Fedora 24 identification
by Lucio Correia 14 Oct '16

14 Oct '16

Fedora 24 Server for x86_64 arch was not being identified by Kimchi. This patch fixes it by adding more specific patterns for Server and Workstation flavors. Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- isoinfo.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/isoinfo.py b/isoinfo.py index 5eb68ab..e5725e2 100644 --- a/isoinfo.py +++ b/isoinfo.py @@ -117,9 +117,10 @@ iso_dir = [ ('rhel', lambda m: m.group(2), 'RHEL(-LE)?[_/-](\d+\.\d+)'), ('debian', lambda m: m.group(1), 'Debian (\d+\.\d+)'), ('ubuntu', lambda m: m.group(2), '[Uu]buntu(-Server)? (\d+\.\d+)'), + ('fedora', lambda m: m.group(1), 'Fedora-WS-[\D-]+-(\d+)'), + ('fedora', lambda m: m.group(1), 'Fedora-S-[\w-]+-(\d+)'), ('fedora', lambda m: m.group(1), 'Fedora[ -](\d+)'), ('fedora', lambda m: m.group(1), 'Fedora.*-(\d+)-'), - ('fedora', lambda m: m.group(1), 'Fedora-[\D-]+-(\d+)'), ('gentoo', lambda m: m.group(1), 'Gentoo Linux \w+ (\d+)'), ('powerkvm', 'live_cd', 'POWERKVM_LIVECD'), ('arch', lambda m: m.group(1), 'ARCH_(\d+)'), -- 2.7.4

2 1

[PATCH] [Kimchi 0/3] Live migration enhancements
by dhbarboza82＠gmail.com 14 Oct '16

14 Oct '16

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> This patch set makes enhancements to the live migration backend, covering more scenarios and delivering more error messages when things goes wrong. Daniel Henrique Barboza (3): Github #1007: use provided user for password-less setup Github #1007: Fixing non-root ssh key generation Adding libvirt remote connection verification i18n.py | 2 ++ model/vms.py | 94 ++++++++++++++++++++++++++++++++++++++++++++---------------- 2 files changed, 72 insertions(+), 24 deletions(-) -- 2.7.4

3 5