From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:47711) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3PHA-0003Ag-4Z for qemu-devel@nongnu.org; Mon, 11 Mar 2019 14:03:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3PH8-0002h7-6S for qemu-devel@nongnu.org; Mon, 11 Mar 2019 14:03:47 -0400 Received: from mail-qk1-x743.google.com ([2607:f8b0:4864:20::743]:35270) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3PH6-0002RB-3Z for qemu-devel@nongnu.org; Mon, 11 Mar 2019 14:03:46 -0400 Received: by mail-qk1-x743.google.com with SMTP id z13so3276184qki.2 for ; Mon, 11 Mar 2019 11:03:25 -0700 (PDT) From: Jason Andryuk Date: Mon, 11 Mar 2019 14:02:14 -0400 Message-Id: <20190311180216.18811-5-jandryuk@gmail.com> In-Reply-To: <20190311180216.18811-1-jandryuk@gmail.com> References: <20190311180216.18811-1-jandryuk@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH 4/6] xen: Set HVM_PARAM_DM_DOMAIN for stubdom on older Xen List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: xen-devel@lists.xenproject.org, marmarek@invisiblethingslab.com, Jason Andryuk , Stefano Stabellini , Anthony Perard , Paul Durrant When running in a stubdom, we have to inform the hypervisor that the stubdom and not dom0 is handling the device model. Explicitly created ioreq servers are fine, but a call to HVM_PARAM_DM_DOMAIN is needed for the default ioreq server. Xen 4.12 removes the default ioreq server. With that, Xen started returning an error when setting HVM_PARAM_DM_DOMAIN. Put the HVM_PARAM_DM_DOMAIN call in the version compatibility header. When we fallback to the default ioreq server, issue the call and don't bother to check the return value. Original patch by Anthony PERARD Signed-off-by: Jason Andryuk --- include/hw/xen/xen_common.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h index 9a8155e172..f59f841a43 100644 --- a/include/hw/xen/xen_common.h +++ b/include/hw/xen/xen_common.h @@ -616,6 +616,11 @@ static inline void xen_create_ioreq_server(domid_t dom, *ioservid = 0; use_default_ioreq_server = true; + + if (xen_stubdom_enabled()) { + xc_hvm_param_set(xen_xc, xen_domid, HVM_PARAM_DM_DOMAIN, DOMID_SELF); + } + trace_xen_default_ioreq_server(); } -- 2.20.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jason Andryuk Subject: [PATCH 4/6] xen: Set HVM_PARAM_DM_DOMAIN for stubdom on older Xen Date: Mon, 11 Mar 2019 14:02:14 -0400 Message-ID: <20190311180216.18811-5-jandryuk@gmail.com> References: <20190311180216.18811-1-jandryuk@gmail.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 1h3PGn-0001Fw-Ro for xen-devel@lists.xenproject.org; Mon, 11 Mar 2019 18:03:25 +0000 Received: by mail-qk1-x743.google.com with SMTP id b74so3222394qkg.9 for ; Mon, 11 Mar 2019 11:03:24 -0700 (PDT) In-Reply-To: <20190311180216.18811-1-jandryuk@gmail.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 Cc: Stefano Stabellini , Jason Andryuk , marmarek@invisiblethingslab.com, Paul Durrant , Anthony Perard , xen-devel@lists.xenproject.org List-Id: xen-devel@lists.xenproject.org V2hlbiBydW5uaW5nIGluIGEgc3R1YmRvbSwgd2UgaGF2ZSB0byBpbmZvcm0gdGhlIGh5cGVydmlz b3IgdGhhdCB0aGUKc3R1YmRvbSBhbmQgbm90IGRvbTAgaXMgaGFuZGxpbmcgdGhlIGRldmljZSBt b2RlbC4gIEV4cGxpY2l0bHkgY3JlYXRlZAppb3JlcSBzZXJ2ZXJzIGFyZSBmaW5lLCBidXQgYSBj YWxsIHRvIEhWTV9QQVJBTV9ETV9ET01BSU4gaXMgbmVlZGVkIGZvcgp0aGUgZGVmYXVsdCBpb3Jl cSBzZXJ2ZXIuCgpYZW4gNC4xMiByZW1vdmVzIHRoZSBkZWZhdWx0IGlvcmVxIHNlcnZlci4gIFdp dGggdGhhdCwgWGVuIHN0YXJ0ZWQKcmV0dXJuaW5nIGFuIGVycm9yIHdoZW4gc2V0dGluZyBIVk1f UEFSQU1fRE1fRE9NQUlOLiAgUHV0IHRoZQpIVk1fUEFSQU1fRE1fRE9NQUlOIGNhbGwgaW4gdGhl IHZlcnNpb24gY29tcGF0aWJpbGl0eSBoZWFkZXIuICBXaGVuIHdlCmZhbGxiYWNrIHRvIHRoZSBk ZWZhdWx0IGlvcmVxIHNlcnZlciwgaXNzdWUgdGhlIGNhbGwgYW5kIGRvbid0IGJvdGhlciB0bwpj aGVjayB0aGUgcmV0dXJuIHZhbHVlLgoKT3JpZ2luYWwgcGF0Y2ggYnkgQW50aG9ueSBQRVJBUkQg PGFudGhvbnkucGVyYXJkQGNpdHJpeC5jb20+CgpTaWduZWQtb2ZmLWJ5OiBKYXNvbiBBbmRyeXVr IDxqYW5kcnl1a0BnbWFpbC5jb20+Ci0tLQogaW5jbHVkZS9ody94ZW4veGVuX2NvbW1vbi5oIHwg NSArKysrKwogMSBmaWxlIGNoYW5nZWQsIDUgaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL2lu Y2x1ZGUvaHcveGVuL3hlbl9jb21tb24uaCBiL2luY2x1ZGUvaHcveGVuL3hlbl9jb21tb24uaApp bmRleCA5YTgxNTVlMTcyLi5mNTlmODQxYTQzIDEwMDY0NAotLS0gYS9pbmNsdWRlL2h3L3hlbi94 ZW5fY29tbW9uLmgKKysrIGIvaW5jbHVkZS9ody94ZW4veGVuX2NvbW1vbi5oCkBAIC02MTYsNiAr NjE2LDExIEBAIHN0YXRpYyBpbmxpbmUgdm9pZCB4ZW5fY3JlYXRlX2lvcmVxX3NlcnZlcihkb21p ZF90IGRvbSwKIAogICAgICppb3NlcnZpZCA9IDA7CiAgICAgdXNlX2RlZmF1bHRfaW9yZXFfc2Vy dmVyID0gdHJ1ZTsKKworICAgIGlmICh4ZW5fc3R1YmRvbV9lbmFibGVkKCkpIHsKKyAgICAgICAg eGNfaHZtX3BhcmFtX3NldCh4ZW5feGMsIHhlbl9kb21pZCwgSFZNX1BBUkFNX0RNX0RPTUFJTiwg RE9NSURfU0VMRik7CisgICAgfQorCiAgICAgdHJhY2VfeGVuX2RlZmF1bHRfaW9yZXFfc2VydmVy KCk7CiB9CiAKLS0gCjIuMjAuMQoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbnBy b2plY3Qub3JnCmh0dHBzOi8vbGlzdHMueGVucHJvamVjdC5vcmcvbWFpbG1hbi9saXN0aW5mby94 ZW4tZGV2ZWw=