From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37071) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c8wJQ-0006P1-Jr for qemu-devel@nongnu.org; Mon, 21 Nov 2016 16:39:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c8wJM-00012l-LU for qemu-devel@nongnu.org; Mon, 21 Nov 2016 16:39:40 -0500 Received: from mail.kernel.org ([198.145.29.136]:36772) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c8wJM-00012Z-Fk for qemu-devel@nongnu.org; Mon, 21 Nov 2016 16:39:36 -0500 From: Stefano Stabellini Date: Mon, 21 Nov 2016 13:39:29 -0800 Message-Id: <1479764372-29470-1-git-send-email-sstabellini@kernel.org> In-Reply-To: References: Subject: [Qemu-devel] [PATCH 1/4] 9pfs: move pdus to V9fsState List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: aneesh.kumar@linux.vnet.ibm.com Cc: groug@kaod.org, sstabellini@kernel.org, qemu-devel@nongnu.org, xen-devel@lists.xensource.com, anthony.perard@citrix.com, wei.liu2@citrix.com pdus are initialized and used in 9pfs common code. Move the array from V9fsVirtioState to V9fsState. Signed-off-by: Stefano Stabellini --- 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 aea7e9d..05e950f 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 3976b7f..07cee01 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 25c47c7..52c4b9d 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; -- 1.9.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Stabellini Subject: [PATCH 1/4] 9pfs: move pdus to V9fsState Date: Mon, 21 Nov 2016 13:39:29 -0800 Message-ID: <1479764372-29470-1-git-send-email-sstabellini@kernel.org> References: Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: aneesh.kumar@linux.vnet.ibm.com Cc: xen-devel@lists.xensource.com, wei.liu2@citrix.com, groug@kaod.org, qemu-devel@nongnu.org, sstabellini@kernel.org, anthony.perard@citrix.com List-Id: xen-devel@lists.xenproject.org cGR1cyBhcmUgaW5pdGlhbGl6ZWQgYW5kIHVzZWQgaW4gOXBmcyBjb21tb24gY29kZS4gTW92ZSB0 aGUgYXJyYXkgZnJvbQpWOWZzVmlydGlvU3RhdGUgdG8gVjlmc1N0YXRlLgoKU2lnbmVkLW9mZi1i eTogU3RlZmFubyBTdGFiZWxsaW5pIDxzc3RhYmVsbGluaUBrZXJuZWwub3JnPgotLS0KIGh3Lzlw ZnMvOXAuYyAgICAgICAgfCA3ICsrKy0tLS0KIGh3LzlwZnMvOXAuaCAgICAgICAgfCAxICsKIGh3 LzlwZnMvdmlydGlvLTlwLmggfCAxIC0KIDMgZmlsZXMgY2hhbmdlZCwgNCBpbnNlcnRpb25zKCsp LCA1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2h3LzlwZnMvOXAuYyBiL2h3LzlwZnMvOXAu YwppbmRleCBhZWE3ZTlkLi4wNWU5NTBmIDEwMDY0NAotLS0gYS9ody85cGZzLzlwLmMKKysrIGIv aHcvOXBmcy85cC5jCkBAIC0zNDQwLDcgKzM0NDAsNiBAQCB2b2lkIHBkdV9zdWJtaXQoVjlmc1BE VSAqcGR1KQogLyogUmV0dXJucyAwIG9uIHN1Y2Nlc3MsIDEgb24gZmFpbHVyZS4gKi8KIGludCB2 OWZzX2RldmljZV9yZWFsaXplX2NvbW1vbihWOWZzU3RhdGUgKnMsIEVycm9yICoqZXJycCkKIHsK LSAgICBWOWZzVmlydGlvU3RhdGUgKnYgPSBjb250YWluZXJfb2YocywgVjlmc1ZpcnRpb1N0YXRl LCBzdGF0ZSk7CiAgICAgaW50IGksIGxlbjsKICAgICBzdHJ1Y3Qgc3RhdCBzdGF0OwogICAgIEZz RHJpdmVyRW50cnkgKmZzZTsKQEAgLTM0NTEsOSArMzQ1MCw5IEBAIGludCB2OWZzX2RldmljZV9y ZWFsaXplX2NvbW1vbihWOWZzU3RhdGUgKnMsIEVycm9yICoqZXJycCkKICAgICBRTElTVF9JTklU KCZzLT5mcmVlX2xpc3QpOwogICAgIFFMSVNUX0lOSVQoJnMtPmFjdGl2ZV9saXN0KTsKICAgICBm b3IgKGkgPSAwOyBpIDwgKE1BWF9SRVEgLSAxKTsgaSsrKSB7Ci0gICAgICAgIFFMSVNUX0lOU0VS VF9IRUFEKCZzLT5mcmVlX2xpc3QsICZ2LT5wZHVzW2ldLCBuZXh0KTsKLSAgICAgICAgdi0+cGR1 c1tpXS5zID0gczsKLSAgICAgICAgdi0+cGR1c1tpXS5pZHggPSBpOworICAgICAgICBRTElTVF9J TlNFUlRfSEVBRCgmcy0+ZnJlZV9saXN0LCAmcy0+cGR1c1tpXSwgbmV4dCk7CisgICAgICAgIHMt PnBkdXNbaV0ucyA9IHM7CisgICAgICAgIHMtPnBkdXNbaV0uaWR4ID0gaTsKICAgICB9CiAKICAg ICB2OWZzX3BhdGhfaW5pdCgmcGF0aCk7CmRpZmYgLS1naXQgYS9ody85cGZzLzlwLmggYi9ody85 cGZzLzlwLmgKaW5kZXggMzk3NmI3Zi4uMDdjZWUwMSAxMDA2NDQKLS0tIGEvaHcvOXBmcy85cC5o CisrKyBiL2h3LzlwZnMvOXAuaApAQCAtMjI5LDYgKzIyOSw3IEBAIHR5cGVkZWYgc3RydWN0IFY5 ZnNTdGF0ZQogICAgIGNoYXIgKnRhZzsKICAgICBlbnVtIHA5X3Byb3RvX3ZlcnNpb24gcHJvdG9f dmVyc2lvbjsKICAgICBpbnQzMl90IG1zaXplOworICAgIFY5ZnNQRFUgcGR1c1tNQVhfUkVRXTsK ICAgICAvKgogICAgICAqIGxvY2sgZW5zdXJpbmcgYXRvbWljIHBhdGggdXBkYXRlCiAgICAgICog b24gcmVuYW1lLgpkaWZmIC0tZ2l0IGEvaHcvOXBmcy92aXJ0aW8tOXAuaCBiL2h3LzlwZnMvdmly dGlvLTlwLmgKaW5kZXggMjVjNDdjNy4uNTJjNGI5ZCAxMDA2NDQKLS0tIGEvaHcvOXBmcy92aXJ0 aW8tOXAuaAorKysgYi9ody85cGZzL3ZpcnRpby05cC5oCkBAIC0xMCw3ICsxMCw2IEBAIHR5cGVk ZWYgc3RydWN0IFY5ZnNWaXJ0aW9TdGF0ZQogICAgIFZpcnRJT0RldmljZSBwYXJlbnRfb2JqOwog ICAgIFZpcnRRdWV1ZSAqdnE7CiAgICAgc2l6ZV90IGNvbmZpZ19zaXplOwotICAgIFY5ZnNQRFUg cGR1c1tNQVhfUkVRXTsKICAgICBWaXJ0UXVldWVFbGVtZW50ICplbGVtc1tNQVhfUkVRXTsKICAg ICBWOWZzU3RhdGUgc3RhdGU7CiB9IFY5ZnNWaXJ0aW9TdGF0ZTsKLS0gCjEuOS4xCgoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxp bmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVuLm9yZwpodHRwczovL2xpc3RzLnhlbi5vcmcveGVu LWRldmVsCg==