From owner-svn-src-all@FreeBSD.ORG Sun May 10 09:37:55 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E28BA403; Sun, 10 May 2015 09:37:55 +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 D079F173A; Sun, 10 May 2015 09:37:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4A9btFP017383; Sun, 10 May 2015 09:37:55 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4A9btxU017379; Sun, 10 May 2015 09:37:55 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201505100937.t4A9btxU017379@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Sun, 10 May 2015 09:37:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r282717 - in head/sys/arm: conf qemu X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 May 2015 09:37:56 -0000 Author: andrew Date: Sun May 10 09:37:54 2015 New Revision: 282717 URL: https://svnweb.freebsd.org/changeset/base/282717 Log: Use the new gic option. While here remove extra whitespace from the ned of a few lines. Modified: head/sys/arm/conf/VIRT head/sys/arm/qemu/files.qemu Modified: head/sys/arm/conf/VIRT ============================================================================== --- head/sys/arm/conf/VIRT Sun May 10 09:33:15 2015 (r282716) +++ head/sys/arm/conf/VIRT Sun May 10 09:37:54 2015 (r282717) @@ -43,6 +43,9 @@ options INVARIANT_SUPPORT # Extra sanit #options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed #options DIAGNOSTIC +# Interrupt controller +device gic + device bpf device loop device ether @@ -52,9 +55,9 @@ device snp device pl011 device psci -device virtio -device virtio_mmio -device virtio_blk +device virtio +device virtio_mmio +device virtio_blk device vtnet device md Modified: head/sys/arm/qemu/files.qemu ============================================================================== --- head/sys/arm/qemu/files.qemu Sun May 10 09:33:15 2015 (r282716) +++ head/sys/arm/qemu/files.qemu Sun May 10 09:37:54 2015 (r282717) @@ -10,7 +10,6 @@ kern/kern_clocksource.c standard # # Standard qemu virt devices and support. # -arm/arm/gic.c standard arm/arm/generic_timer.c standard arm/qemu/virt_common.c standard arm/qemu/virt_machdep.c standard