From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36692) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aHGfV-000422-RF for qemu-devel@nongnu.org; Thu, 07 Jan 2016 14:56:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aHGfT-0005o5-W9 for qemu-devel@nongnu.org; Thu, 07 Jan 2016 14:56:21 -0500 Received: from smtp.citrix.com ([66.165.176.89]:3508) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aHGfT-0005nN-Re for qemu-devel@nongnu.org; Thu, 07 Jan 2016 14:56:19 -0500 From: Wei Liu Date: Thu, 7 Jan 2016 19:56:05 +0000 Message-ID: <1452196584-17259-9-git-send-email-wei.liu2@citrix.com> In-Reply-To: <1452196584-17259-1-git-send-email-wei.liu2@citrix.com> References: <1452196584-17259-1-git-send-email-wei.liu2@citrix.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH v2 08/27] 9pfs: merge hw/virtio/virtio-9p.h into hw/9pfs/virtio-9p.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Greg Kurz , Wei Liu , "Aneesh Kumar K.V" , "Michael S. Tsirkin" The deleted file only contained V9fsConf which wasn't virtio specific. Merge that to the general header of 9pfs. Fixed header inclusions as I went along. Signed-off-by: Wei Liu --- hw/9pfs/virtio-9p-device.c | 1 - hw/9pfs/virtio-9p.h | 8 +++++++- hw/virtio/virtio-pci.h | 1 - include/hw/virtio/virtio-9p.h | 24 ------------------------ 4 files changed, 7 insertions(+), 27 deletions(-) delete mode 100644 include/hw/virtio/virtio-9p.h diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c index 92ac19b..885b940 100644 --- a/hw/9pfs/virtio-9p-device.c +++ b/hw/9pfs/virtio-9p-device.c @@ -12,7 +12,6 @@ */ #include "hw/virtio/virtio.h" -#include "hw/virtio/virtio-9p.h" #include "hw/i386/pc.h" #include "qemu/sockets.h" #include "virtio-9p.h" diff --git a/hw/9pfs/virtio-9p.h b/hw/9pfs/virtio-9p.h index d7a4dc1..ac4cb00 100644 --- a/hw/9pfs/virtio-9p.h +++ b/hw/9pfs/virtio-9p.h @@ -9,7 +9,6 @@ #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" #include "fsdev/virtio-9p-marshal.h" #include "qemu/thread.h" @@ -156,6 +155,13 @@ enum { P9_FID_XATTR, }; +typedef struct V9fsConf +{ + /* tag name for the device */ + char *tag; + char *fsdev_id; +} V9fsConf; + typedef struct V9fsXattr { int64_t copied_len; diff --git a/hw/virtio/virtio-pci.h b/hw/virtio/virtio-pci.h index a104ff2..7cf5974 100644 --- a/hw/virtio/virtio-pci.h +++ b/hw/virtio/virtio-pci.h @@ -23,7 +23,6 @@ #include "hw/virtio/virtio-scsi.h" #include "hw/virtio/virtio-balloon.h" #include "hw/virtio/virtio-bus.h" -#include "hw/virtio/virtio-9p.h" #include "hw/virtio/virtio-input.h" #include "hw/virtio/virtio-gpu.h" #ifdef CONFIG_VIRTFS diff --git a/include/hw/virtio/virtio-9p.h b/include/hw/virtio/virtio-9p.h deleted file mode 100644 index 65789db..0000000 --- a/include/hw/virtio/virtio-9p.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Virtio 9p - * - * Copyright IBM, Corp. 2010 - * - * Authors: - * Aneesh Kumar K.V - * - * This work is licensed under the terms of the GNU GPL, version 2. See - * the COPYING file in the top-level directory. - * - */ - -#ifndef QEMU_VIRTIO_9P_DEVICE_H -#define QEMU_VIRTIO_9P_DEVICE_H - -typedef struct V9fsConf -{ - /* tag name for the device */ - char *tag; - char *fsdev_id; -} V9fsConf; - -#endif -- 2.1.4