On 13.03.2012, at 04:50, David Gibson wrote: > On Sat, Mar 10, 2012 at 11:40:41PM +0100, Alexander Graf wrote: >> >> On 08.03.2012, at 02:12, David Gibson wrote: >> >>> Currently, the function spapr_create_phb() uses its parameters to >>> initialize the correct memory windows for the new PCI Host Bridge >>> (PHB). This is not the way things are supposed to be done with qdevs, >>> and means you can't create extra PHBs easily using -device. >>> >>> Since pSeries machines can and do have many PHBs with various >>> configurations, this is a real limitation, not just a theoretical. >>> This patch, therefore, alters the PHB initialization code to use qdev >>> properties to set these parameters of the new bridge, moving most of >>> the code from spapr_create_phb() to spapr_phb_init(). >>> >>> While we're at it, we change the naming of each PCI bus and its >>> associated memory regions to be less arbitrary and make it easier to >>> relate the guest and qemu views of memory to each other. >>> >>> Signed-off-by: Alexey Kardashevskiy <a...@ozlabs.ru> >>> Signed-off-by: David Gibson <da...@gibson.dropbear.id.au> >> >> Andreas, could you please (n)ack this version? > > Actually, can you review and merge this updated version instead. > Turns out that libvirt and some other tools assume that there will be > a PCI bus named simply "pci", which is no longer true with the patch > above (we call each bus "pci@XXXXXX" to match the guest's device > tree). The revised version calls the default bus simply "pci" to work > around libvirt's PC centrism, and allows manually added extra busses > to be named explicitly with a property, defaulting to "pci@XXXXX". > > From c2ce4ad7c4e36ea79d34cfa3305f4b027492474e Mon Sep 17 00:00:00 2001 > From: David Gibson <da...@gibson.dropbear.id.au> > Date: Tue, 13 Mar 2012 14:13:26 +1100 > Subject: [PATCH] pseries: Configure PCI bridge using properties > > Currently, the function spapr_create_phb() uses its parameters to > initialize the correct memory windows for the new PCI Host Bridge > (PHB). This is not the way things are supposed to be done with qdevs, > and means you can't create extra PHBs easily using -device. > > Since pSeries machines can and do have many PHBs with various > configurations, this is a real limitation, not just a theoretical. > This patch, therefore, alters the PHB initialization code to use qdev > properties to set these parameters of the new bridge, moving most of > the code from spapr_create_phb() to spapr_phb_init(). > > While we're at it, we change the naming of each PCI bus and its > associated memory regions to be less arbitrary and make it easier to > relate the guest and qemu views of memory to each other. > > Signed-off-by: Alexey Kardashevskiy <a...@ozlabs.ru> > Signed-off-by: David Gibson <da...@gibson.dropbear.id.au>
Thanks, applied to ppc-next. Alex
