ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

9pfs: merge hw/virtio/virtio-9p.h into hw/9pfs/virtio-9p.h 

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 <wei.liu2@citrix.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
This commit is contained in:
Wei Liu 2015-11-25 16:58:20 +00:00 committed by Aneesh Kumar K.V
parent 267ae092e2
commit 756cb74a59
4 changed files with 7 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/9pfs/virtio-9p-device.c
View File

@ -12,7 +12,6 @@
*/ */
#include "hw/virtio/virtio.h" #include "hw/virtio/virtio.h"
#include "hw/virtio/virtio-9p.h"
#include "hw/i386/pc.h" #include "hw/i386/pc.h"
#include "qemu/sockets.h" #include "qemu/sockets.h"
#include "virtio-9p.h" #include "virtio-9p.h"

8
hw/9pfs/virtio-9p.h
View File

@ -9,7 +9,6 @@
#include <glib.h> #include <glib.h>
#include "standard-headers/linux/virtio_9p.h" #include "standard-headers/linux/virtio_9p.h"
#include "hw/virtio/virtio.h" #include "hw/virtio/virtio.h"
#include "hw/virtio/virtio-9p.h"
#include "fsdev/file-op-9p.h" #include "fsdev/file-op-9p.h"
#include "fsdev/virtio-9p-marshal.h" #include "fsdev/virtio-9p-marshal.h"
#include "qemu/thread.h" #include "qemu/thread.h"
@ -156,6 +155,13 @@ enum {
P9_FID_XATTR, P9_FID_XATTR,
}; };
typedef struct V9fsConf
{
/* tag name for the device */
char *tag;
char *fsdev_id;
} V9fsConf;
typedef struct V9fsXattr typedef struct V9fsXattr
{ {
int64_t copied_len; int64_t copied_len;

1
hw/virtio/virtio-pci.h
View File

@ -23,7 +23,6 @@
#include "hw/virtio/virtio-scsi.h" #include "hw/virtio/virtio-scsi.h"
#include "hw/virtio/virtio-balloon.h" #include "hw/virtio/virtio-balloon.h"
#include "hw/virtio/virtio-bus.h" #include "hw/virtio/virtio-bus.h"
#include "hw/virtio/virtio-9p.h"
#include "hw/virtio/virtio-input.h" #include "hw/virtio/virtio-input.h"
#include "hw/virtio/virtio-gpu.h" #include "hw/virtio/virtio-gpu.h"
#ifdef CONFIG_VIRTFS #ifdef CONFIG_VIRTFS

24
include/hw/virtio/virtio-9p.h
View File

@ -1,24 +0,0 @@
/*
* Virtio 9p
*
* Copyright IBM, Corp. 2010
*
* Authors:
* Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
*
* 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