# HG changeset patch
# User y-iwamatsu@ab.jp.nec.com
# Date 1205903225 -32400
# Node ID cdeafb36df14650ed327e0d7c6b444157787c770
# Parent  f33328217eee1a66bf2a874ff1a42b62c21e42bc
tools: More accurate parsing of pci config.

Signed-off-by: Yosuke Iwamatsu <y-iwamatsu@ab.jp.nec.com>

diff -r f33328217eee -r cdeafb36df14 tools/python/xen/xend/server/pciif.py
--- a/tools/python/xen/xend/server/pciif.py	Mon Mar 10 22:51:57 2008 +0000
+++ b/tools/python/xen/xend/server/pciif.py	Wed Mar 19 14:07:05 2008 +0900
@@ -125,7 +125,7 @@ class PciController(DevController):
             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]{1,2})", dev_config)
+                                 r"(?P<func>[0-7]{1,2})$", dev_config)
             
             if pci_match!=None:
                 pci_dev_info = pci_match.groupdict()
diff -r f33328217eee -r cdeafb36df14 tools/python/xen/xm/create.py
--- a/tools/python/xen/xm/create.py	Mon Mar 10 22:51:57 2008 +0000
+++ b/tools/python/xen/xm/create.py	Wed Mar 19 14:07:05 2008 +0900
@@ -304,7 +304,7 @@ gopts.var('pci', val='BUS:DEV.FUNC',
 gopts.var('pci', val='BUS:DEV.FUNC',
           fn=append_value, default=[],
           use="""Add a PCI device to a domain, using given params (in hex).
-         For example 'pci=c0:02.1a'.
+         For example 'pci=c0:02.1'.
          The option may be repeated to add more than one pci device.""")
 
 gopts.var('ioports', val='FROM[-TO]',
@@ -840,7 +840,7 @@ def preprocess_pci(vals):
         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:
             pci_dev_info = pci_match.groupdict('0')
             try: