From owner-p4-projects@FreeBSD.ORG  Thu Apr 13 05:00:33 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 84F4D16A405; Thu, 13 Apr 2006 05:00:33 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 2565916A400
	for <perforce@freebsd.org>; Thu, 13 Apr 2006 05:00:33 +0000 (UTC)
	(envelope-from jmg@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E818943D45
	for <perforce@freebsd.org>; Thu, 13 Apr 2006 05:00:32 +0000 (GMT)
	(envelope-from jmg@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3D50WgE073017
	for <perforce@freebsd.org>; Thu, 13 Apr 2006 05:00:32 GMT
	(envelope-from jmg@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3D50Wh1073014
	for perforce@freebsd.org; Thu, 13 Apr 2006 05:00:32 GMT
	(envelope-from jmg@freebsd.org)
Date: Thu, 13 Apr 2006 05:00:32 GMT
Message-Id: <200604130500.k3D50Wh1073014@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jmg@freebsd.org using -f
From: John-Mark Gurney <jmg@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 95140 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Apr 2006 05:00:33 -0000

http://perforce.freebsd.org/chv.cgi?CH=95140

Change 95140 by jmg@jmg_arlene on 2006/04/13 04:59:32

	get the softc from bus instead of dev...  don't force the unit
	number of the pci bus, this makes multidomain work...

Affected files ...

.. //depot/projects/kmacy_sun4v/src/sys/sparc64/pci/ofw_pcib.c#4 edit
.. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#38 edit

Differences ...

==== //depot/projects/kmacy_sun4v/src/sys/sparc64/pci/ofw_pcib.c#4 (text+ko) ====

@@ -116,6 +116,6 @@
 	sc = device_get_softc(dev);
 	ofw_pcib_gen_setup(dev);
 	pcib_attach_common(dev);
-	device_add_child(dev, "pci", sc->ops_pcib_sc.secbus);
+	device_add_child(dev, "pci", -1);
 	return (bus_generic_attach(dev));
 }

==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#38 (text+ko) ====

@@ -359,7 +359,7 @@
 {
 	struct hvpci_softc *sc;
 
-	sc = device_get_softc(dev);
+	sc = device_get_softc(bus);
 
 	return (sc->hs_node);
 }