From owner-svn-src-releng@FreeBSD.ORG Fri Oct 24 07:50:36 2014 Return-Path: Delivered-To: svn-src-releng@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 39138B55; Fri, 24 Oct 2014 07:50:36 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 1ABC078C; Fri, 24 Oct 2014 07:50:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9O7oZ6R065971; Fri, 24 Oct 2014 07:50:35 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9O7oZHj065967; Fri, 24 Oct 2014 07:50:35 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201410240750.s9O7oZHj065967@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Fri, 24 Oct 2014 07:50:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r273581 - in releng/10.1/sys/dev/hyperv: netvsc stordisengage storvsc utilities X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Oct 2014 07:50:36 -0000 Author: delphij Date: Fri Oct 24 07:50:34 2014 New Revision: 273581 URL: https://svnweb.freebsd.org/changeset/base/273581 Log: MFS r273580: MFC r273577: Return BUS_PROBE_DEFAULT instead of BUS_PROBE_VENDOR or 0 for in-tree driver. This change was verified by Microsoft. Approved by: re (kib) Modified: releng/10.1/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c releng/10.1/sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c releng/10.1/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c releng/10.1/sys/dev/hyperv/utilities/hv_util.c Directory Properties: releng/10.1/ (props changed) Modified: releng/10.1/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c ============================================================================== --- releng/10.1/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c Fri Oct 24 07:06:01 2014 (r273580) +++ releng/10.1/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c Fri Oct 24 07:50:34 2014 (r273581) @@ -218,7 +218,7 @@ netvsc_probe(device_t dev) if (bootverbose) printf("Netvsc probe... DONE \n"); - return (0); + return (BUS_PROBE_DEFAULT); } return (ENXIO); Modified: releng/10.1/sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c ============================================================================== --- releng/10.1/sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c Fri Oct 24 07:06:01 2014 (r273580) +++ releng/10.1/sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c Fri Oct 24 07:50:34 2014 (r273581) @@ -116,7 +116,7 @@ hv_ata_pci_probe(device_t dev) device_set_desc(dev, "Hyper-V ATA storage disengage driver"); - return (BUS_PROBE_VENDOR); + return (BUS_PROBE_DEFAULT); } static int Modified: releng/10.1/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c ============================================================================== --- releng/10.1/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c Fri Oct 24 07:06:01 2014 (r273580) +++ releng/10.1/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c Fri Oct 24 07:50:34 2014 (r273581) @@ -689,14 +689,14 @@ storvsc_probe(device_t dev) if(bootverbose) device_printf(dev, "Enlightened ATA/IDE detected\n"); - ret = 0; + ret = BUS_PROBE_DEFAULT; } else if(bootverbose) device_printf(dev, "Emulated ATA/IDE set (hw.ata.disk_enable set)\n"); break; case DRIVER_STORVSC: if(bootverbose) device_printf(dev, "Enlightened SCSI device detected\n"); - ret = 0; + ret = BUS_PROBE_DEFAULT; break; default: ret = ENXIO; Modified: releng/10.1/sys/dev/hyperv/utilities/hv_util.c ============================================================================== --- releng/10.1/sys/dev/hyperv/utilities/hv_util.c Fri Oct 24 07:06:01 2014 (r273580) +++ releng/10.1/sys/dev/hyperv/utilities/hv_util.c Fri Oct 24 07:50:34 2014 (r273581) @@ -378,7 +378,7 @@ hv_util_probe(device_t dev) const char *p = vmbus_get_type(dev); if (service_table[i].enabled && !memcmp(p, &service_table[i].guid, sizeof(hv_guid))) { device_set_softc(dev, (void *) (&service_table[i])); - rtn_value = 0; + rtn_value = BUS_PROBE_DEFAULT; } }