WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-devel

Re: [Xen-devel] [patch 8/9] xend: pass-through: Use AUTO_PHP_SLOT asunkn

To: Simon Horman <horms@xxxxxxxxxxxx>, xen-devel@xxxxxxxxxxxxxxxxxxx
Subject: Re: [Xen-devel] [patch 8/9] xend: pass-through: Use AUTO_PHP_SLOT asunknown vslot
From: Masaki Kanno <kanno.masaki@xxxxxxxxxxxxxx>
Date: Thu, 04 Jun 2009 13:22:37 +0900
Cc: Dexuan Cui <dexuan.cui@xxxxxxxxx>
Delivery-date: Wed, 03 Jun 2009 21:23:02 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
In-reply-to: <20090604032230.945333943@xxxxxxxxxxxx>
List-help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id: Xen developer discussion <xen-devel.lists.xensource.com>
List-post: <mailto:xen-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
References: <20090604032115.934982694@xxxxxxxxxxxx> <20090604032230.945333943@xxxxxxxxxxxx>
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
Hi Simon,

These line include Tab indent.

pciif.py:
+                                            '0x' + AUTO_PHP_SLOT_STR))

XendConfig.py:
+                                           '0x' + AUTO_PHP_SLOT_STR)

Best regards,
 Kan

Thu, 04 Jun 2009 13:21:23 +1000, Simon Horman wrote:

>This fixes a few cases where 0 is still used for an known vslot.
>
>Cc: Dexuan Cui <dexuan.cui@xxxxxxxxx>
>Cc: Masaki Kanno <kanno.masaki@xxxxxxxxxxxxxx>
>Signed-off-by: Simon Horman <horms@xxxxxxxxxxxx>
>
>Index: xen-unstable.hg/tools/python/xen/xend/server/pciif.py
>===================================================================
>--- xen-unstable.hg.orig/tools/python/xen/xend/server/pciif.py 2009-06-04 
>08:28:46.000000000 +1000
>+++ xen-unstable.hg/tools/python/xen/xend/server/pciif.py      2009-06-04 08:
28:
>54.000000000 +1000
>@@ -74,7 +74,8 @@ class PciController(DevController):
>             bus = parse_hex(pci_config.get('bus', 0))
>             slot = parse_hex(pci_config.get('slot', 0))
>             func = parse_hex(pci_config.get('func', 0))            
>-            vslot = parse_hex(pci_config.get('vslot', 0))
>+            vslot = parse_hex(pci_config.get('vslot',
>+                                           '0x' + AUTO_PHP_SLOT_STR))
> 
>             if pci_config.has_key('opts'):
>                 opts = serialise_pci_opts(pci_config['opts'])
>Index: xen-unstable.hg/tools/python/xen/xend/XendConfig.py
>===================================================================
>--- xen-unstable.hg.orig/tools/python/xen/xend/XendConfig.py   2009-06-04 08:
>28:46.000000000 +1000
>+++ xen-unstable.hg/tools/python/xen/xend/XendConfig.py        2009-06-04 08:
28:54
>.000000000 +1000
>@@ -31,7 +31,7 @@ from xen.xend.XendDSCSI import XendDSCSI
> from xen.xend.XendError import VmError
> from xen.xend.XendDevices import XendDevices
> from xen.xend.PrettyPrint import prettyprintstring
>-from xen.xend.XendConstants import DOM_STATE_HALTED
>+from xen.xend.XendConstants import DOM_STATE_HALTED, AUTO_PHP_SLOT_STR
> from xen.xend.xenstore.xstransact import xstransact
> from xen.xend.server.BlktapController import blktap_disk_types
> from xen.xend.server.netif import randomMAC
>@@ -1235,7 +1235,8 @@ class XendConfig(dict):
>             dpci_record = {
>                 'VM': self['uuid'],
>                 'PPCI': ppci_uuid,
>-                'hotplug_slot': pci_dev.get('vslot', 0)
>+                'hotplug_slot': pci_dev.get('vslot',
>+                                          '0x' + AUTO_PHP_SLOT_STR)
>             }
> 
>             dpci_opts = pci_dev.get('opts')
>
>-- 
>
>_______________________________________________
>Xen-devel mailing list
>Xen-devel@xxxxxxxxxxxxxxxxxxx
>http://lists.xensource.com/xen-devel


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel