From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58456) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c9uvt-00051E-I1 for qemu-devel@nongnu.org; Thu, 24 Nov 2016 09:23:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c9uvo-0005fw-JF for qemu-devel@nongnu.org; Thu, 24 Nov 2016 09:23:25 -0500 Received: from 16.mo3.mail-out.ovh.net ([188.165.56.217]:37025) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c9uvo-0005fM-9K for qemu-devel@nongnu.org; Thu, 24 Nov 2016 09:23:20 -0500 Received: from player730.ha.ovh.net (b7.ovh.net [213.186.33.57]) by mo3.mail-out.ovh.net (Postfix) with ESMTP id A849B620D8 for ; Thu, 24 Nov 2016 15:23:18 +0100 (CET) Date: Thu, 24 Nov 2016 15:23:10 +0100 From: Greg Kurz Message-ID: <20161124152310.29e5e38b@bahia> In-Reply-To: <20161124093152.5afff15c@bahia> References: <1479764372-29470-1-git-send-email-sstabellini@kernel.org> <1479764372-29470-2-git-send-email-sstabellini@kernel.org> <20161124093152.5afff15c@bahia> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 2/4] 9pfs: introduce transport specific callbacks List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefano Stabellini Cc: anthony.perard@citrix.com, xen-devel@lists.xensource.com, wei.liu2@citrix.com, aneesh.kumar@linux.vnet.ibm.com, qemu-devel@nongnu.org On Thu, 24 Nov 2016 09:31:52 +0100 Greg Kurz wrote: > On Mon, 21 Nov 2016 13:39:30 -0800 > Stefano Stabellini wrote: > > > Don't call virtio functions from 9pfs generic code, use generic function > > callbacks instead. > > > > Signed-off-by: Stefano Stabellini > > --- > > Just a couple of indentation and line over 80 characters nits. I'll fix them > before pushing to 9p-next. > > Reviewed-by: Greg Kurz > Hmm... second thought... > > hw/9pfs/9p.c | 8 ++++---- > > hw/9pfs/9p.h | 18 ++++++++++++++++++ > > hw/9pfs/virtio-9p-device.c | 18 ++++++++++++++---- > > hw/9pfs/virtio-9p.h | 9 --------- > > 4 files changed, 36 insertions(+), 17 deletions(-) > > > > diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c > > index 05e950f..5a20a13 100644 > > --- a/hw/9pfs/9p.c > > +++ b/hw/9pfs/9p.c > > @@ -47,7 +47,7 @@ ssize_t pdu_marshal(V9fsPDU *pdu, size_t offset, const char *fmt, ...) > > va_list ap; > > > > va_start(ap, fmt); > > - ret = virtio_pdu_vmarshal(pdu, offset, fmt, ap); > > + ret = pdu->s->transport->pdu_vmarshal(pdu, offset, fmt, ap); > > va_end(ap); > > > > return ret; > > @@ -59,7 +59,7 @@ ssize_t pdu_unmarshal(V9fsPDU *pdu, size_t offset, const char *fmt, ...) > > va_list ap; > > > > va_start(ap, fmt); > > - ret = virtio_pdu_vunmarshal(pdu, offset, fmt, ap); > > + ret = pdu->s->transport->pdu_vunmarshal(pdu, offset, fmt, ap); > > va_end(ap); > > > > return ret; > > @@ -67,7 +67,7 @@ ssize_t pdu_unmarshal(V9fsPDU *pdu, size_t offset, const char *fmt, ...) > > > > static void pdu_push_and_notify(V9fsPDU *pdu) > > { > > - virtio_9p_push_and_notify(pdu); > > + pdu->s->transport->push_and_notify(pdu); > > } > > > > static int omode_to_uflags(int8_t mode) > > @@ -1751,7 +1751,7 @@ static void v9fs_init_qiov_from_pdu(QEMUIOVector *qiov, V9fsPDU *pdu, > > struct iovec *iov; > > unsigned int niov; > > > > - virtio_init_iov_from_pdu(pdu, &iov, &niov, is_write); > > + pdu->s->transport->init_iov_from_pdu(pdu, &iov, &niov, is_write); > > > > qemu_iovec_init_external(&elem, iov, niov); > > qemu_iovec_init(qiov, niov); > > diff --git a/hw/9pfs/9p.h b/hw/9pfs/9p.h > > index 07cee01..ab398d0 100644 > > --- a/hw/9pfs/9p.h > > +++ b/hw/9pfs/9p.h > > @@ -230,6 +230,7 @@ typedef struct V9fsState > > enum p9_proto_version proto_version; > > int32_t msize; > > V9fsPDU pdus[MAX_REQ]; > > + struct V9fsTransport *transport; > > /* > > * lock ensuring atomic path update > > * on rename. > > @@ -343,4 +344,21 @@ void pdu_free(V9fsPDU *pdu); > > void pdu_submit(V9fsPDU *pdu); > > void v9fs_reset(V9fsState *s); > > > > +struct V9fsTransport { > > + ssize_t (*pdu_vmarshal)(V9fsPDU *pdu, size_t offset, const char *fmt, va_list ap); > > over 80 characters > > > + ssize_t (*pdu_vunmarshal)(V9fsPDU *pdu, size_t offset, const char *fmt, va_list ap); > > ditto > > > + void (*init_iov_from_pdu)(V9fsPDU *pdu, struct iovec **piov, > > + unsigned int *pniov, bool is_write); > > indent > > > + void (*push_and_notify)(V9fsPDU *pdu); > > +}; > > + > > +static inline int v9fs_register_transport(V9fsState *s, struct V9fsTransport *t) > > +{ > > + if (s->transport) { > > + return -EINVAL; > > + } > > + s->transport = t; > > + return 0; > > +} > > + > > #endif > > diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c > > index 1782e4a..e1a37a4 100644 > > --- a/hw/9pfs/virtio-9p-device.c > > +++ b/hw/9pfs/virtio-9p-device.c > > @@ -20,7 +20,9 @@ > > #include "hw/virtio/virtio-access.h" > > #include "qemu/iov.h" > > > > -void virtio_9p_push_and_notify(V9fsPDU *pdu) > > +static struct V9fsTransport virtio_9p_transport; ... shouldn't this be const ? > > + > > +static void virtio_9p_push_and_notify(V9fsPDU *pdu) > > { > > V9fsState *s = pdu->s; > > V9fsVirtioState *v = container_of(s, V9fsVirtioState, state); > > @@ -126,6 +128,7 @@ static void virtio_9p_device_realize(DeviceState *dev, Error **errp) > > v->config_size = sizeof(struct virtio_9p_config) + strlen(s->fsconf.tag); > > virtio_init(vdev, "virtio-9p", VIRTIO_ID_9P, v->config_size); > > v->vq = virtio_add_queue(vdev, MAX_REQ, handle_9p_output); > > + v9fs_register_transport(s, &virtio_9p_transport); > > > > out: > > return; > > @@ -148,7 +151,7 @@ static void virtio_9p_reset(VirtIODevice *vdev) > > v9fs_reset(&v->state); > > } > > > > -ssize_t virtio_pdu_vmarshal(V9fsPDU *pdu, size_t offset, > > +static ssize_t virtio_pdu_vmarshal(V9fsPDU *pdu, size_t offset, > > const char *fmt, va_list ap) > > indent > > > { > > V9fsState *s = pdu->s; > > @@ -158,7 +161,7 @@ ssize_t virtio_pdu_vmarshal(V9fsPDU *pdu, size_t offset, > > return v9fs_iov_vmarshal(elem->in_sg, elem->in_num, offset, 1, fmt, ap); > > } > > > > -ssize_t virtio_pdu_vunmarshal(V9fsPDU *pdu, size_t offset, > > +static ssize_t virtio_pdu_vunmarshal(V9fsPDU *pdu, size_t offset, > > const char *fmt, va_list ap) > > indent > > > { > > V9fsState *s = pdu->s; > > @@ -168,7 +171,7 @@ ssize_t virtio_pdu_vunmarshal(V9fsPDU *pdu, size_t offset, > > return v9fs_iov_vunmarshal(elem->out_sg, elem->out_num, offset, 1, fmt, ap); > > } > > > > -void virtio_init_iov_from_pdu(V9fsPDU *pdu, struct iovec **piov, > > +static void virtio_init_iov_from_pdu(V9fsPDU *pdu, struct iovec **piov, > > unsigned int *pniov, bool is_write) > > indent > > > { > > V9fsState *s = pdu->s; > > @@ -184,6 +187,13 @@ void virtio_init_iov_from_pdu(V9fsPDU *pdu, struct iovec **piov, > > } > > } > > > > +static struct V9fsTransport virtio_9p_transport = { > > + .pdu_vmarshal = virtio_pdu_vmarshal, > > + .pdu_vunmarshal = virtio_pdu_vunmarshal, > > + .init_iov_from_pdu = virtio_init_iov_from_pdu, > > + .push_and_notify = virtio_9p_push_and_notify, > > +}; > > + > > /* virtio-9p device */ > > > > static const VMStateDescription vmstate_virtio_9p = { > > diff --git a/hw/9pfs/virtio-9p.h b/hw/9pfs/virtio-9p.h > > index 52c4b9d..e763da2c 100644 > > --- a/hw/9pfs/virtio-9p.h > > +++ b/hw/9pfs/virtio-9p.h > > @@ -14,15 +14,6 @@ typedef struct V9fsVirtioState > > V9fsState state; > > } V9fsVirtioState; > > > > -void virtio_9p_push_and_notify(V9fsPDU *pdu); > > - > > -ssize_t virtio_pdu_vmarshal(V9fsPDU *pdu, size_t offset, > > - const char *fmt, va_list ap); > > -ssize_t virtio_pdu_vunmarshal(V9fsPDU *pdu, size_t offset, > > - const char *fmt, va_list ap); > > -void virtio_init_iov_from_pdu(V9fsPDU *pdu, struct iovec **piov, > > - unsigned int *pniov, bool is_write); > > - > > #define TYPE_VIRTIO_9P "virtio-9p-device" > > #define VIRTIO_9P(obj) \ > > OBJECT_CHECK(V9fsVirtioState, (obj), TYPE_VIRTIO_9P) > > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg Kurz Subject: Re: [Qemu-devel] [PATCH 2/4] 9pfs: introduce transport specific callbacks Date: Thu, 24 Nov 2016 15:23:10 +0100 Message-ID: <20161124152310.29e5e38b@bahia> References: <1479764372-29470-1-git-send-email-sstabellini@kernel.org> <1479764372-29470-2-git-send-email-sstabellini@kernel.org> <20161124093152.5afff15c@bahia> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20161124093152.5afff15c@bahia> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: Stefano Stabellini Cc: anthony.perard@citrix.com, xen-devel@lists.xensource.com, wei.liu2@citrix.com, aneesh.kumar@linux.vnet.ibm.com, qemu-devel@nongnu.org List-Id: xen-devel@lists.xenproject.org T24gVGh1LCAyNCBOb3YgMjAxNiAwOTozMTo1MiArMDEwMApHcmVnIEt1cnogPGdyb3VnQGthb2Qu b3JnPiB3cm90ZToKCj4gT24gTW9uLCAyMSBOb3YgMjAxNiAxMzozOTozMCAtMDgwMAo+IFN0ZWZh bm8gU3RhYmVsbGluaSA8c3N0YWJlbGxpbmlAa2VybmVsLm9yZz4gd3JvdGU6Cj4gCj4gPiBEb24n dCBjYWxsIHZpcnRpbyBmdW5jdGlvbnMgZnJvbSA5cGZzIGdlbmVyaWMgY29kZSwgdXNlIGdlbmVy aWMgZnVuY3Rpb24KPiA+IGNhbGxiYWNrcyBpbnN0ZWFkLgo+ID4gCj4gPiBTaWduZWQtb2ZmLWJ5 OiBTdGVmYW5vIFN0YWJlbGxpbmkgPHNzdGFiZWxsaW5pQGtlcm5lbC5vcmc+Cj4gPiAtLS0gIAo+ IAo+IEp1c3QgYSBjb3VwbGUgb2YgaW5kZW50YXRpb24gYW5kIGxpbmUgb3ZlciA4MCBjaGFyYWN0 ZXJzIG5pdHMuIEknbGwgZml4IHRoZW0KPiBiZWZvcmUgcHVzaGluZyB0byA5cC1uZXh0Lgo+IAo+ IFJldmlld2VkLWJ5OiBHcmVnIEt1cnogPGdyb3VnQGthb2Qub3JnPgo+IAoKSG1tLi4uIHNlY29u ZCB0aG91Z2h0Li4uCgo+ID4gIGh3LzlwZnMvOXAuYyAgICAgICAgICAgICAgIHwgIDggKysrKy0t LS0KPiA+ICBody85cGZzLzlwLmggICAgICAgICAgICAgICB8IDE4ICsrKysrKysrKysrKysrKysr Kwo+ID4gIGh3LzlwZnMvdmlydGlvLTlwLWRldmljZS5jIHwgMTggKysrKysrKysrKysrKystLS0t Cj4gPiAgaHcvOXBmcy92aXJ0aW8tOXAuaCAgICAgICAgfCAgOSAtLS0tLS0tLS0KPiA+ICA0IGZp bGVzIGNoYW5nZWQsIDM2IGluc2VydGlvbnMoKyksIDE3IGRlbGV0aW9ucygtKQo+ID4gCj4gPiBk aWZmIC0tZ2l0IGEvaHcvOXBmcy85cC5jIGIvaHcvOXBmcy85cC5jCj4gPiBpbmRleCAwNWU5NTBm Li41YTIwYTEzIDEwMDY0NAo+ID4gLS0tIGEvaHcvOXBmcy85cC5jCj4gPiArKysgYi9ody85cGZz LzlwLmMKPiA+IEBAIC00Nyw3ICs0Nyw3IEBAIHNzaXplX3QgcGR1X21hcnNoYWwoVjlmc1BEVSAq cGR1LCBzaXplX3Qgb2Zmc2V0LCBjb25zdCBjaGFyICpmbXQsIC4uLikKPiA+ICAgICAgdmFfbGlz dCBhcDsKPiA+ICAKPiA+ICAgICAgdmFfc3RhcnQoYXAsIGZtdCk7Cj4gPiAtICAgIHJldCA9IHZp cnRpb19wZHVfdm1hcnNoYWwocGR1LCBvZmZzZXQsIGZtdCwgYXApOwo+ID4gKyAgICByZXQgPSBw ZHUtPnMtPnRyYW5zcG9ydC0+cGR1X3ZtYXJzaGFsKHBkdSwgb2Zmc2V0LCBmbXQsIGFwKTsKPiA+ ICAgICAgdmFfZW5kKGFwKTsKPiA+ICAKPiA+ICAgICAgcmV0dXJuIHJldDsKPiA+IEBAIC01OSw3 ICs1OSw3IEBAIHNzaXplX3QgcGR1X3VubWFyc2hhbChWOWZzUERVICpwZHUsIHNpemVfdCBvZmZz ZXQsIGNvbnN0IGNoYXIgKmZtdCwgLi4uKQo+ID4gICAgICB2YV9saXN0IGFwOwo+ID4gIAo+ID4g ICAgICB2YV9zdGFydChhcCwgZm10KTsKPiA+IC0gICAgcmV0ID0gdmlydGlvX3BkdV92dW5tYXJz aGFsKHBkdSwgb2Zmc2V0LCBmbXQsIGFwKTsKPiA+ICsgICAgcmV0ID0gcGR1LT5zLT50cmFuc3Bv cnQtPnBkdV92dW5tYXJzaGFsKHBkdSwgb2Zmc2V0LCBmbXQsIGFwKTsKPiA+ICAgICAgdmFfZW5k KGFwKTsKPiA+ICAKPiA+ICAgICAgcmV0dXJuIHJldDsKPiA+IEBAIC02Nyw3ICs2Nyw3IEBAIHNz aXplX3QgcGR1X3VubWFyc2hhbChWOWZzUERVICpwZHUsIHNpemVfdCBvZmZzZXQsIGNvbnN0IGNo YXIgKmZtdCwgLi4uKQo+ID4gIAo+ID4gIHN0YXRpYyB2b2lkIHBkdV9wdXNoX2FuZF9ub3RpZnko Vjlmc1BEVSAqcGR1KQo+ID4gIHsKPiA+IC0gICAgdmlydGlvXzlwX3B1c2hfYW5kX25vdGlmeShw ZHUpOwo+ID4gKyAgICBwZHUtPnMtPnRyYW5zcG9ydC0+cHVzaF9hbmRfbm90aWZ5KHBkdSk7Cj4g PiAgfQo+ID4gIAo+ID4gIHN0YXRpYyBpbnQgb21vZGVfdG9fdWZsYWdzKGludDhfdCBtb2RlKQo+ ID4gQEAgLTE3NTEsNyArMTc1MSw3IEBAIHN0YXRpYyB2b2lkIHY5ZnNfaW5pdF9xaW92X2Zyb21f cGR1KFFFTVVJT1ZlY3RvciAqcWlvdiwgVjlmc1BEVSAqcGR1LAo+ID4gICAgICBzdHJ1Y3QgaW92 ZWMgKmlvdjsKPiA+ICAgICAgdW5zaWduZWQgaW50IG5pb3Y7Cj4gPiAgCj4gPiAtICAgIHZpcnRp b19pbml0X2lvdl9mcm9tX3BkdShwZHUsICZpb3YsICZuaW92LCBpc193cml0ZSk7Cj4gPiArICAg IHBkdS0+cy0+dHJhbnNwb3J0LT5pbml0X2lvdl9mcm9tX3BkdShwZHUsICZpb3YsICZuaW92LCBp c193cml0ZSk7Cj4gPiAgCj4gPiAgICAgIHFlbXVfaW92ZWNfaW5pdF9leHRlcm5hbCgmZWxlbSwg aW92LCBuaW92KTsKPiA+ICAgICAgcWVtdV9pb3ZlY19pbml0KHFpb3YsIG5pb3YpOwo+ID4gZGlm ZiAtLWdpdCBhL2h3LzlwZnMvOXAuaCBiL2h3LzlwZnMvOXAuaAo+ID4gaW5kZXggMDdjZWUwMS4u YWIzOThkMCAxMDA2NDQKPiA+IC0tLSBhL2h3LzlwZnMvOXAuaAo+ID4gKysrIGIvaHcvOXBmcy85 cC5oCj4gPiBAQCAtMjMwLDYgKzIzMCw3IEBAIHR5cGVkZWYgc3RydWN0IFY5ZnNTdGF0ZQo+ID4g ICAgICBlbnVtIHA5X3Byb3RvX3ZlcnNpb24gcHJvdG9fdmVyc2lvbjsKPiA+ICAgICAgaW50MzJf dCBtc2l6ZTsKPiA+ICAgICAgVjlmc1BEVSBwZHVzW01BWF9SRVFdOwo+ID4gKyAgICBzdHJ1Y3Qg Vjlmc1RyYW5zcG9ydCAqdHJhbnNwb3J0Owo+ID4gICAgICAvKgo+ID4gICAgICAgKiBsb2NrIGVu c3VyaW5nIGF0b21pYyBwYXRoIHVwZGF0ZQo+ID4gICAgICAgKiBvbiByZW5hbWUuCj4gPiBAQCAt MzQzLDQgKzM0NCwyMSBAQCB2b2lkIHBkdV9mcmVlKFY5ZnNQRFUgKnBkdSk7Cj4gPiAgdm9pZCBw ZHVfc3VibWl0KFY5ZnNQRFUgKnBkdSk7Cj4gPiAgdm9pZCB2OWZzX3Jlc2V0KFY5ZnNTdGF0ZSAq cyk7Cj4gPiAgCj4gPiArc3RydWN0IFY5ZnNUcmFuc3BvcnQgewo+ID4gKyAgICBzc2l6ZV90ICAg ICAoKnBkdV92bWFyc2hhbCkoVjlmc1BEVSAqcGR1LCBzaXplX3Qgb2Zmc2V0LCBjb25zdCBjaGFy ICpmbXQsIHZhX2xpc3QgYXApOyAgCj4gCj4gb3ZlciA4MCBjaGFyYWN0ZXJzCj4gCj4gPiArICAg IHNzaXplX3QgICAgICgqcGR1X3Z1bm1hcnNoYWwpKFY5ZnNQRFUgKnBkdSwgc2l6ZV90IG9mZnNl dCwgY29uc3QgY2hhciAqZm10LCB2YV9saXN0IGFwKTsgIAo+IAo+IGRpdHRvCj4gCj4gPiArICAg IHZvaWQgICAgICAgICgqaW5pdF9pb3ZfZnJvbV9wZHUpKFY5ZnNQRFUgKnBkdSwgc3RydWN0IGlv dmVjICoqcGlvdiwKPiA+ICsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBp bnQgKnBuaW92LCBib29sIGlzX3dyaXRlKTsgIAo+IAo+IGluZGVudAo+IAo+ID4gKyAgICB2b2lk ICAgICAgICAoKnB1c2hfYW5kX25vdGlmeSkoVjlmc1BEVSAqcGR1KTsKPiA+ICt9Owo+ID4gKwo+ ID4gK3N0YXRpYyBpbmxpbmUgaW50IHY5ZnNfcmVnaXN0ZXJfdHJhbnNwb3J0KFY5ZnNTdGF0ZSAq cywgc3RydWN0IFY5ZnNUcmFuc3BvcnQgKnQpCj4gPiArewo+ID4gKyAgICBpZiAocy0+dHJhbnNw b3J0KSB7Cj4gPiArICAgICAgICByZXR1cm4gLUVJTlZBTDsKPiA+ICsgICAgfQo+ID4gKyAgICBz LT50cmFuc3BvcnQgPSB0Owo+ID4gKyAgICByZXR1cm4gMDsKPiA+ICt9Cj4gPiArCj4gPiAgI2Vu ZGlmCj4gPiBkaWZmIC0tZ2l0IGEvaHcvOXBmcy92aXJ0aW8tOXAtZGV2aWNlLmMgYi9ody85cGZz L3ZpcnRpby05cC1kZXZpY2UuYwo+ID4gaW5kZXggMTc4MmU0YS4uZTFhMzdhNCAxMDA2NDQKPiA+ IC0tLSBhL2h3LzlwZnMvdmlydGlvLTlwLWRldmljZS5jCj4gPiArKysgYi9ody85cGZzL3ZpcnRp by05cC1kZXZpY2UuYwo+ID4gQEAgLTIwLDcgKzIwLDkgQEAKPiA+ICAjaW5jbHVkZSAiaHcvdmly dGlvL3ZpcnRpby1hY2Nlc3MuaCIKPiA+ICAjaW5jbHVkZSAicWVtdS9pb3YuaCIKPiA+ICAKPiA+ IC12b2lkIHZpcnRpb185cF9wdXNoX2FuZF9ub3RpZnkoVjlmc1BEVSAqcGR1KQo+ID4gK3N0YXRp YyBzdHJ1Y3QgVjlmc1RyYW5zcG9ydCB2aXJ0aW9fOXBfdHJhbnNwb3J0OwoKLi4uIHNob3VsZG4n dCB0aGlzIGJlIGNvbnN0ID8KCj4gPiArCj4gPiArc3RhdGljIHZvaWQgdmlydGlvXzlwX3B1c2hf YW5kX25vdGlmeShWOWZzUERVICpwZHUpCj4gPiAgewo+ID4gICAgICBWOWZzU3RhdGUgKnMgPSBw ZHUtPnM7Cj4gPiAgICAgIFY5ZnNWaXJ0aW9TdGF0ZSAqdiA9IGNvbnRhaW5lcl9vZihzLCBWOWZz VmlydGlvU3RhdGUsIHN0YXRlKTsKPiA+IEBAIC0xMjYsNiArMTI4LDcgQEAgc3RhdGljIHZvaWQg dmlydGlvXzlwX2RldmljZV9yZWFsaXplKERldmljZVN0YXRlICpkZXYsIEVycm9yICoqZXJycCkK PiA+ICAgICAgdi0+Y29uZmlnX3NpemUgPSBzaXplb2Yoc3RydWN0IHZpcnRpb185cF9jb25maWcp ICsgc3RybGVuKHMtPmZzY29uZi50YWcpOwo+ID4gICAgICB2aXJ0aW9faW5pdCh2ZGV2LCAidmly dGlvLTlwIiwgVklSVElPX0lEXzlQLCB2LT5jb25maWdfc2l6ZSk7Cj4gPiAgICAgIHYtPnZxID0g dmlydGlvX2FkZF9xdWV1ZSh2ZGV2LCBNQVhfUkVRLCBoYW5kbGVfOXBfb3V0cHV0KTsKPiA+ICsg ICAgdjlmc19yZWdpc3Rlcl90cmFuc3BvcnQocywgJnZpcnRpb185cF90cmFuc3BvcnQpOwo+ID4g IAo+ID4gIG91dDoKPiA+ICAgICAgcmV0dXJuOwo+ID4gQEAgLTE0OCw3ICsxNTEsNyBAQCBzdGF0 aWMgdm9pZCB2aXJ0aW9fOXBfcmVzZXQoVmlydElPRGV2aWNlICp2ZGV2KQo+ID4gICAgICB2OWZz X3Jlc2V0KCZ2LT5zdGF0ZSk7Cj4gPiAgfQo+ID4gIAo+ID4gLXNzaXplX3QgdmlydGlvX3BkdV92 bWFyc2hhbChWOWZzUERVICpwZHUsIHNpemVfdCBvZmZzZXQsCj4gPiArc3RhdGljIHNzaXplX3Qg dmlydGlvX3BkdV92bWFyc2hhbChWOWZzUERVICpwZHUsIHNpemVfdCBvZmZzZXQsCj4gPiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGNoYXIgKmZtdCwgdmFfbGlzdCBhcCkgIAo+ IAo+IGluZGVudAo+IAo+ID4gIHsKPiA+ICAgICAgVjlmc1N0YXRlICpzID0gcGR1LT5zOwo+ID4g QEAgLTE1OCw3ICsxNjEsNyBAQCBzc2l6ZV90IHZpcnRpb19wZHVfdm1hcnNoYWwoVjlmc1BEVSAq cGR1LCBzaXplX3Qgb2Zmc2V0LAo+ID4gICAgICByZXR1cm4gdjlmc19pb3Zfdm1hcnNoYWwoZWxl bS0+aW5fc2csIGVsZW0tPmluX251bSwgb2Zmc2V0LCAxLCBmbXQsIGFwKTsKPiA+ICB9Cj4gPiAg Cj4gPiAtc3NpemVfdCB2aXJ0aW9fcGR1X3Z1bm1hcnNoYWwoVjlmc1BEVSAqcGR1LCBzaXplX3Qg b2Zmc2V0LAo+ID4gK3N0YXRpYyBzc2l6ZV90IHZpcnRpb19wZHVfdnVubWFyc2hhbChWOWZzUERV ICpwZHUsIHNpemVfdCBvZmZzZXQsCj4gPiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Y29uc3QgY2hhciAqZm10LCB2YV9saXN0IGFwKSAgCj4gCj4gaW5kZW50Cj4gCj4gPiAgewo+ID4g ICAgICBWOWZzU3RhdGUgKnMgPSBwZHUtPnM7Cj4gPiBAQCAtMTY4LDcgKzE3MSw3IEBAIHNzaXpl X3QgdmlydGlvX3BkdV92dW5tYXJzaGFsKFY5ZnNQRFUgKnBkdSwgc2l6ZV90IG9mZnNldCwKPiA+ ICAgICAgcmV0dXJuIHY5ZnNfaW92X3Z1bm1hcnNoYWwoZWxlbS0+b3V0X3NnLCBlbGVtLT5vdXRf bnVtLCBvZmZzZXQsIDEsIGZtdCwgYXApOwo+ID4gIH0KPiA+ICAKPiA+IC12b2lkIHZpcnRpb19p bml0X2lvdl9mcm9tX3BkdShWOWZzUERVICpwZHUsIHN0cnVjdCBpb3ZlYyAqKnBpb3YsCj4gPiAr c3RhdGljIHZvaWQgdmlydGlvX2luaXRfaW92X2Zyb21fcGR1KFY5ZnNQRFUgKnBkdSwgc3RydWN0 IGlvdmVjICoqcGlvdiwKPiA+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25l ZCBpbnQgKnBuaW92LCBib29sIGlzX3dyaXRlKSAgCj4gCj4gaW5kZW50Cj4gCj4gPiAgewo+ID4g ICAgICBWOWZzU3RhdGUgKnMgPSBwZHUtPnM7Cj4gPiBAQCAtMTg0LDYgKzE4NywxMyBAQCB2b2lk IHZpcnRpb19pbml0X2lvdl9mcm9tX3BkdShWOWZzUERVICpwZHUsIHN0cnVjdCBpb3ZlYyAqKnBp b3YsCj4gPiAgICAgIH0KPiA+ICB9Cj4gPiAgCj4gPiArc3RhdGljIHN0cnVjdCBWOWZzVHJhbnNw b3J0IHZpcnRpb185cF90cmFuc3BvcnQgPSB7Cj4gPiArICAgIC5wZHVfdm1hcnNoYWwgPSB2aXJ0 aW9fcGR1X3ZtYXJzaGFsLAo+ID4gKyAgICAucGR1X3Z1bm1hcnNoYWwgPSB2aXJ0aW9fcGR1X3Z1 bm1hcnNoYWwsCj4gPiArICAgIC5pbml0X2lvdl9mcm9tX3BkdSA9IHZpcnRpb19pbml0X2lvdl9m cm9tX3BkdSwKPiA+ICsgICAgLnB1c2hfYW5kX25vdGlmeSA9IHZpcnRpb185cF9wdXNoX2FuZF9u b3RpZnksCj4gPiArfTsKPiA+ICsKPiA+ICAvKiB2aXJ0aW8tOXAgZGV2aWNlICovCj4gPiAgCj4g PiAgc3RhdGljIGNvbnN0IFZNU3RhdGVEZXNjcmlwdGlvbiB2bXN0YXRlX3ZpcnRpb185cCA9IHsK PiA+IGRpZmYgLS1naXQgYS9ody85cGZzL3ZpcnRpby05cC5oIGIvaHcvOXBmcy92aXJ0aW8tOXAu aAo+ID4gaW5kZXggNTJjNGI5ZC4uZTc2M2RhMmMgMTAwNjQ0Cj4gPiAtLS0gYS9ody85cGZzL3Zp cnRpby05cC5oCj4gPiArKysgYi9ody85cGZzL3ZpcnRpby05cC5oCj4gPiBAQCAtMTQsMTUgKzE0 LDYgQEAgdHlwZWRlZiBzdHJ1Y3QgVjlmc1ZpcnRpb1N0YXRlCj4gPiAgICAgIFY5ZnNTdGF0ZSBz dGF0ZTsKPiA+ICB9IFY5ZnNWaXJ0aW9TdGF0ZTsKPiA+ICAKPiA+IC12b2lkIHZpcnRpb185cF9w dXNoX2FuZF9ub3RpZnkoVjlmc1BEVSAqcGR1KTsKPiA+IC0KPiA+IC1zc2l6ZV90IHZpcnRpb19w ZHVfdm1hcnNoYWwoVjlmc1BEVSAqcGR1LCBzaXplX3Qgb2Zmc2V0LAo+ID4gLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICBjb25zdCBjaGFyICpmbXQsIHZhX2xpc3QgYXApOwo+ID4gLXNzaXpl X3QgdmlydGlvX3BkdV92dW5tYXJzaGFsKFY5ZnNQRFUgKnBkdSwgc2l6ZV90IG9mZnNldCwKPiA+ IC0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBjaGFyICpmbXQsIHZhX2xpc3Qg YXApOwo+ID4gLXZvaWQgdmlydGlvX2luaXRfaW92X2Zyb21fcGR1KFY5ZnNQRFUgKnBkdSwgc3Ry dWN0IGlvdmVjICoqcGlvdiwKPiA+IC0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNp Z25lZCBpbnQgKnBuaW92LCBib29sIGlzX3dyaXRlKTsKPiA+IC0KPiA+ICAjZGVmaW5lIFRZUEVf VklSVElPXzlQICJ2aXJ0aW8tOXAtZGV2aWNlIgo+ID4gICNkZWZpbmUgVklSVElPXzlQKG9iaikg XAo+ID4gICAgICAgICAgT0JKRUNUX0NIRUNLKFY5ZnNWaXJ0aW9TdGF0ZSwgKG9iaiksIFRZUEVf VklSVElPXzlQKSAgCj4gCj4gCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVuLm9y ZwpodHRwczovL2xpc3RzLnhlbi5vcmcveGVuLWRldmVsCg==