From owner-svn-src-all@FreeBSD.ORG Mon Jun 16 04:25:06 2014 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 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5B8BE37A; Mon, 16 Jun 2014 04:25:06 +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 48E362257; Mon, 16 Jun 2014 04:25:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5G4P6Ko055886; Mon, 16 Jun 2014 04:25:06 GMT (envelope-from bryanv@svn.freebsd.org) Received: (from bryanv@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5G4P5nR055880; Mon, 16 Jun 2014 04:25:05 GMT (envelope-from bryanv@svn.freebsd.org) Message-Id: <201406160425.s5G4P5nR055880@svn.freebsd.org> From: Bryan Venteicher Date: Mon, 16 Jun 2014 04:25:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r267522 - in head/sys/dev/virtio: . pci 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.18 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: Mon, 16 Jun 2014 04:25:06 -0000 Author: bryanv Date: Mon Jun 16 04:25:04 2014 New Revision: 267522 URL: http://svnweb.freebsd.org/changeset/base/267522 Log: Move the VIRTIO_RING_F_* defines out of virtqueue.h into virtio_config.h These defines are applicable to userland too, but virtqueue.h contains the kernel virtqueue interface, and is therefore not usable in userland. Note that Linux places these defines in virtio_ring.h, but I don't want the drivers including this header file to keep the VirtIO ring opaque to everything but the virtqueue. MFC after: 1 week Modified: head/sys/dev/virtio/pci/virtio_pci.c head/sys/dev/virtio/virtio.h head/sys/dev/virtio/virtio_config.h head/sys/dev/virtio/virtqueue.c head/sys/dev/virtio/virtqueue.h Modified: head/sys/dev/virtio/pci/virtio_pci.c ============================================================================== --- head/sys/dev/virtio/pci/virtio_pci.c Mon Jun 16 04:16:31 2014 (r267521) +++ head/sys/dev/virtio/pci/virtio_pci.c Mon Jun 16 04:25:04 2014 (r267522) @@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include Modified: head/sys/dev/virtio/virtio.h ============================================================================== --- head/sys/dev/virtio/virtio.h Mon Jun 16 04:16:31 2014 (r267521) +++ head/sys/dev/virtio/virtio.h Mon Jun 16 04:25:04 2014 (r267522) @@ -30,6 +30,7 @@ #define _VIRTIO_H_ #include +#include struct vq_alloc_info; Modified: head/sys/dev/virtio/virtio_config.h ============================================================================== --- head/sys/dev/virtio/virtio_config.h Mon Jun 16 04:16:31 2014 (r267521) +++ head/sys/dev/virtio/virtio_config.h Mon Jun 16 04:25:04 2014 (r267522) @@ -44,6 +44,12 @@ */ #define VIRTIO_F_NOTIFY_ON_EMPTY (1 << 24) +/* Support for indirect buffer descriptors. */ +#define VIRTIO_RING_F_INDIRECT_DESC (1 << 28) + +/* Support to suppress interrupt until specific index is reached. */ +#define VIRTIO_RING_F_EVENT_IDX (1 << 29) + /* * The guest should never negotiate this feature; it * is used to detect faulty drivers. Modified: head/sys/dev/virtio/virtqueue.c ============================================================================== --- head/sys/dev/virtio/virtqueue.c Mon Jun 16 04:16:31 2014 (r267521) +++ head/sys/dev/virtio/virtqueue.c Mon Jun 16 04:25:04 2014 (r267522) @@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include Modified: head/sys/dev/virtio/virtqueue.h ============================================================================== --- head/sys/dev/virtio/virtqueue.h Mon Jun 16 04:16:31 2014 (r267521) +++ head/sys/dev/virtio/virtqueue.h Mon Jun 16 04:25:04 2014 (r267522) @@ -32,12 +32,6 @@ struct virtqueue; struct sglist; -/* Support for indirect buffer descriptors. */ -#define VIRTIO_RING_F_INDIRECT_DESC (1 << 28) - -/* Support to suppress interrupt until specific index is reached. */ -#define VIRTIO_RING_F_EVENT_IDX (1 << 29) - /* Device callback for a virtqueue interrupt. */ typedef void virtqueue_intr_t(void *);