From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Durrant Subject: [PATCH v3 1/3] xen-hvm: create separate function for ioreq server initialization Date: Tue, 15 May 2018 17:40:51 +0100 Message-ID: <20180515164053.14604-2-paul.durrant@citrix.com> References: <20180515164053.14604-1-paul.durrant@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1fId0U-0000Zk-VX for xen-devel@lists.xenproject.org; Tue, 15 May 2018 16:40:59 +0000 In-Reply-To: <20180515164053.14604-1-paul.durrant@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: qemu-devel@nongnu.org, xen-devel@lists.xenproject.org Cc: Paul Durrant , Stefano Stabellini List-Id: xen-devel@lists.xenproject.org VGhlIGNvZGUgaXMgc3VmZmljaWVudGx5IHN1YnN0YW50aWFsIHRoYXQgaXQgaW1wcm92ZXMgY29k ZSByZWFkYWJpbGl0eQp0byBwdXQgaXQgaW4gYSBuZXcgZnVuY3Rpb24gY2FsbGVkIGJ5IHhlbl9o dm1faW5pdCgpIHJhdGhlciB0aGFuIGhhdmluZwppdCBpbmxpbmUuCgpTaWduZWQtb2ZmLWJ5OiBQ YXVsIER1cnJhbnQgPHBhdWwuZHVycmFudEBjaXRyaXguY29tPgpSZXZpZXdlZC1ieTogQW50aG9u eSBQZXJhcmQgPGFudGhvbnkucGVyYXJkQGNpdHJpeC5jb20+Ci0tLQpDYzogU3RlZmFubyBTdGFi ZWxsaW5pIDxzc3RhYmVsbGluaUBrZXJuZWwub3JnPgotLS0KIGh3L2kzODYveGVuL3hlbi1odm0u YyB8IDc2ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0t LQogMSBmaWxlIGNoYW5nZWQsIDQ2IGluc2VydGlvbnMoKyksIDMwIGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2h3L2kzODYveGVuL3hlbi1odm0uYyBiL2h3L2kzODYveGVuL3hlbi1odm0uYwpp bmRleCBjYWE1NjNiZTNkLi42ZmZhM2MyMmNjIDEwMDY0NAotLS0gYS9ody9pMzg2L3hlbi94ZW4t aHZtLmMKKysrIGIvaHcvaTM4Ni94ZW4veGVuLWh2bS5jCkBAIC05NSw3ICs5NSw4IEBAIHR5cGVk ZWYgc3RydWN0IFhlbklPU3RhdGUgewogICAgIENQVVN0YXRlICoqY3B1X2J5X3ZjcHVfaWQ7CiAg ICAgLyogdGhlIGV2dGNobiBwb3J0IGZvciBwb2xsaW5nIHRoZSBub3RpZmljYXRpb24sICovCiAg ICAgZXZ0Y2huX3BvcnRfdCAqaW9yZXFfbG9jYWxfcG9ydDsKLSAgICAvKiBldnRjaG4gbG9jYWwg cG9ydCBmb3IgYnVmZmVyZWQgaW8gKi8KKyAgICAvKiBldnRjaG4gcmVtb3RlIGFuZCBsb2NhbCBw b3J0cyBmb3IgYnVmZmVyZWQgaW8gKi8KKyAgICBldnRjaG5fcG9ydF90IGJ1ZmlvcmVxX3JlbW90 ZV9wb3J0OwogICAgIGV2dGNobl9wb3J0X3QgYnVmaW9yZXFfbG9jYWxfcG9ydDsKICAgICAvKiB0 aGUgZXZ0Y2huIGZkIGZvciBwb2xsaW5nICovCiAgICAgeGVuZXZ0Y2huX2hhbmRsZSAqeGNlX2hh bmRsZTsKQEAgLTEyMzYsMTIgKzEyMzcsNTIgQEAgc3RhdGljIHZvaWQgeGVuX3dha2V1cF9ub3Rp ZmllcihOb3RpZmllciAqbm90aWZpZXIsIHZvaWQgKmRhdGEpCiAgICAgeGNfc2V0X2h2bV9wYXJh bSh4ZW5feGMsIHhlbl9kb21pZCwgSFZNX1BBUkFNX0FDUElfU19TVEFURSwgMCk7CiB9CiAKLXZv aWQgeGVuX2h2bV9pbml0KFBDTWFjaGluZVN0YXRlICpwY21zLCBNZW1vcnlSZWdpb24gKipyYW1f bWVtb3J5KQorc3RhdGljIGludCB4ZW5fbWFwX2lvcmVxX3NlcnZlcihYZW5JT1N0YXRlICpzdGF0 ZSkKIHsKLSAgICBpbnQgaSwgcmM7CiAgICAgeGVuX3Bmbl90IGlvcmVxX3BmbjsKICAgICB4ZW5f cGZuX3QgYnVmaW9yZXFfcGZuOwogICAgIGV2dGNobl9wb3J0X3QgYnVmaW9yZXFfZXZ0Y2huOwor ICAgIGludCByYzsKKworICAgIHJjID0geGVuX2dldF9pb3JlcV9zZXJ2ZXJfaW5mbyh4ZW5fZG9t aWQsIHN0YXRlLT5pb3NlcnZpZCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg JmlvcmVxX3BmbiwgJmJ1ZmlvcmVxX3BmbiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgJmJ1ZmlvcmVxX2V2dGNobik7CisgICAgaWYgKHJjIDwgMCkgeworICAgICAgICBlcnJv cl9yZXBvcnQoImZhaWxlZCB0byBnZXQgaW9yZXEgc2VydmVyIGluZm86IGVycm9yICVkIGhhbmRs ZT0lcCIsCisgICAgICAgICAgICAgICAgICAgICBlcnJubywgeGVuX3hjKTsKKyAgICAgICAgcmV0 dXJuIHJjOworICAgIH0KKworICAgIERQUklOVEYoInNoYXJlZCBwYWdlIGF0IHBmbiAlbHhcbiIs IGlvcmVxX3Bmbik7CisgICAgRFBSSU5URigiYnVmZmVyZWQgaW8gcGFnZSBhdCBwZm4gJWx4XG4i LCBidWZpb3JlcV9wZm4pOworICAgIERQUklOVEYoImJ1ZmZlcmVkIGlvIGV2dGNobiBpcyAleFxu IiwgYnVmaW9yZXFfZXZ0Y2huKTsKKworICAgIHN0YXRlLT5zaGFyZWRfcGFnZSA9IHhlbmZvcmVp Z25tZW1vcnlfbWFwKHhlbl9mbWVtLCB4ZW5fZG9taWQsCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgUFJPVF9SRUFEIHwgUFJPVF9XUklURSwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAxLCAmaW9yZXFfcGZuLCBOVUxM KTsKKyAgICBpZiAoc3RhdGUtPnNoYXJlZF9wYWdlID09IE5VTEwpIHsKKyAgICAgICAgZXJyb3Jf cmVwb3J0KCJtYXAgc2hhcmVkIElPIHBhZ2UgcmV0dXJuZWQgZXJyb3IgJWQgaGFuZGxlPSVwIiwK KyAgICAgICAgICAgICAgICAgICAgIGVycm5vLCB4ZW5feGMpOworICAgICAgICByZXR1cm4gLTE7 CisgICAgfQorCisgICAgc3RhdGUtPmJ1ZmZlcmVkX2lvX3BhZ2UgPSB4ZW5mb3JlaWdubWVtb3J5 X21hcCh4ZW5fZm1lbSwgeGVuX2RvbWlkLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgUFJPVF9SRUFEIHwgUFJPVF9XUklURSwKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDEsICZidWZpb3JlcV9wZm4s IE5VTEwpOworICAgIGlmIChzdGF0ZS0+YnVmZmVyZWRfaW9fcGFnZSA9PSBOVUxMKSB7CisgICAg ICAgIGVycm9yX3JlcG9ydCgibWFwIGJ1ZmZlcmVkIElPIHBhZ2UgcmV0dXJuZWQgZXJyb3IgJWQi LCBlcnJubyk7CisgICAgICAgIHJldHVybiAtMTsKKyAgICB9CisKKyAgICBzdGF0ZS0+YnVmaW9y ZXFfcmVtb3RlX3BvcnQgPSBidWZpb3JlcV9ldnRjaG47CisKKyAgICByZXR1cm4gMDsKK30KKwor dm9pZCB4ZW5faHZtX2luaXQoUENNYWNoaW5lU3RhdGUgKnBjbXMsIE1lbW9yeVJlZ2lvbiAqKnJh bV9tZW1vcnkpCit7CisgICAgaW50IGksIHJjOworICAgIHhlbl9wZm5fdCBpb3JlcV9wZm47CiAg ICAgWGVuSU9TdGF0ZSAqc3RhdGU7CiAKICAgICBzdGF0ZSA9IGdfbWFsbG9jMChzaXplb2YgKFhl bklPU3RhdGUpKTsKQEAgLTEyNjksMjUgKzEzMTAsOCBAQCB2b2lkIHhlbl9odm1faW5pdChQQ01h Y2hpbmVTdGF0ZSAqcGNtcywgTWVtb3J5UmVnaW9uICoqcmFtX21lbW9yeSkKICAgICBzdGF0ZS0+ d2FrZXVwLm5vdGlmeSA9IHhlbl93YWtldXBfbm90aWZpZXI7CiAgICAgcWVtdV9yZWdpc3Rlcl93 YWtldXBfbm90aWZpZXIoJnN0YXRlLT53YWtldXApOwogCi0gICAgcmMgPSB4ZW5fZ2V0X2lvcmVx X3NlcnZlcl9pbmZvKHhlbl9kb21pZCwgc3RhdGUtPmlvc2VydmlkLAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAmaW9yZXFfcGZuLCAmYnVmaW9yZXFfcGZuLAotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAmYnVmaW9yZXFfZXZ0Y2huKTsKKyAgICByYyA9IHhl bl9tYXBfaW9yZXFfc2VydmVyKHN0YXRlKTsKICAgICBpZiAocmMgPCAwKSB7Ci0gICAgICAgIGVy cm9yX3JlcG9ydCgiZmFpbGVkIHRvIGdldCBpb3JlcSBzZXJ2ZXIgaW5mbzogZXJyb3IgJWQgaGFu ZGxlPSVwIiwKLSAgICAgICAgICAgICAgICAgICAgIGVycm5vLCB4ZW5feGMpOwotICAgICAgICBn b3RvIGVycjsKLSAgICB9Ci0KLSAgICBEUFJJTlRGKCJzaGFyZWQgcGFnZSBhdCBwZm4gJWx4XG4i LCBpb3JlcV9wZm4pOwotICAgIERQUklOVEYoImJ1ZmZlcmVkIGlvIHBhZ2UgYXQgcGZuICVseFxu IiwgYnVmaW9yZXFfcGZuKTsKLSAgICBEUFJJTlRGKCJidWZmZXJlZCBpbyBldnRjaG4gaXMgJXhc biIsIGJ1ZmlvcmVxX2V2dGNobik7Ci0KLSAgICBzdGF0ZS0+c2hhcmVkX3BhZ2UgPSB4ZW5mb3Jl aWdubWVtb3J5X21hcCh4ZW5fZm1lbSwgeGVuX2RvbWlkLAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIFBST1RfUkVBRHxQUk9UX1dSSVRFLAotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDEsICZpb3JlcV9wZm4sIE5VTEwp OwotICAgIGlmIChzdGF0ZS0+c2hhcmVkX3BhZ2UgPT0gTlVMTCkgewotICAgICAgICBlcnJvcl9y ZXBvcnQoIm1hcCBzaGFyZWQgSU8gcGFnZSByZXR1cm5lZCBlcnJvciAlZCBoYW5kbGU9JXAiLAot ICAgICAgICAgICAgICAgICAgICAgZXJybm8sIHhlbl94Yyk7CiAgICAgICAgIGdvdG8gZXJyOwog ICAgIH0KIApAQCAtMTMwOCwxNCArMTMzMiw2IEBAIHZvaWQgeGVuX2h2bV9pbml0KFBDTWFjaGlu ZVN0YXRlICpwY21zLCBNZW1vcnlSZWdpb24gKipyYW1fbWVtb3J5KQogICAgICAgICBnb3RvIGVy cjsKICAgICB9CiAKLSAgICBzdGF0ZS0+YnVmZmVyZWRfaW9fcGFnZSA9IHhlbmZvcmVpZ25tZW1v cnlfbWFwKHhlbl9mbWVtLCB4ZW5fZG9taWQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBQUk9UX1JFQUR8UFJPVF9XUklURSwKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDEsICZidWZpb3JlcV9wZm4s IE5VTEwpOwotICAgIGlmIChzdGF0ZS0+YnVmZmVyZWRfaW9fcGFnZSA9PSBOVUxMKSB7Ci0gICAg ICAgIGVycm9yX3JlcG9ydCgibWFwIGJ1ZmZlcmVkIElPIHBhZ2UgcmV0dXJuZWQgZXJyb3IgJWQi LCBlcnJubyk7Ci0gICAgICAgIGdvdG8gZXJyOwotICAgIH0KLQogICAgIC8qIE5vdGU6IGNwdXMg aXMgZW1wdHkgYXQgdGhpcyBwb2ludCBpbiBpbml0ICovCiAgICAgc3RhdGUtPmNwdV9ieV92Y3B1 X2lkID0gZ19tYWxsb2MwKG1heF9jcHVzICogc2l6ZW9mKENQVVN0YXRlICopKTsKIApAQCAtMTM0 MCw3ICsxMzU2LDcgQEAgdm9pZCB4ZW5faHZtX2luaXQoUENNYWNoaW5lU3RhdGUgKnBjbXMsIE1l bW9yeVJlZ2lvbiAqKnJhbV9tZW1vcnkpCiAgICAgfQogCiAgICAgcmMgPSB4ZW5ldnRjaG5fYmlu ZF9pbnRlcmRvbWFpbihzdGF0ZS0+eGNlX2hhbmRsZSwgeGVuX2RvbWlkLAotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgYnVmaW9yZXFfZXZ0Y2huKTsKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHN0YXRlLT5idWZpb3JlcV9yZW1vdGVfcG9ydCk7CiAgICAg aWYgKHJjID09IC0xKSB7CiAgICAgICAgIGVycm9yX3JlcG9ydCgiYnVmZmVyZWQgZXZ0Y2huIGJp bmQgZXJyb3IgJWQiLCBlcnJubyk7CiAgICAgICAgIGdvdG8gZXJyOwotLSAKMi4xMS4wCgoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1h aWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcKaHR0cHM6Ly9saXN0cy54 ZW5wcm9qZWN0Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL3hlbi1kZXZlbA==