From owner-svn-src-head@freebsd.org  Thu Jun  8 12:11:31 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 801E1BFD9D8;
 Thu,  8 Jun 2017 12:11:31 +0000 (UTC)
 (envelope-from dexuan@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 446ED7F504;
 Thu,  8 Jun 2017 12:11:31 +0000 (UTC)
 (envelope-from dexuan@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v58CBUnh064785;
 Thu, 8 Jun 2017 12:11:30 GMT (envelope-from dexuan@FreeBSD.org)
Received: (from dexuan@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v58CBUXr064784;
 Thu, 8 Jun 2017 12:11:30 GMT (envelope-from dexuan@FreeBSD.org)
Message-Id: <201706081211.v58CBUXr064784@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dexuan set sender to
 dexuan@FreeBSD.org using -f
From: Dexuan Cui <dexuan@FreeBSD.org>
Date: Thu, 8 Jun 2017 12:11:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r319690 - head/sys/dev/hyperv/pcib
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Jun 2017 12:11:31 -0000

Author: dexuan
Date: Thu Jun  8 12:11:30 2017
New Revision: 319690
URL: https://svnweb.freebsd.org/changeset/base/319690

Log:
  hyperv/pcib: use the device serial number as PCI domain
  
  Currently the PCI domain is initialized with the instance GUID in
  vmbus_pcib_attach(). It turns out the GUID can change across VM reboot,
  while some users want a persistent value for PCI domain. The solution is
  that we can change to use the device serial number, which starts with 1
  and is unique within a VM.
  
  Obtained from:	Haiyang Zhang
  MFC after:	1 day
  Sponsored by:	Microsoft

Modified:
  head/sys/dev/hyperv/pcib/vmbus_pcib.c

Modified: head/sys/dev/hyperv/pcib/vmbus_pcib.c
==============================================================================
--- head/sys/dev/hyperv/pcib/vmbus_pcib.c	Thu Jun  8 08:10:57 2017	(r319689)
+++ head/sys/dev/hyperv/pcib/vmbus_pcib.c	Thu Jun  8 12:11:30 2017	(r319690)
@@ -574,6 +574,8 @@ new_pcichild_device(struct hv_pcibus *hbus, struct pci
 	hpdev->desc = *desc;
 
 	mtx_lock(&hbus->device_list_lock);
+	if (TAILQ_EMPTY(&hbus->children))
+		hbus->pci_domain = desc->ser & 0xFFFF;
 	TAILQ_INSERT_TAIL(&hbus->children, hpdev, link);
 	mtx_unlock(&hbus->device_list_lock);
 	return (hpdev);