10:42 a.m.
Power system requires an USB XHCI controller in order to allow PCI
hotplug. This patch adds such controller by default when creating a new
VM and inform the users if a VM currently doesn't have the controller.
Jose Ricardo Ziviani (3):
Add a new error code for pci hotplug
Check for usb xhci controller in Power platform
Define the USB xhci controller in the template for Power Systems
src/kimchi/i18n.py | 1 +
src/kimchi/model/vmhostdevs.py | 28 +++++++++++++++++++++++++++-
src/kimchi/vmtemplate.py | 17 +++++++++++++++++
3 files changed, 45 insertions(+), 1 deletion(-)
--
1.9.1
10:42 a.m.
New subject: [PATCH 1/3] Add a new error code for pci hotplug
Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com>
---
src/kimchi/i18n.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py
index d2ffa34..54750d9 100644
--- a/src/kimchi/i18n.py
+++ b/src/kimchi/i18n.py
@@ -127,6 +127,7 @@ messages = {
"For AMD CPU, add iommu=pt iommu=1."),
"KCHVMHDEV0004E": _('"name" should be a device name
string'),
"KCHVMHDEV0005E": _('The device %(name)s is probably in use by the
host. Unable to attach it to the guest.'),
+ "KCHVMHDEV0006E": _('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"),
--
1.9.1
10:42 a.m.
New subject: [PATCH 2/3] Check for usb xhci controller in Power platform
- 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.
Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com>
---
src/kimchi/model/vmhostdevs.py | 28 +++++++++++++++++++++++++++-
1 file changed, 27 insertions(+), 1 deletion(-)
diff --git a/src/kimchi/model/vmhostdevs.py b/src/kimchi/model/vmhostdevs.py
index ea75fce..186e542 100644
--- a/src/kimchi/model/vmhostdevs.py
+++ b/src/kimchi/model/vmhostdevs.py
@@ -171,6 +171,26 @@ class VMHostDevsModel(object):
if rc != 0:
kimchi_log.warning("Unable to turn on sebool virt_use_sysfs")
+ def _have_xhci_usb_controller(self, xmlstr):
+ root = objectify.fromstring(xmlstr)
+
+ 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'] == 'nec-xhci':
+ return True
+
+ return False
+
def _attach_pci_device(self, vmid, dev_info):
self._validate_pci_passthrough_env()
@@ -180,11 +200,17 @@ class VMHostDevsModel(object):
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':
+ # on powerkvm systems, the driver must be vfio.
driver = 'vfio'
+ # powerkvm requires a xhci usb controller in order to support
+ # pci hotplug.
+ if DOM_STATE_MAP[dom.info()[0]] != "shutoff" and \
+ not self._have_xhci_usb_controller(dom.XMLDesc(0)):
+ raise InvalidOperation("KCHVMHDEV0006E", {'vmid':
vmid})
+
# Attach all PCI devices in the same IOMMU group
dev_model = DeviceModel(conn=self.conn)
devs_model = DevicesModel(conn=self.conn)
--
1.9.1
10:42 a.m.
New subject: [PATCH 3/3] Define the USB xhci controller in the template for Power Systems
- When creating VMs using Kimchi in a Power System, the USB xhci
controller is defined by default to have PCI hotplug support.
Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com>
---
src/kimchi/vmtemplate.py | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py
index 79e04ed..3e42971 100644
--- a/src/kimchi/vmtemplate.py
+++ b/src/kimchi/vmtemplate.py
@@ -22,6 +22,7 @@ import stat
import time
import urlparse
import uuid
+import platform
from lxml import etree
from lxml.builder import E
@@ -287,6 +288,19 @@ class VMTemplate(object):
self.info.get('memory') << 10,
cpu_topo)
+ def _get_usb_controller(self):
+ # powerkvm systems must include xhci controller model
+ distro, _, _ = platform.linux_distribution()
+ if distro != "IBM_PowerKVM":
+ return ''
+
+ return """
+ <controller type='usb' index='0' model='nec-xhci'>
+ <address type='pci' domain='0x0000'
+ bus='0x00' slot='0x0f' function='0x0'/>
+ </controller>
+ """
+
def to_vm_xml(self, vm_name, vm_uuid, **kwargs):
params = dict(self.info)
params['name'] = vm_name
@@ -323,6 +337,8 @@ class VMTemplate(object):
elif params['slots'] == 0:
params['slots'] = 1
+ params['usb_controller'] = self._get_usb_controller()
+
xml = """
<domain type='%(domain)s'>
%(qemu-stream-cmdline)s
@@ -352,6 +368,7 @@ class VMTemplate(object):
%(networks)s
%(graphics)s
%(input_output)s
+ %(usb_controller)s
<memballoon model='virtio' />
</devices>
</domain>
--
1.9.1
7:21 a.m.
New subject: [PATCH 2/3] Check for usb xhci controller in Power platform
Reviewed-by: Daniel Barboza <dhbarboza82(a)gmail.com>
On 07/08/2015 02:42 PM, Jose Ricardo Ziviani wrote:
- 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.
Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com>
---
src/kimchi/model/vmhostdevs.py | 28 +++++++++++++++++++++++++++-
1 file changed, 27 insertions(+), 1 deletion(-)
diff --git a/src/kimchi/model/vmhostdevs.py b/src/kimchi/model/vmhostdevs.py
index ea75fce..186e542 100644
--- a/src/kimchi/model/vmhostdevs.py
+++ b/src/kimchi/model/vmhostdevs.py
@@ -171,6 +171,26 @@ class VMHostDevsModel(object):
if rc != 0:
kimchi_log.warning("Unable to turn on sebool
virt_use_sysfs")
+ def _have_xhci_usb_controller(self, xmlstr):
+ root = objectify.fromstring(xmlstr)
+
+ 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'] == 'nec-xhci':
+ return True
+
+ return False
+
def _attach_pci_device(self, vmid, dev_info):
self._validate_pci_passthrough_env()
@@ -180,11 +200,17 @@ class VMHostDevsModel(object):
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':
+ # on powerkvm systems, the driver must be vfio.
driver = 'vfio'
+ # powerkvm requires a xhci usb controller in order to support
+ # pci hotplug.
+ if DOM_STATE_MAP[dom.info()[0]] != "shutoff" and \
+ not self._have_xhci_usb_controller(dom.XMLDesc(0)):
+ raise InvalidOperation("KCHVMHDEV0006E", {'vmid':
vmid})
+
# Attach all PCI devices in the same IOMMU group
dev_model = DeviceModel(conn=self.conn)
devs_model = DevicesModel(conn=self.conn)
7:21 a.m.
New subject: [PATCH 3/3] Define the USB xhci controller in the template for Power Systems
Reviewed-by: Daniel Barboza <dhbarboza82(a)gmail.com>
On 07/08/2015 02:42 PM, Jose Ricardo Ziviani wrote:
- When creating VMs using Kimchi in a Power System, the USB xhci
controller is defined by default to have PCI hotplug support.
Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com>
---
src/kimchi/vmtemplate.py | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py
index 79e04ed..3e42971 100644
--- a/src/kimchi/vmtemplate.py
+++ b/src/kimchi/vmtemplate.py
@@ -22,6 +22,7 @@ import stat
import time
import urlparse
import uuid
+import platform
from lxml import etree
from lxml.builder import E
@@ -287,6 +288,19 @@ class VMTemplate(object):
self.info.get('memory') << 10,
cpu_topo)
+ def _get_usb_controller(self):
+ # powerkvm systems must include xhci controller model
+ distro, _, _ = platform.linux_distribution()
+ if distro != "IBM_PowerKVM":
+ return ''
+
+ return """
+ <controller type='usb' index='0'
model='nec-xhci'>
+ <address type='pci' domain='0x0000'
+ bus='0x00' slot='0x0f' function='0x0'/>
+ </controller>
+ """
+
def to_vm_xml(self, vm_name, vm_uuid, **kwargs):
params = dict(self.info)
params['name'] = vm_name
@@ -323,6 +337,8 @@ class VMTemplate(object):
elif params['slots'] == 0:
params['slots'] = 1
+ params['usb_controller'] = self._get_usb_controller()
+
xml = """
<domain type='%(domain)s'>
%(qemu-stream-cmdline)s
@@ -352,6 +368,7 @@ class VMTemplate(object):
%(networks)s
%(graphics)s
%(input_output)s
+ %(usb_controller)s
<memballoon model='virtio' />
</devices>
</domain>
7:33 a.m.
I've reviewed +1 in all the patches of this set, but before pushing it
to master
I would like to ask you to add a new unit test to verify that this code
behaves
as you expect it to.
You didn't break any existing unit test in pkvm and there is a good
chance that
this code is being tested somehow in any of those, but I strongly
encourage to
make an explicit unit test to the exact behavior you're adding/changing.
You can do something like this in test_model.py:
def _host_is_PKVM():
distro, _, _ = platform.linux_distribution()
return distro is 'IBM_PowerKVM'
@unittest.skipUnless(_host_is_PKVM())
def test_pci_hotplug_requires_xhci_usb_controller():
# check the xhci or any other required host/device condition
# if condition is True: hotplug a pci device should happen with
# no errors. You can see how other tests do the hotplug and replicate
# it here
# elif condition is False: the code should thrown the InvalidOperation
# exception with the code "KCHVMHDEV0006E"
Thanks,
Daniel
On 07/08/2015 02:42 PM, Jose Ricardo Ziviani wrote:
Power system requires an USB XHCI controller in order to allow PCI
hotplug. This patch adds such controller by default when creating a new
VM and inform the users if a VM currently doesn't have the controller.
Jose Ricardo Ziviani (3):
Add a new error code for pci hotplug
Check for usb xhci controller in Power platform
Define the USB xhci controller in the template for Power Systems
src/kimchi/i18n.py | 1 +
src/kimchi/model/vmhostdevs.py | 28 +++++++++++++++++++++++++++-
src/kimchi/vmtemplate.py | 17 +++++++++++++++++
3 files changed, 45 insertions(+), 1 deletion(-)
3214
days inactive
3215
days old
6 comments
2 participants
participants (2)
-
Daniel Henrique Barboza -
Jose Ricardo Ziviani