PV Passthrough PCI Device Hotplug Support (Tools Part)

diff -r e1dde6f8bc87 tools/python/xen/xend/XendDomainInfo.py
@@ -546,6 +546,95 @@ class XendDomainInfo:
         xen.xend.XendDomain.instance().managed_config_save(self)
         return self.getDeviceController(dev_type).sxpr(devid)
 
+    def pci_device_configure(self, dev_sxp, devid = 0):
+        """Configure an existing pci device.
+        
+        @param dev_config: device configuration
+        @type  dev_config: SXP object (parsed config)
+        @param devid:      device id
+        @type  devid:      int
+        @return: Returns True if successfully updated device
+        @rtype: boolean
+        """
+
+        dev_class = sxp.name(dev_sxp)
+        dev_config = {}
+
+        if dev_class != 'pci':
+            return False
+
+        if self.info.is_hvm():
+            return False
+
+        # If pci platform does not exist, create and exit.
+        found = False
+        for existing_type, existing_info in self.info.all_devices_sxpr():
+            if existing_type == 'pci':
+                found = True
+                break
+        if not found:
+            for pci_state in sxp.children(dev_sxp, 'state'):
+                try:
+                    if pci_state[1] != 'Initialising': # not attach
+                        raise XendError("Cannot detach when pci platform "
+                                        "not exist")
+                except IndexError:
+                    raise XendError("Error reading state")
+            self.device_create(dev_sxp)
+            return True
+
+        # Convert device sxp to a dict.
+        # In reconfigure case, the config of PCI device looks like below:
+        #
+        # sxp:
+        # [device, [pci, [dev, [domain, 0], [bus, 0], [slot, 0], [func, 0]],
+        #                [state, 'Initialising']]]
+        #
+        # dict:
+        # {devs: [{slot: 0, bus: 0, domain: 0, func: 0}],
+        #  states: ['Initialising']}
+        #
+        # 'state' parameter takes either 'Initialising' or 'Closing',
+        #  which indicates attach or detach.
+        pci_devs = []
+        for pci_dev in sxp.children(dev_sxp, 'dev'):
+            pci_dev_info = {}
+            for opt_val in pci_dev[1:]:
+                try:
+                    opt, val = opt_val
+                    pci_dev_info[opt] = val
+                except TypeError:
+                    pass
+            pci_devs.append(pci_dev_info)
+        dev_config['devs'] = pci_devs
+        pci_states = []
+        for pci_state in sxp.children(dev_sxp, 'state'):
+            try:
+                pci_states.append(pci_state[1]) 
+            except IndexError:
+                raise XendError("Error reading state")
+        dev_config['states'] = pci_states
+
+        # use DevController.reconfigureDevice to change device config
+        dev_control = self.getDeviceController(dev_class)
+        dev_uuid = dev_control.reconfigureDevice(devid, dev_config)
+
+        dev_control.waitForDevice_reconfigure(devid)
+        num_devs = dev_control.cleanupDevice(devid)
+ 
+        # update XendConfig with new device info
+        if dev_uuid:
+            new_dev_sxp = dev_control.configuration(devid)
+            self.info.device_update(dev_uuid, new_dev_sxp)
+
+        # If there's no device connected, destroy pci here.
+        # To remove config of pci, self.destroyDevice() should be modified.
+        if num_devs == 0:
+            self.destroyDevice('pci', devid)
+        #    self.destroyDevice('pci', devid, False, True)
+
+        return True
+
     def device_configure(self, dev_sxp, devid = None):
         """Configure an existing device.
         

@@ -560,6 +649,10 @@ class XendDomainInfo:
         # convert device sxp to a dict
         dev_class = sxp.name(dev_sxp)
         dev_config = {}
+
+        if dev_class == 'pci':
+            return self.pci_device_configure(dev_sxp)
+
         for opt_val in dev_sxp[1:]:
             try:
                 dev_config[opt_val[0]] = opt_val[1]

98 lines not on this page · raw message

220 lines not on this page · raw message

66 lines not on this page · raw message

diff -r 59b8768d0d0d -r 6db8d8a026fc tools/python/xen/xend/XendConfig.py
@@ -1407,6 +1407,23 @@ class XendConfig(dict):
                 config = cfg_sxp
 
             dev_type, dev_info = self['devices'][dev_uuid]
+
+            if dev_type == 'pci': # Special case for pci
+                pci_devs = []
+                for pci_dev in sxp.children(config, 'dev'):
+                    pci_dev_info = {}
+                    for opt_val in pci_dev[1:]:
+                        try:
+                            opt, val = opt_val
+                            pci_dev_info[opt] = val
+                        except TypeError:
+                            pass
+                    pci_devs.append(pci_dev_info)
+                self['devices'][dev_uuid] = (dev_type,
+                                             {'devs': pci_devs,
+                                              'uuid': dev_uuid})
+                return True
+                
             for opt_val in config[1:]:
                 try:
                     opt, val = opt_val

279 lines not on this page · raw message

83 lines not on this page · raw message

279 lines not on this page · raw message

83 lines not on this page · raw message

diff -r 59b8768d0d0d -r 8da2f6ce93bc tools/python/xen/xend/XendConfig.py
@@ -1407,6 +1407,23 @@ class XendConfig(dict):
                 config = cfg_sxp
 
             dev_type, dev_info = self['devices'][dev_uuid]
+
+            if dev_type == 'pci': # Special case for pci
+                pci_devs = []
+                for pci_dev in sxp.children(config, 'dev'):
+                    pci_dev_info = {}
+                    for opt_val in pci_dev[1:]:
+                        try:
+                            opt, val = opt_val
+                            pci_dev_info[opt] = val
+                        except TypeError:
+                            pass
+                    pci_devs.append(pci_dev_info)
+                self['devices'][dev_uuid] = (dev_type,
+                                             {'devs': pci_devs,
+                                              'uuid': dev_uuid})
+                return True
+                
             for opt_val in config[1:]:
                 try:
                     opt, val = opt_val

279 lines not on this page · raw message

83 lines not on this page · raw message

279 lines not on this page · raw message

82 lines not on this page · raw message

diff -r 9233270dfe6a tools/python/xen/xm/main.py
@@ -2240,7 +2240,7 @@ def parse_pci_configuration(args, state)
     pci_match = re.match(r"((?P<domain>[0-9a-fA-F]{1,4})[:,])?" + \
             r"(?P<bus>[0-9a-fA-F]{1,2})[:,]" + \
             r"(?P<slot>[0-9a-fA-F]{1,2})[.,]" + \
-            r"(?P<func>[0-9a-fA-F])", pci_dev_str)
+            r"(?P<func>[0-7])$", pci_dev_str)
     if pci_match == None:
         raise OptionError("Invalid argument: %s %s" % (pci_dev_str,vslt))
     pci_dev_info = pci_match.groupdict('0')