[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 06/17] virtio-9p: use standard headers
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PATCH v2 06/17] virtio-9p: use standard headers |
Date: |
Sun, 15 Feb 2015 12:38:52 +0100 |
Drop code duplicated from standard headers.
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
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..2b1fbdd 100644
--- a/hw/9pfs/virtio-9p.h
+++ b/hw/9pfs/virtio-9p.h
@@ -7,6 +7,7 @@
#include <utime.h>
#include <sys/resource.h>
#include <glib.h>
+#include "standard-headers/sys/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;
--
MST
- [Qemu-devel] [PATCH v2 00/17] virtio: pull headers from linux, Michael S. Tsirkin, 2015/02/15
- [Qemu-devel] [PATCH v2 01/17] scripts/update-linux-headers.sh: pull virtio hdrs, Michael S. Tsirkin, 2015/02/15
- [Qemu-devel] [PATCH v2 03/17] virtio: use standard virtio_ring.h, Michael S. Tsirkin, 2015/02/15
- [Qemu-devel] [PATCH v2 02/17] include: import virtio headers from linux 4.0, Michael S. Tsirkin, 2015/02/15
- [Qemu-devel] [PATCH v2 04/17] virtio: use standard-headers, Michael S. Tsirkin, 2015/02/15
- [Qemu-devel] [PATCH v2 05/17] virtio-balloon: use standard headers, Michael S. Tsirkin, 2015/02/15
- [Qemu-devel] [PATCH v2 06/17] virtio-9p: use standard headers,
Michael S. Tsirkin <=
- [Qemu-devel] [PATCH v2 07/17] virtio-blk: switch to standard-headers, Michael S. Tsirkin, 2015/02/15
- [Qemu-devel] [PATCH v2 09/17] virtio-rng: use standard-headers, Michael S. Tsirkin, 2015/02/15
- [Qemu-devel] [PATCH v2 08/17] virtio-net, tap: use standard-headers, Michael S. Tsirkin, 2015/02/15
- [Qemu-devel] [PATCH v2 10/17] virtio-scsi: use standard-headers, Michael S. Tsirkin, 2015/02/15
[Qemu-devel] [PATCH v2 11/17] virtio-serial: switch to standard-headers, Michael S. Tsirkin, 2015/02/15
[Qemu-devel] [PATCH v2 12/17] update-linux-headers: use standard-headers, Michael S. Tsirkin, 2015/02/15