Fix 'xm pci_list_assignable_devices'
PATCH 1/1 Fix 'xm pci_list_assignable_devices'
The current implementation of 'xm pci-list-assignable-devices' command has a problem that it directly invokes hypercall using xen.lowlevel.xc. This is probably based on an assumption that the command is executed on the host itself, but in fact there are cases xm commands can be executed on a remote server through xmlrpc.
So this patch makes the xm command just inquire of xend about the information of available devices.
Signed-off-by Yosuke Iwamatsu <[email protected]>
tools/python/xen/xend/XendNode.py +37 -0
@@ -802,6 +802,43 @@ return [[k, info[k]] for k in ITEM_ORDER] + + def pciinfo(self): + # Each element of dev_list is a PciDevice + dev_list = PciUtil.find_all_devices_owned_by_pciback() + + # Each element of devs_list is a list of PciDevice + devs_list = PciUtil.check_FLR_capability(dev_list) + + devs_list = PciUtil.check_mmio_bar(devs_list) + + # Check if the devices have been assigned to guests. + final_devs_list = [] + for dev_list in devs_list: + available = True + for d in dev_list: + pci_str = '0x%x,0x%x,0x%x,0x%x' %(d.domain, d.bus, d.slot, d.func) + # Xen doesn't care what the domid is, so we pass 0 here... + domid = 0 + bdf = self.xc.test_assign_device(domid, pci_str) + if bdf != 0: + available = False + break + if available: + final_devs_list = final_devs_list + [dev_list] + + pci_sxp_list = [] + for dev_list in final_devs_list: + for d in dev_list: + pci_sxp = ['dev', ['domain', '0x%04x' % d.domain], + ['bus', '0x%02x' % d.bus], + ['slot', '0x%02x' % d.slot], + ['func', '0x%x' % d.func]] + pci_sxp_list.append(pci_sxp) + + return pci_sxp_list + + def xenschedinfo(self): sched_id = self.xc.sched_id_get() if sched_id == xen.lowlevel.xc.XEN_SCHEDULER_SEDF:
tools/python/xen/xend/server/XMLRPCServer.py +2 -1
@@ -198,7 +198,8 @@ self.server.register_function(fn, "xend.domain.%s" % name[7:]) # Functions in XendNode and XendDmesg - for type, lst, n in [(XendNode, ['info', 'send_debug_keys'], 'node'), + for type, lst, n in [(XendNode, ['info', 'pciinfo', 'send_debug_keys'], + 'node'), (XendDmesg, ['info', 'clear'], 'node.dmesg')]: inst = type.instance() for name in lst:
tools/python/xen/xm/main.py +19 -32
66 lines not on this page · raw message