From patchwork Mon Feb 16 21:35:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 440367 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id DFB611401DD for ; Tue, 17 Feb 2015 08:38:46 +1100 (AEDT) Received: from localhost ([::1]:42580 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YNTNN-0002DV-0o for incoming@patchwork.ozlabs.org; Mon, 16 Feb 2015 16:38:45 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48940) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YNTKp-0005fN-IT for qemu-devel@nongnu.org; Mon, 16 Feb 2015 16:36:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YNTKm-0004nR-Dh for qemu-devel@nongnu.org; Mon, 16 Feb 2015 16:36:07 -0500 Received: from mail.kernel.org ([198.145.29.136]:48027) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YNTKm-0004nH-1L for qemu-devel@nongnu.org; Mon, 16 Feb 2015 16:36:04 -0500 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 001D0201FA; Mon, 16 Feb 2015 21:36:02 +0000 (UTC) Received: from redhat.com (unknown [109.66.37.54]) (using TLSv1.2 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2331C201E4; Mon, 16 Feb 2015 21:35:59 +0000 (UTC) Date: Mon, 16 Feb 2015 22:35:57 +0100 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <1424122283-12521-7-git-send-email-mst@redhat.com> References: <1424122283-12521-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1424122283-12521-1-git-send-email-mst@redhat.com> X-Mailer: git-send-email 2.0.0.545.gd9cabeb X-Mutt-Fcc: =sent X-Virus-Scanned: ClamAV using ClamSMTP X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 198.145.29.136 Cc: Peter Maydell , Thomas Huth , Alexander Graf , "Aneesh Kumar K.V" , Stefan Hajnoczi , Cornelia Huck , "Chen, Tiejun" , Anthony Liguori Subject: [Qemu-devel] [PATCH v3 06/17] virtio-9p: use standard headers X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Drop code duplicated from standard headers. Signed-off-by: Michael S. Tsirkin Reviewed-by: Thomas Huth --- hw/9pfs/virtio-9p.h | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/hw/9pfs/virtio-9p.h b/hw/9pfs/virtio-9p.h index 0776424..58dafa9 100644 --- a/hw/9pfs/virtio-9p.h +++ b/hw/9pfs/virtio-9p.h @@ -7,6 +7,7 @@ #include #include #include +#include "standard-headers/linux/virtio_9p.h" #include "hw/virtio/virtio.h" #include "hw/virtio/virtio-9p.h" #include "fsdev/file-op-9p.h" @@ -14,10 +15,6 @@ #include "qemu/thread.h" #include "block/coroutine.h" -/* The feature bitmap for virtio 9P */ -/* The mount point is specified in a config variable */ -#define VIRTIO_9P_MOUNT_TAG 0 - enum { P9_TLERROR = 6, P9_RLERROR, @@ -145,10 +142,6 @@ struct V9fsPDU * 1) change user needs to set groups and stuff */ -/* from Linux's linux/virtio_9p.h */ - -/* The ID for virtio console */ -#define VIRTIO_ID_9P 9 #define MAX_REQ 128 #define MAX_TAG_LEN 32 @@ -278,14 +271,6 @@ typedef struct V9fsWriteState { int cnt; } V9fsWriteState; -struct virtio_9p_config -{ - /* number of characters in tag */ - uint16_t tag_len; - /* Variable size tag name */ - uint8_t tag[0]; -} QEMU_PACKED; - typedef struct V9fsMkState { V9fsPDU *pdu; size_t offset;