[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 01/13] 9pfs: move pdus to V9fsState
From: |
Greg Kurz |
Subject: |
[Qemu-devel] [PULL 01/13] 9pfs: move pdus to V9fsState |
Date: |
Wed, 4 Jan 2017 09:21:35 +0100 |
From: Stefano Stabellini <address@hidden>
pdus are initialized and used in 9pfs common code. Move the array from
V9fsVirtioState to V9fsState.
Signed-off-by: Stefano Stabellini <address@hidden>
Reviewed-by: Greg Kurz <address@hidden>
Signed-off-by: Greg Kurz <address@hidden>
---
hw/9pfs/9p.c | 7 +++----
hw/9pfs/9p.h | 1 +
hw/9pfs/virtio-9p.h | 1 -
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
index faebd91f5fab..6bd364f6a0d1 100644
--- a/hw/9pfs/9p.c
+++ b/hw/9pfs/9p.c
@@ -3440,7 +3440,6 @@ void pdu_submit(V9fsPDU *pdu)
/* Returns 0 on success, 1 on failure. */
int v9fs_device_realize_common(V9fsState *s, Error **errp)
{
- V9fsVirtioState *v = container_of(s, V9fsVirtioState, state);
int i, len;
struct stat stat;
FsDriverEntry *fse;
@@ -3451,9 +3450,9 @@ int v9fs_device_realize_common(V9fsState *s, Error **errp)
QLIST_INIT(&s->free_list);
QLIST_INIT(&s->active_list);
for (i = 0; i < (MAX_REQ - 1); i++) {
- QLIST_INSERT_HEAD(&s->free_list, &v->pdus[i], next);
- v->pdus[i].s = s;
- v->pdus[i].idx = i;
+ QLIST_INSERT_HEAD(&s->free_list, &s->pdus[i], next);
+ s->pdus[i].s = s;
+ s->pdus[i].idx = i;
}
v9fs_path_init(&path);
diff --git a/hw/9pfs/9p.h b/hw/9pfs/9p.h
index 3976b7fe3dcd..07cee01abac3 100644
--- a/hw/9pfs/9p.h
+++ b/hw/9pfs/9p.h
@@ -229,6 +229,7 @@ typedef struct V9fsState
char *tag;
enum p9_proto_version proto_version;
int32_t msize;
+ V9fsPDU pdus[MAX_REQ];
/*
* lock ensuring atomic path update
* on rename.
diff --git a/hw/9pfs/virtio-9p.h b/hw/9pfs/virtio-9p.h
index 25c47c7cb6d6..52c4b9df51ca 100644
--- a/hw/9pfs/virtio-9p.h
+++ b/hw/9pfs/virtio-9p.h
@@ -10,7 +10,6 @@ typedef struct V9fsVirtioState
VirtIODevice parent_obj;
VirtQueue *vq;
size_t config_size;
- V9fsPDU pdus[MAX_REQ];
VirtQueueElement *elems[MAX_REQ];
V9fsState state;
} V9fsVirtioState;
--
2.7.4
- [Qemu-devel] [PULL 00/13] 9p patches 20170104, Greg Kurz, 2017/01/04
- [Qemu-devel] [PULL 03/13] 9pfs: call v9fs_init_qiov_from_pdu before v9fs_pack, Greg Kurz, 2017/01/04
- [Qemu-devel] [PULL 01/13] 9pfs: move pdus to V9fsState,
Greg Kurz <=
- [Qemu-devel] [PULL 02/13] 9pfs: introduce transport specific callbacks, Greg Kurz, 2017/01/04
- [Qemu-devel] [PULL 05/13] 9pfs: fix crash when fsdev is missing, Greg Kurz, 2017/01/04
- [Qemu-devel] [PULL 06/13] tests: virtio-9p: rename PCI configuration test, Greg Kurz, 2017/01/04
- [Qemu-devel] [PULL 04/13] 9pfs: introduce init_out/in_iov_from_pdu, Greg Kurz, 2017/01/04
- [Qemu-devel] [PULL 07/13] tests: virtio-9p: code refactoring, Greg Kurz, 2017/01/04
- [Qemu-devel] [PULL 08/13] 9pfs: fix P9_NOTAG and P9_NOFID macros, Greg Kurz, 2017/01/04
- [Qemu-devel] [PULL 11/13] tests: virtio-9p: add walk operation test, Greg Kurz, 2017/01/04
- [Qemu-devel] [PULL 10/13] tests: virtio-9p: add attach operation test, Greg Kurz, 2017/01/04
- [Qemu-devel] [PULL 12/13] tests: virtio-9p: no slash in path elements during walk, Greg Kurz, 2017/01/04
- [Qemu-devel] [PULL 09/13] tests: virtio-9p: add version operation test, Greg Kurz, 2017/01/04