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

View file

@ -9,7 +9,6 @@
#include <glib.h>
#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;