From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Durrant Subject: [PATCH 1/2] xen-hvm: create separate function for ioreq server initialization Date: Wed, 9 May 2018 16:46:03 +0100 Message-ID: <20180509154604.25530-2-paul.durrant@citrix.com> References: <20180509154604.25530-1-paul.durrant@citrix.com> 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 1fGRIA-00063N-Vo for xen-devel@lists.xenproject.org; Wed, 09 May 2018 15:46:11 +0000 In-Reply-To: <20180509154604.25530-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: Anthony Perard , Paul Durrant , Stefano Stabellini List-Id: xen-devel@lists.xenproject.org VGhlIGNvZGUgaXMgc3VmZmljaWVudGx5IHN1YnN0YW50aWFsIHRoYXQgaXQgaW1wcm92ZXMgY29k ZSByZWFkYWJpbGl0eQp0byBwdXQgaXQgaW4gYSBuZXcgZnVuY3Rpb24gY2FsbGVkIGJ5IHhlbl9o dm1faW5pdCgpIHJhdGhlciB0aGFuIGhhdmluZwppdCBpbmxpbmUuCgpTaWduZWQtb2ZmLWJ5OiBQ YXVsIER1cnJhbnQgPHBhdWwuZHVycmFudEBjaXRyaXguY29tPgotLS0KQ2M6IFN0ZWZhbm8gU3Rh YmVsbGluaSA8c3N0YWJlbGxpbmlAa2VybmVsLm9yZz4KQ2M6IEFudGhvbnkgUGVyYXJkIDxhbnRo b255LnBlcmFyZEBjaXRyaXguY29tPgotLS0KIGh3L2kzODYveGVuL3hlbi1odm0uYyB8IDc2ICsr KysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxl IGNoYW5nZWQsIDQ2IGluc2VydGlvbnMoKyksIDMwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L2h3L2kzODYveGVuL3hlbi1odm0uYyBiL2h3L2kzODYveGVuL3hlbi1odm0uYwppbmRleCBjYWE1 NjNiZTNkLi42ZmZhM2MyMmNjIDEwMDY0NAotLS0gYS9ody9pMzg2L3hlbi94ZW4taHZtLmMKKysr IGIvaHcvaTM4Ni94ZW4veGVuLWh2bS5jCkBAIC05NSw3ICs5NSw4IEBAIHR5cGVkZWYgc3RydWN0 IFhlbklPU3RhdGUgewogICAgIENQVVN0YXRlICoqY3B1X2J5X3ZjcHVfaWQ7CiAgICAgLyogdGhl IGV2dGNobiBwb3J0IGZvciBwb2xsaW5nIHRoZSBub3RpZmljYXRpb24sICovCiAgICAgZXZ0Y2hu X3BvcnRfdCAqaW9yZXFfbG9jYWxfcG9ydDsKLSAgICAvKiBldnRjaG4gbG9jYWwgcG9ydCBmb3Ig YnVmZmVyZWQgaW8gKi8KKyAgICAvKiBldnRjaG4gcmVtb3RlIGFuZCBsb2NhbCBwb3J0cyBmb3Ig YnVmZmVyZWQgaW8gKi8KKyAgICBldnRjaG5fcG9ydF90IGJ1ZmlvcmVxX3JlbW90ZV9wb3J0Owog ICAgIGV2dGNobl9wb3J0X3QgYnVmaW9yZXFfbG9jYWxfcG9ydDsKICAgICAvKiB0aGUgZXZ0Y2hu IGZkIGZvciBwb2xsaW5nICovCiAgICAgeGVuZXZ0Y2huX2hhbmRsZSAqeGNlX2hhbmRsZTsKQEAg LTEyMzYsMTIgKzEyMzcsNTIgQEAgc3RhdGljIHZvaWQgeGVuX3dha2V1cF9ub3RpZmllcihOb3Rp ZmllciAqbm90aWZpZXIsIHZvaWQgKmRhdGEpCiAgICAgeGNfc2V0X2h2bV9wYXJhbSh4ZW5feGMs IHhlbl9kb21pZCwgSFZNX1BBUkFNX0FDUElfU19TVEFURSwgMCk7CiB9CiAKLXZvaWQgeGVuX2h2 bV9pbml0KFBDTWFjaGluZVN0YXRlICpwY21zLCBNZW1vcnlSZWdpb24gKipyYW1fbWVtb3J5KQor c3RhdGljIGludCB4ZW5fbWFwX2lvcmVxX3NlcnZlcihYZW5JT1N0YXRlICpzdGF0ZSkKIHsKLSAg ICBpbnQgaSwgcmM7CiAgICAgeGVuX3Bmbl90IGlvcmVxX3BmbjsKICAgICB4ZW5fcGZuX3QgYnVm aW9yZXFfcGZuOwogICAgIGV2dGNobl9wb3J0X3QgYnVmaW9yZXFfZXZ0Y2huOworICAgIGludCBy YzsKKworICAgIHJjID0geGVuX2dldF9pb3JlcV9zZXJ2ZXJfaW5mbyh4ZW5fZG9taWQsIHN0YXRl LT5pb3NlcnZpZCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJmlvcmVxX3Bm biwgJmJ1ZmlvcmVxX3BmbiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJmJ1 ZmlvcmVxX2V2dGNobik7CisgICAgaWYgKHJjIDwgMCkgeworICAgICAgICBlcnJvcl9yZXBvcnQo ImZhaWxlZCB0byBnZXQgaW9yZXEgc2VydmVyIGluZm86IGVycm9yICVkIGhhbmRsZT0lcCIsCisg ICAgICAgICAgICAgICAgICAgICBlcnJubywgeGVuX3hjKTsKKyAgICAgICAgcmV0dXJuIHJjOwor ICAgIH0KKworICAgIERQUklOVEYoInNoYXJlZCBwYWdlIGF0IHBmbiAlbHhcbiIsIGlvcmVxX3Bm bik7CisgICAgRFBSSU5URigiYnVmZmVyZWQgaW8gcGFnZSBhdCBwZm4gJWx4XG4iLCBidWZpb3Jl cV9wZm4pOworICAgIERQUklOVEYoImJ1ZmZlcmVkIGlvIGV2dGNobiBpcyAleFxuIiwgYnVmaW9y ZXFfZXZ0Y2huKTsKKworICAgIHN0YXRlLT5zaGFyZWRfcGFnZSA9IHhlbmZvcmVpZ25tZW1vcnlf bWFwKHhlbl9mbWVtLCB4ZW5fZG9taWQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgUFJPVF9SRUFEIHwgUFJPVF9XUklURSwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAxLCAmaW9yZXFfcGZuLCBOVUxMKTsKKyAgICBp ZiAoc3RhdGUtPnNoYXJlZF9wYWdlID09IE5VTEwpIHsKKyAgICAgICAgZXJyb3JfcmVwb3J0KCJt YXAgc2hhcmVkIElPIHBhZ2UgcmV0dXJuZWQgZXJyb3IgJWQgaGFuZGxlPSVwIiwKKyAgICAgICAg ICAgICAgICAgICAgIGVycm5vLCB4ZW5feGMpOworICAgICAgICByZXR1cm4gLTE7CisgICAgfQor CisgICAgc3RhdGUtPmJ1ZmZlcmVkX2lvX3BhZ2UgPSB4ZW5mb3JlaWdubWVtb3J5X21hcCh4ZW5f Zm1lbSwgeGVuX2RvbWlkLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgUFJPVF9SRUFEIHwgUFJPVF9XUklURSwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDEsICZidWZpb3JlcV9wZm4sIE5VTEwpOwor ICAgIGlmIChzdGF0ZS0+YnVmZmVyZWRfaW9fcGFnZSA9PSBOVUxMKSB7CisgICAgICAgIGVycm9y X3JlcG9ydCgibWFwIGJ1ZmZlcmVkIElPIHBhZ2UgcmV0dXJuZWQgZXJyb3IgJWQiLCBlcnJubyk7 CisgICAgICAgIHJldHVybiAtMTsKKyAgICB9CisKKyAgICBzdGF0ZS0+YnVmaW9yZXFfcmVtb3Rl X3BvcnQgPSBidWZpb3JlcV9ldnRjaG47CisKKyAgICByZXR1cm4gMDsKK30KKwordm9pZCB4ZW5f aHZtX2luaXQoUENNYWNoaW5lU3RhdGUgKnBjbXMsIE1lbW9yeVJlZ2lvbiAqKnJhbV9tZW1vcnkp Cit7CisgICAgaW50IGksIHJjOworICAgIHhlbl9wZm5fdCBpb3JlcV9wZm47CiAgICAgWGVuSU9T dGF0ZSAqc3RhdGU7CiAKICAgICBzdGF0ZSA9IGdfbWFsbG9jMChzaXplb2YgKFhlbklPU3RhdGUp KTsKQEAgLTEyNjksMjUgKzEzMTAsOCBAQCB2b2lkIHhlbl9odm1faW5pdChQQ01hY2hpbmVTdGF0 ZSAqcGNtcywgTWVtb3J5UmVnaW9uICoqcmFtX21lbW9yeSkKICAgICBzdGF0ZS0+d2FrZXVwLm5v dGlmeSA9IHhlbl93YWtldXBfbm90aWZpZXI7CiAgICAgcWVtdV9yZWdpc3Rlcl93YWtldXBfbm90 aWZpZXIoJnN0YXRlLT53YWtldXApOwogCi0gICAgcmMgPSB4ZW5fZ2V0X2lvcmVxX3NlcnZlcl9p bmZvKHhlbl9kb21pZCwgc3RhdGUtPmlvc2VydmlkLAotICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAmaW9yZXFfcGZuLCAmYnVmaW9yZXFfcGZuLAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAmYnVmaW9yZXFfZXZ0Y2huKTsKKyAgICByYyA9IHhlbl9tYXBfaW9y ZXFfc2VydmVyKHN0YXRlKTsKICAgICBpZiAocmMgPCAwKSB7Ci0gICAgICAgIGVycm9yX3JlcG9y dCgiZmFpbGVkIHRvIGdldCBpb3JlcSBzZXJ2ZXIgaW5mbzogZXJyb3IgJWQgaGFuZGxlPSVwIiwK LSAgICAgICAgICAgICAgICAgICAgIGVycm5vLCB4ZW5feGMpOwotICAgICAgICBnb3RvIGVycjsK LSAgICB9Ci0KLSAgICBEUFJJTlRGKCJzaGFyZWQgcGFnZSBhdCBwZm4gJWx4XG4iLCBpb3JlcV9w Zm4pOwotICAgIERQUklOVEYoImJ1ZmZlcmVkIGlvIHBhZ2UgYXQgcGZuICVseFxuIiwgYnVmaW9y ZXFfcGZuKTsKLSAgICBEUFJJTlRGKCJidWZmZXJlZCBpbyBldnRjaG4gaXMgJXhcbiIsIGJ1Zmlv cmVxX2V2dGNobik7Ci0KLSAgICBzdGF0ZS0+c2hhcmVkX3BhZ2UgPSB4ZW5mb3JlaWdubWVtb3J5 X21hcCh4ZW5fZm1lbSwgeGVuX2RvbWlkLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIFBST1RfUkVBRHxQUk9UX1dSSVRFLAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIDEsICZpb3JlcV9wZm4sIE5VTEwpOwotICAgIGlm IChzdGF0ZS0+c2hhcmVkX3BhZ2UgPT0gTlVMTCkgewotICAgICAgICBlcnJvcl9yZXBvcnQoIm1h cCBzaGFyZWQgSU8gcGFnZSByZXR1cm5lZCBlcnJvciAlZCBoYW5kbGU9JXAiLAotICAgICAgICAg ICAgICAgICAgICAgZXJybm8sIHhlbl94Yyk7CiAgICAgICAgIGdvdG8gZXJyOwogICAgIH0KIApA QCAtMTMwOCwxNCArMTMzMiw2IEBAIHZvaWQgeGVuX2h2bV9pbml0KFBDTWFjaGluZVN0YXRlICpw Y21zLCBNZW1vcnlSZWdpb24gKipyYW1fbWVtb3J5KQogICAgICAgICBnb3RvIGVycjsKICAgICB9 CiAKLSAgICBzdGF0ZS0+YnVmZmVyZWRfaW9fcGFnZSA9IHhlbmZvcmVpZ25tZW1vcnlfbWFwKHhl bl9mbWVtLCB4ZW5fZG9taWQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBQUk9UX1JFQUR8UFJPVF9XUklURSwKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDEsICZidWZpb3JlcV9wZm4sIE5VTEwpOwot ICAgIGlmIChzdGF0ZS0+YnVmZmVyZWRfaW9fcGFnZSA9PSBOVUxMKSB7Ci0gICAgICAgIGVycm9y X3JlcG9ydCgibWFwIGJ1ZmZlcmVkIElPIHBhZ2UgcmV0dXJuZWQgZXJyb3IgJWQiLCBlcnJubyk7 Ci0gICAgICAgIGdvdG8gZXJyOwotICAgIH0KLQogICAgIC8qIE5vdGU6IGNwdXMgaXMgZW1wdHkg YXQgdGhpcyBwb2ludCBpbiBpbml0ICovCiAgICAgc3RhdGUtPmNwdV9ieV92Y3B1X2lkID0gZ19t YWxsb2MwKG1heF9jcHVzICogc2l6ZW9mKENQVVN0YXRlICopKTsKIApAQCAtMTM0MCw3ICsxMzU2 LDcgQEAgdm9pZCB4ZW5faHZtX2luaXQoUENNYWNoaW5lU3RhdGUgKnBjbXMsIE1lbW9yeVJlZ2lv biAqKnJhbV9tZW1vcnkpCiAgICAgfQogCiAgICAgcmMgPSB4ZW5ldnRjaG5fYmluZF9pbnRlcmRv bWFpbihzdGF0ZS0+eGNlX2hhbmRsZSwgeGVuX2RvbWlkLAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgYnVmaW9yZXFfZXZ0Y2huKTsKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHN0YXRlLT5idWZpb3JlcV9yZW1vdGVfcG9ydCk7CiAgICAgaWYgKHJjID09 IC0xKSB7CiAgICAgICAgIGVycm9yX3JlcG9ydCgiYnVmZmVyZWQgZXZ0Y2huIGJpbmQgZXJyb3Ig JWQiLCBlcnJubyk7CiAgICAgICAgIGdvdG8gZXJyOwotLSAKMi4xMS4wCgoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlz dApYZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9qZWN0 Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL3hlbi1kZXZlbA==