From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Stabellini Subject: [PULL 05/15] xen-hvm: create separate function for ioreq server initialization Date: Mon, 21 May 2018 12:34:54 -0700 Message-ID: <1526931304-7289-5-git-send-email-sstabellini@kernel.org> References: Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from all-amaz-eas1.inumbo.com ([34.197.232.57]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1fKqaN-0000Sq-2r for xen-devel@lists.xenproject.org; Mon, 21 May 2018 19:35:11 +0000 In-Reply-To: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: peter.maydell@linaro.org, stefanha@gmail.com Cc: sstabellini@kernel.org, qemu-devel@nongnu.org, Paul Durrant , stefanha@redhat.com, anthony.perard@citrix.com, xen-devel@lists.xenproject.org List-Id: xen-devel@lists.xenproject.org RnJvbTogUGF1bCBEdXJyYW50IDxwYXVsLmR1cnJhbnRAY2l0cml4LmNvbT4KClRoZSBjb2RlIGlz IHN1ZmZpY2llbnRseSBzdWJzdGFudGlhbCB0aGF0IGl0IGltcHJvdmVzIGNvZGUgcmVhZGFiaWxp dHkKdG8gcHV0IGl0IGluIGEgbmV3IGZ1bmN0aW9uIGNhbGxlZCBieSB4ZW5faHZtX2luaXQoKSBy YXRoZXIgdGhhbiBoYXZpbmcKaXQgaW5saW5lLgoKU2lnbmVkLW9mZi1ieTogUGF1bCBEdXJyYW50 IDxwYXVsLmR1cnJhbnRAY2l0cml4LmNvbT4KUmV2aWV3ZWQtYnk6IEFudGhvbnkgUGVyYXJkIDxh bnRob255LnBlcmFyZEBjaXRyaXguY29tPgpTaWduZWQtb2ZmLWJ5OiBTdGVmYW5vIFN0YWJlbGxp bmkgPHNzdGFiZWxsaW5pQGtlcm5lbC5vcmc+Ci0tLQogaHcvaTM4Ni94ZW4veGVuLWh2bS5jIHwg NzYgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tCiAx IGZpbGUgY2hhbmdlZCwgNDYgaW5zZXJ0aW9ucygrKSwgMzAgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvaHcvaTM4Ni94ZW4veGVuLWh2bS5jIGIvaHcvaTM4Ni94ZW4veGVuLWh2bS5jCmluZGV4 IGNhYTU2M2IuLjZmZmEzYzIgMTAwNjQ0Ci0tLSBhL2h3L2kzODYveGVuL3hlbi1odm0uYworKysg Yi9ody9pMzg2L3hlbi94ZW4taHZtLmMKQEAgLTk1LDcgKzk1LDggQEAgdHlwZWRlZiBzdHJ1Y3Qg WGVuSU9TdGF0ZSB7CiAgICAgQ1BVU3RhdGUgKipjcHVfYnlfdmNwdV9pZDsKICAgICAvKiB0aGUg ZXZ0Y2huIHBvcnQgZm9yIHBvbGxpbmcgdGhlIG5vdGlmaWNhdGlvbiwgKi8KICAgICBldnRjaG5f cG9ydF90ICppb3JlcV9sb2NhbF9wb3J0OwotICAgIC8qIGV2dGNobiBsb2NhbCBwb3J0IGZvciBi dWZmZXJlZCBpbyAqLworICAgIC8qIGV2dGNobiByZW1vdGUgYW5kIGxvY2FsIHBvcnRzIGZvciBi dWZmZXJlZCBpbyAqLworICAgIGV2dGNobl9wb3J0X3QgYnVmaW9yZXFfcmVtb3RlX3BvcnQ7CiAg ICAgZXZ0Y2huX3BvcnRfdCBidWZpb3JlcV9sb2NhbF9wb3J0OwogICAgIC8qIHRoZSBldnRjaG4g ZmQgZm9yIHBvbGxpbmcgKi8KICAgICB4ZW5ldnRjaG5faGFuZGxlICp4Y2VfaGFuZGxlOwpAQCAt MTIzNiwxMiArMTIzNyw1MiBAQCBzdGF0aWMgdm9pZCB4ZW5fd2FrZXVwX25vdGlmaWVyKE5vdGlm aWVyICpub3RpZmllciwgdm9pZCAqZGF0YSkKICAgICB4Y19zZXRfaHZtX3BhcmFtKHhlbl94Yywg eGVuX2RvbWlkLCBIVk1fUEFSQU1fQUNQSV9TX1NUQVRFLCAwKTsKIH0KIAotdm9pZCB4ZW5faHZt X2luaXQoUENNYWNoaW5lU3RhdGUgKnBjbXMsIE1lbW9yeVJlZ2lvbiAqKnJhbV9tZW1vcnkpCitz dGF0aWMgaW50IHhlbl9tYXBfaW9yZXFfc2VydmVyKFhlbklPU3RhdGUgKnN0YXRlKQogewotICAg IGludCBpLCByYzsKICAgICB4ZW5fcGZuX3QgaW9yZXFfcGZuOwogICAgIHhlbl9wZm5fdCBidWZp b3JlcV9wZm47CiAgICAgZXZ0Y2huX3BvcnRfdCBidWZpb3JlcV9ldnRjaG47CisgICAgaW50IHJj OworCisgICAgcmMgPSB4ZW5fZ2V0X2lvcmVxX3NlcnZlcl9pbmZvKHhlbl9kb21pZCwgc3RhdGUt Pmlvc2VydmlkLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAmaW9yZXFfcGZu LCAmYnVmaW9yZXFfcGZuLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAmYnVm aW9yZXFfZXZ0Y2huKTsKKyAgICBpZiAocmMgPCAwKSB7CisgICAgICAgIGVycm9yX3JlcG9ydCgi ZmFpbGVkIHRvIGdldCBpb3JlcSBzZXJ2ZXIgaW5mbzogZXJyb3IgJWQgaGFuZGxlPSVwIiwKKyAg ICAgICAgICAgICAgICAgICAgIGVycm5vLCB4ZW5feGMpOworICAgICAgICByZXR1cm4gcmM7Cisg ICAgfQorCisgICAgRFBSSU5URigic2hhcmVkIHBhZ2UgYXQgcGZuICVseFxuIiwgaW9yZXFfcGZu KTsKKyAgICBEUFJJTlRGKCJidWZmZXJlZCBpbyBwYWdlIGF0IHBmbiAlbHhcbiIsIGJ1ZmlvcmVx X3Bmbik7CisgICAgRFBSSU5URigiYnVmZmVyZWQgaW8gZXZ0Y2huIGlzICV4XG4iLCBidWZpb3Jl cV9ldnRjaG4pOworCisgICAgc3RhdGUtPnNoYXJlZF9wYWdlID0geGVuZm9yZWlnbm1lbW9yeV9t YXAoeGVuX2ZtZW0sIHhlbl9kb21pZCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBQUk9UX1JFQUQgfCBQUk9UX1dSSVRFLAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIDEsICZpb3JlcV9wZm4sIE5VTEwpOworICAgIGlm IChzdGF0ZS0+c2hhcmVkX3BhZ2UgPT0gTlVMTCkgeworICAgICAgICBlcnJvcl9yZXBvcnQoIm1h cCBzaGFyZWQgSU8gcGFnZSByZXR1cm5lZCBlcnJvciAlZCBoYW5kbGU9JXAiLAorICAgICAgICAg ICAgICAgICAgICAgZXJybm8sIHhlbl94Yyk7CisgICAgICAgIHJldHVybiAtMTsKKyAgICB9CisK KyAgICBzdGF0ZS0+YnVmZmVyZWRfaW9fcGFnZSA9IHhlbmZvcmVpZ25tZW1vcnlfbWFwKHhlbl9m bWVtLCB4ZW5fZG9taWQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBQUk9UX1JFQUQgfCBQUk9UX1dSSVRFLAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgMSwgJmJ1ZmlvcmVxX3BmbiwgTlVMTCk7Cisg ICAgaWYgKHN0YXRlLT5idWZmZXJlZF9pb19wYWdlID09IE5VTEwpIHsKKyAgICAgICAgZXJyb3Jf cmVwb3J0KCJtYXAgYnVmZmVyZWQgSU8gcGFnZSByZXR1cm5lZCBlcnJvciAlZCIsIGVycm5vKTsK KyAgICAgICAgcmV0dXJuIC0xOworICAgIH0KKworICAgIHN0YXRlLT5idWZpb3JlcV9yZW1vdGVf cG9ydCA9IGJ1ZmlvcmVxX2V2dGNobjsKKworICAgIHJldHVybiAwOworfQorCit2b2lkIHhlbl9o dm1faW5pdChQQ01hY2hpbmVTdGF0ZSAqcGNtcywgTWVtb3J5UmVnaW9uICoqcmFtX21lbW9yeSkK K3sKKyAgICBpbnQgaSwgcmM7CisgICAgeGVuX3Bmbl90IGlvcmVxX3BmbjsKICAgICBYZW5JT1N0 YXRlICpzdGF0ZTsKIAogICAgIHN0YXRlID0gZ19tYWxsb2MwKHNpemVvZiAoWGVuSU9TdGF0ZSkp OwpAQCAtMTI2OSwyNSArMTMxMCw4IEBAIHZvaWQgeGVuX2h2bV9pbml0KFBDTWFjaGluZVN0YXRl ICpwY21zLCBNZW1vcnlSZWdpb24gKipyYW1fbWVtb3J5KQogICAgIHN0YXRlLT53YWtldXAubm90 aWZ5ID0geGVuX3dha2V1cF9ub3RpZmllcjsKICAgICBxZW11X3JlZ2lzdGVyX3dha2V1cF9ub3Rp Zmllcigmc3RhdGUtPndha2V1cCk7CiAKLSAgICByYyA9IHhlbl9nZXRfaW9yZXFfc2VydmVyX2lu Zm8oeGVuX2RvbWlkLCBzdGF0ZS0+aW9zZXJ2aWQsCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICZpb3JlcV9wZm4sICZidWZpb3JlcV9wZm4sCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICZidWZpb3JlcV9ldnRjaG4pOworICAgIHJjID0geGVuX21hcF9pb3Jl cV9zZXJ2ZXIoc3RhdGUpOwogICAgIGlmIChyYyA8IDApIHsKLSAgICAgICAgZXJyb3JfcmVwb3J0 KCJmYWlsZWQgdG8gZ2V0IGlvcmVxIHNlcnZlciBpbmZvOiBlcnJvciAlZCBoYW5kbGU9JXAiLAot ICAgICAgICAgICAgICAgICAgICAgZXJybm8sIHhlbl94Yyk7Ci0gICAgICAgIGdvdG8gZXJyOwot ICAgIH0KLQotICAgIERQUklOVEYoInNoYXJlZCBwYWdlIGF0IHBmbiAlbHhcbiIsIGlvcmVxX3Bm bik7Ci0gICAgRFBSSU5URigiYnVmZmVyZWQgaW8gcGFnZSBhdCBwZm4gJWx4XG4iLCBidWZpb3Jl cV9wZm4pOwotICAgIERQUklOVEYoImJ1ZmZlcmVkIGlvIGV2dGNobiBpcyAleFxuIiwgYnVmaW9y ZXFfZXZ0Y2huKTsKLQotICAgIHN0YXRlLT5zaGFyZWRfcGFnZSA9IHhlbmZvcmVpZ25tZW1vcnlf bWFwKHhlbl9mbWVtLCB4ZW5fZG9taWQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgUFJPVF9SRUFEfFBST1RfV1JJVEUsCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgMSwgJmlvcmVxX3BmbiwgTlVMTCk7Ci0gICAgaWYg KHN0YXRlLT5zaGFyZWRfcGFnZSA9PSBOVUxMKSB7Ci0gICAgICAgIGVycm9yX3JlcG9ydCgibWFw IHNoYXJlZCBJTyBwYWdlIHJldHVybmVkIGVycm9yICVkIGhhbmRsZT0lcCIsCi0gICAgICAgICAg ICAgICAgICAgICBlcnJubywgeGVuX3hjKTsKICAgICAgICAgZ290byBlcnI7CiAgICAgfQogCkBA IC0xMzA4LDE0ICsxMzMyLDYgQEAgdm9pZCB4ZW5faHZtX2luaXQoUENNYWNoaW5lU3RhdGUgKnBj bXMsIE1lbW9yeVJlZ2lvbiAqKnJhbV9tZW1vcnkpCiAgICAgICAgIGdvdG8gZXJyOwogICAgIH0K IAotICAgIHN0YXRlLT5idWZmZXJlZF9pb19wYWdlID0geGVuZm9yZWlnbm1lbW9yeV9tYXAoeGVu X2ZtZW0sIHhlbl9kb21pZCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIFBST1RfUkVBRHxQUk9UX1dSSVRFLAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgMSwgJmJ1ZmlvcmVxX3BmbiwgTlVMTCk7Ci0g ICAgaWYgKHN0YXRlLT5idWZmZXJlZF9pb19wYWdlID09IE5VTEwpIHsKLSAgICAgICAgZXJyb3Jf cmVwb3J0KCJtYXAgYnVmZmVyZWQgSU8gcGFnZSByZXR1cm5lZCBlcnJvciAlZCIsIGVycm5vKTsK LSAgICAgICAgZ290byBlcnI7Ci0gICAgfQotCiAgICAgLyogTm90ZTogY3B1cyBpcyBlbXB0eSBh dCB0aGlzIHBvaW50IGluIGluaXQgKi8KICAgICBzdGF0ZS0+Y3B1X2J5X3ZjcHVfaWQgPSBnX21h bGxvYzAobWF4X2NwdXMgKiBzaXplb2YoQ1BVU3RhdGUgKikpOwogCkBAIC0xMzQwLDcgKzEzNTYs NyBAQCB2b2lkIHhlbl9odm1faW5pdChQQ01hY2hpbmVTdGF0ZSAqcGNtcywgTWVtb3J5UmVnaW9u ICoqcmFtX21lbW9yeSkKICAgICB9CiAKICAgICByYyA9IHhlbmV2dGNobl9iaW5kX2ludGVyZG9t YWluKHN0YXRlLT54Y2VfaGFuZGxlLCB4ZW5fZG9taWQsCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBidWZpb3JlcV9ldnRjaG4pOworICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgc3RhdGUtPmJ1ZmlvcmVxX3JlbW90ZV9wb3J0KTsKICAgICBpZiAocmMgPT0g LTEpIHsKICAgICAgICAgZXJyb3JfcmVwb3J0KCJidWZmZXJlZCBldnRjaG4gYmluZCBlcnJvciAl ZCIsIGVycm5vKTsKICAgICAgICAgZ290byBlcnI7Ci0tIAoxLjkuMQoKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QK WGVuLWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnCmh0dHBzOi8vbGlzdHMueGVucHJvamVjdC5v cmcvbWFpbG1hbi9saXN0aW5mby94ZW4tZGV2ZWw=