From owner-svn-src-head@FreeBSD.ORG Thu Sep 19 02:34:52 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 9985E74F; Thu, 19 Sep 2013 02:34:52 +0000 (UTC) (envelope-from grehan@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 86680299A; Thu, 19 Sep 2013 02:34:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8J2YqKU032960; Thu, 19 Sep 2013 02:34:52 GMT (envelope-from grehan@svn.freebsd.org) Received: (from grehan@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8J2YqNv032959; Thu, 19 Sep 2013 02:34:52 GMT (envelope-from grehan@svn.freebsd.org) Message-Id: <201309190234.r8J2YqNv032959@svn.freebsd.org> From: Peter Grehan Date: Thu, 19 Sep 2013 02:34:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255686 - head/sys/dev/hyperv/stordisengage 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.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Sep 2013 02:34:52 -0000 Author: grehan Date: Thu Sep 19 02:34:52 2013 New Revision: 255686 URL: http://svnweb.freebsd.org/changeset/base/255686 Log: Reorder the hypervisor presence test to avoid claiming ATA disks on non hyperv systems. Reviewed by: neel, abgupta at microsoft dot com Approved by: re@ (hrs) Modified: head/sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c Modified: head/sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c ============================================================================== --- head/sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c Thu Sep 19 02:02:15 2013 (r255685) +++ head/sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c Thu Sep 19 02:34:52 2013 (r255686) @@ -92,8 +92,17 @@ static int hv_check_for_hyper_v(void); static int hv_ata_pci_probe(device_t dev) { - int ata_disk_enable = 0; - if(bootverbose) + int ata_disk_enable; + + ata_disk_enable = 0; + + /* + * Don't probe if not running in a Hyper-V environment + */ + if (!hv_check_for_hyper_v()) + return (ENXIO); + + if (bootverbose) device_printf(dev, "hv_ata_pci_probe dev_class/subslcass = %d, %d\n", pci_get_class(dev), pci_get_subclass(dev)); @@ -116,18 +125,15 @@ hv_ata_pci_probe(device_t dev) * ATA driver, the environment variable * hw_ata.disk_enable must be explicitly set to 1. */ - if (hv_check_for_hyper_v()) { - if (getenv_int("hw.ata.disk_enable", &ata_disk_enable)) { - if(bootverbose) - device_printf(dev, - "hw.ata.disk_enable flag is disabling Hyper-V" - " ATA driver support\n"); + if (getenv_int("hw.ata.disk_enable", &ata_disk_enable)) { + if(bootverbose) + device_printf(dev, + "hw.ata.disk_enable flag is disabling Hyper-V" + " ATA driver support\n"); return (ENXIO); - } - } - if(bootverbose) + if (bootverbose) device_printf(dev, "Hyper-V ATA storage driver enabled.\n"); return (BUS_PROBE_VENDOR); @@ -136,13 +142,15 @@ hv_ata_pci_probe(device_t dev) static int hv_ata_pci_attach(device_t dev) { - return 0; + + return (0); } static int hv_ata_pci_detach(device_t dev) { - return 0; + + return (0); } /** @@ -153,42 +161,44 @@ static int hv_check_for_hyper_v(void) { u_int regs[4]; - int hyper_v_detected = 0; + int hyper_v_detected; + + hyper_v_detected = 0; do_cpuid(1, regs); if (regs[2] & 0x80000000) { - /* if(a hypervisor is detected) */ - /* make sure this really is Hyper-V */ - /* we look at the CPUID info */ + /* + * if(a hypervisor is detected) + * make sure this really is Hyper-V + */ do_cpuid(HV_X64_MSR_GUEST_OS_ID, regs); hyper_v_detected = regs[0] >= HV_X64_CPUID_MIN && regs[0] <= HV_X64_CPUID_MAX && !memcmp("Microsoft Hv", ®s[1], 12); } + return (hyper_v_detected); } static device_method_t hv_ata_pci_methods[] = { - /* device interface */ - DEVMETHOD(device_probe, hv_ata_pci_probe), - DEVMETHOD(device_attach, hv_ata_pci_attach), - DEVMETHOD(device_detach, hv_ata_pci_detach), - DEVMETHOD(device_shutdown, bus_generic_shutdown), + /* device interface */ + DEVMETHOD(device_probe, hv_ata_pci_probe), + DEVMETHOD(device_attach, hv_ata_pci_attach), + DEVMETHOD(device_detach, hv_ata_pci_detach), + DEVMETHOD(device_shutdown, bus_generic_shutdown), - DEVMETHOD_END + DEVMETHOD_END }; devclass_t hv_ata_pci_devclass; static driver_t hv_ata_pci_disengage_driver = { - "pciata-disable", - hv_ata_pci_methods, - sizeof(struct ata_pci_controller), + "pciata-disable", + hv_ata_pci_methods, + sizeof(struct ata_pci_controller), }; DRIVER_MODULE(atapci_dis, pci, hv_ata_pci_disengage_driver, hv_ata_pci_devclass, NULL, NULL); MODULE_VERSION(atapci_dis, 1); MODULE_DEPEND(atapci_dis, ata, 1, 1, 1); - -