From: Simon Horman Subject: [rfc 1/4] ioemu: Register dpci_infos.php_devs.pt_dev in a common location Date: Sat, 21 Mar 2009 09:24:36 +1100 Message-ID: <20090320222816.312909401@vergenet.net> References: <20090320222435.469444366@vergenet.net> Return-path: Content-Disposition: inline; filename=ioemu-register-device-in-one-place.patch List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Ian Jackson Cc: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org Currently power_on_php_slot() sets dpci_infos.php_devs[i].pt_dev itself after the call to register_real_device(). While pt_init relies on power_on_php_slot() to set this pointer. It seems sensible to use the same behaviour for both callers. There are no other callers of register_real_device() Signed-off-by: Simon Horman Index: ioemu-remote/hw/pass-through.c =================================================================== --- ioemu-remote.orig/hw/pass-through.c 2009-03-20 16:09:55.000000000 +1100 +++ ioemu-remote/hw/pass-through.c 2009-03-20 16:15:03.000000000 +1100 @@ -3547,7 +3547,7 @@ struct pt_dev * register_real_device(PCI struct pci_dev *pci_dev; uint8_t e_device, e_intx; struct pci_config_cf8 machine_bdf; - int free_slot = -1; + int free_slot; char *key, *val; int msi_translate; @@ -3619,8 +3619,7 @@ struct pt_dev * register_real_device(PCI return NULL; } - if ( free_slot > 0 ) - dpci_infos.php_devs[free_slot].pt_dev = assigned_device; + dpci_infos.php_devs[PCI_SLOT(e_devfn, 0)].pt_dev = assigned_device; assigned_device->pci_dev = pci_dev; assigned_device->msi_trans_cap = msi_translate; @@ -3791,8 +3790,6 @@ int power_on_php_slot(int slot) php_dev->opt = NULL; - php_dev->pt_dev = pt_dev; - return 0; } -- -- Simon Horman VA Linux Systems Japan K.K., Sydney, Australia Satellite Office H: www.vergenet.net/~horms/ W: www.valinux.co.jp/en