Skip to contentSkip to conversation

passthrough: Fix PCI hot-plug option parsing

PATCH Superseded Simon Horman 2 participants 4 messages May 13, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 passthrough: Fix PCI hot-plug option parsing

When a PCI function is passed-through extra options may be passed through. In the case of boot-time PCI pass-through the documented format is:

    [dom:]bus:dev.slot[@vslot][[,opt]...]
    e.g.
    00:01.00.1@7,msitranslate=1

In the case of PCI hot-plug the xm pci-attach command take the following arguments:

    [-o opt[,opt]...] [dom:]bus:dev.slot [vslot]
    e.g.
    -o msitranslate=1 00:01.00.1 7

    These xm ends up passing these to xem-qemu as:
    [dom:]bus:dev.slot[[,opt]...][@vslot]
    e.g.
    00:01.00.1,msitranslate=1@7

    Note that the option and the vslot have are transposed when
    compared to the format used by boot-time PCI pass-through.

The parser inside qemu-xen can only handle the format used by boot-time PCI pass-through and because of this ignores any options passed by hot-plug.

This patch alters format used by hot-plug to match the parser.

Cc Dexuan Cui <[email protected]>
Cc Qing He <[email protected]>
Cc Yuji Shimada <[email protected]>
Cc Masaki Kanno <[email protected]>

---

This bug does not appear be a recent regression.

This bug seems important enough to fix for 3.4, though it could be argued that if it hasn't been noticed for a while there aren't many (any?) users of this.

tools/python/xen/xend/XendDomainInfo.py +3 -3
Index: xen-unstable.hg/tools/python/xen/xend/XendDomainInfo.py
===================================================================
@@ -706,12 +706,12 @@ class XendDomainInfo:
                 config_opts = map(lambda (x, y): x+'='+y, config_opts)
                 opts = ',' + reduce(lambda x, y: x+','+y, config_opts)
 
-            bdf_str = "%s:%s:%s.%s%s@%s" % (new_dev['domain'],
+            bdf_str = "%s:%s:%s.%s@%s%s" % (new_dev['domain'],
                 new_dev['bus'],
                 new_dev['slot'],
                 new_dev['func'],
-                opts,
-                new_dev['vslot'])
+                new_dev['vslot'],
+		opts)
             self.image.signalDeviceModel('pci-ins', 'pci-inserted', bdf_str)
 
             vslot = xstransact.Read("/local/domain/0/device-model/%i/parameter"
#1 lore raw

Hi Simon,

The following line includes tab indent.

tools/python/xen/xend/XendDomainInfo.py class XendDomainInfo: · line 714

Quoted 1 line
tools/python/xen/xend/XendDomainInfo.py +1 -0
+		opts)

Best regards,
Kan

Quoted 36 lines · Simon Horman

When a PCI function is passed-through extra options may be passed through. In the case of boot-time PCI pass-through the documented format is:

   [dom:]bus:dev.slot[@vslot][[,opt]...]
   e.g.
   00:01.00.1@7,msitranslate=1

In the case of PCI hot-plug the xm pci-attach command take the following arguments:

   [-o opt[,opt]...] [dom:]bus:dev.slot [vslot]
   e.g.
   -o msitranslate=1 00:01.00.1 7

   These xm ends up passing these to xem-qemu as:
   [dom:]bus:dev.slot[[,opt]...][@vslot]
   e.g.
   00:01.00.1,msitranslate=1@7

   Note that the option and the vslot have are transposed when
   compared to the format used by boot-time PCI pass-through.

The parser inside qemu-xen can only handle the format used by boot-time PCI pass-through and because of this ignores any options passed by hot-plug.

This patch alters format used by hot-plug to match the parser.

Cc Dexuan Cui <[email protected]>
Cc Qing He <[email protected]>
Cc Yuji Shimada <[email protected]>
Cc Masaki Kanno <[email protected]>

---

This bug does not appear be a recent regression.

Quoted 7 lines

This bug seems important enough to fix for 3.4, though it could be argued that if it hasn't been noticed for a while there aren't many (any?) users of this.

Index: xen-unstable.hg/tools/python/xen/xend/XendDomainInfo.py
===================================================================
--- xen-unstable.hg.orig/tools/python/xen/xend/XendDomainInfo.py 2009-05

-13

Quoted 25 lines

11:07:38.000000000 +1000
+++ xen-unstable.hg/tools/python/xen/xend/XendDomainInfo.py 2009-05-13 11:
11:36.000000000 +1000

tools/python/xen/xend/XendDomainInfo.py +3 -3
@@ -706,12 +706,12 @@ class XendDomainInfo:
                config_opts = map(lambda (x, y): x+'='+y, config_opts)
                opts = ',' + reduce(lambda x, y: x+','+y, config_opts)
 
-            bdf_str = "%s:%s:%s.%s%s@%s" % (new_dev['domain'],
+            bdf_str = "%s:%s:%s.%s@%s%s" % (new_dev['domain'],
                new_dev['bus'],
                new_dev['slot'],
                new_dev['func'],
-                opts,
-                new_dev['vslot'])
+                new_dev['vslot'],
+		opts)
            self.image.signalDeviceModel('pci-ins', 'pci-inserted', bdf_str)
 
            vslot = xstransact.Read("/local/domain/0/device-model/%i/

parameter"

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel

#2 lore raw
Quoted 5 lines · Masaki Kanno

Hi Simon,

The following line includes tab indent.

tools/python/xen/xend/XendDomainInfo.py class XendDomainInfo: · line 714

Quoted 1 line
tools/python/xen/xend/XendDomainInfo.py +1 -0
+		opts)

Thanks, I will fix that.

#3 lore raw

PATCH v2 1/1 passthrough: Fix PCI hot-plug option parsing

In reply to Masaki Kanno

When a PCI function is passed-through extra options may be passed through. In the case of boot-time PCI pass-through the documented format is:

    [dom:]bus:dev.slot[@vslot][[,opt]...]
    e.g.
    00:01.00.1@7,msitranslate=1

In the case of PCI hot-plug the xm pci-attach command take the following arguments:

    [-o opt[,opt]...] [dom:]bus:dev.slot [vslot]
    e.g.
    -o msitranslate=1 00:01.00.1 7

    These xm ends up passing these to xem-qemu as:
    [dom:]bus:dev.slot[[,opt]...][@vslot]
    e.g.
    00:01.00.1,msitranslate=1@7

    Note that the option and the vslot have are transposed when
    compared to the format used by boot-time PCI pass-through.

The parser inside qemu-xen can only handle the format used by boot-time PCI pass-through and because of this ignores any options passed by hot-plug.

This patch alters format used by hot-plug to match the parser.

Cc Dexuan Cui <[email protected]>
Cc Qing He <[email protected]>
Cc Yuji Shimada <[email protected]>
Cc Masaki Kanno <[email protected]>

---

This bug does not appear be a recent regression.

This bug seems important enough to fix for 3.4, though it could be argued that if it hasn't been noticed for a while there aren't many (any?) users of this.

Wed, 13 May 2009 11:31:19 +1000
* Initial Public Release

Wed, 13 May 2009 13:04:06 +1000
* Remove tab from indentation

tools/python/xen/xend/XendDomainInfo.py +3 -3
Index: xen-unstable.hg/tools/python/xen/xend/XendDomainInfo.py
===================================================================
@@ -706,12 +706,12 @@ class XendDomainInfo:
                 config_opts = map(lambda (x, y): x+'='+y, config_opts)
                 opts = ',' + reduce(lambda x, y: x+','+y, config_opts)
 
-            bdf_str = "%s:%s:%s.%s%s@%s" % (new_dev['domain'],
+            bdf_str = "%s:%s:%s.%s@%s%s" % (new_dev['domain'],
                 new_dev['bus'],
                 new_dev['slot'],
                 new_dev['func'],
-                opts,
-                new_dev['vslot'])
+                new_dev['vslot'],
+                opts)
             self.image.signalDeviceModel('pci-ins', 'pci-inserted', bdf_str)
 
             vslot = xstransact.Read("/local/domain/0/device-model/%i/parameter"