From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:47677) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3PH6-00037x-5I for qemu-devel@nongnu.org; Mon, 11 Mar 2019 14:03:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3PH1-0002e5-5u for qemu-devel@nongnu.org; Mon, 11 Mar 2019 14:03:42 -0400 Received: from mail-qt1-x843.google.com ([2607:f8b0:4864:20::843]:42652) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3PGy-0002Oc-GN for qemu-devel@nongnu.org; Mon, 11 Mar 2019 14:03:37 -0400 Received: by mail-qt1-x843.google.com with SMTP id u7so6109064qtg.9 for ; Mon, 11 Mar 2019 11:03:22 -0700 (PDT) From: Jason Andryuk Date: Mon, 11 Mar 2019 14:02:13 -0400 Message-Id: <20190311180216.18811-4-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 3/6] xen: Skip backend initialization for stubdom 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 , Paolo Bonzini , Richard Henderson , Eduardo Habkost , "Michael S. Tsirkin" , Marcel Apfelbaum When QEMU is running in a stubdom, it does not provide any Paravirtualized backends. Those still run in dom0 or another driver domain. Therefore we skip backend initialization (xen_bus_init and xen_be_init) for the stubdom case. Original patch by Anthony PERARD Signed-off-by: Jason Andryuk --- hw/i386/xen/xen-hvm.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c index c20c4b27f6..4b62f070cb 100644 --- a/hw/i386/xen/xen-hvm.c +++ b/hw/i386/xen/xen-hvm.c @@ -1485,8 +1485,6 @@ void xen_hvm_init(PCMachineState *pcms, MemoryRegion **ram_memory) QLIST_INIT(&state->dev_list); device_listener_register(&state->device_listener); - xen_bus_init(); - xenstore = xs_open(0); if (!xenstore) { error_report("Can't connect to xenstored"); @@ -1495,12 +1493,16 @@ void xen_hvm_init(PCMachineState *pcms, MemoryRegion **ram_memory) qemu_set_fd_handler(xs_fileno(xenstore), xenstore_update, NULL, NULL); - /* Initialize backend core & drivers */ - if (xen_be_init() != 0) { - error_report("xen backend core setup failed"); - goto err; + if (!xen_stubdom_enabled()) { + xen_bus_init(); + + /* Initialize backend core & drivers */ + if (xen_be_init() != 0) { + error_report("xen backend core setup failed"); + goto err; + } + xen_be_register_common(); } - xen_be_register_common(); QLIST_INIT(&xen_physmap); xen_read_physmap(state); -- 2.20.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jason Andryuk Subject: [PATCH 3/6] xen: Skip backend initialization for stubdom Date: Mon, 11 Mar 2019 14:02:13 -0400 Message-ID: <20190311180216.18811-4-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 1h3PGl-0001EU-Ix for xen-devel@lists.xenproject.org; Mon, 11 Mar 2019 18:03:23 +0000 Received: by mail-qt1-x842.google.com with SMTP id f11so6126752qti.7 for ; Mon, 11 Mar 2019 11:03:22 -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 , Eduardo Habkost , Jason Andryuk , "Michael S. Tsirkin" , marmarek@invisiblethingslab.com, Paul Durrant , Marcel Apfelbaum , Paolo Bonzini , Anthony Perard , xen-devel@lists.xenproject.org, Richard Henderson List-Id: xen-devel@lists.xenproject.org V2hlbiBRRU1VIGlzIHJ1bm5pbmcgaW4gYSBzdHViZG9tLCBpdCBkb2VzIG5vdCBwcm92aWRlIGFu eQpQYXJhdmlydHVhbGl6ZWQgYmFja2VuZHMuICBUaG9zZSBzdGlsbCBydW4gaW4gZG9tMCBvciBh bm90aGVyIGRyaXZlcgpkb21haW4uICBUaGVyZWZvcmUgd2Ugc2tpcCBiYWNrZW5kIGluaXRpYWxp emF0aW9uICh4ZW5fYnVzX2luaXQgYW5kCnhlbl9iZV9pbml0KSBmb3IgdGhlIHN0dWJkb20gY2Fz ZS4KCk9yaWdpbmFsIHBhdGNoIGJ5IEFudGhvbnkgUEVSQVJEIDxhbnRob255LnBlcmFyZEBjaXRy aXguY29tPgoKU2lnbmVkLW9mZi1ieTogSmFzb24gQW5kcnl1ayA8amFuZHJ5dWtAZ21haWwuY29t PgotLS0KIGh3L2kzODYveGVuL3hlbi1odm0uYyB8IDE2ICsrKysrKysrKy0tLS0tLS0KIDEgZmls ZSBjaGFuZ2VkLCA5IGluc2VydGlvbnMoKyksIDcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv aHcvaTM4Ni94ZW4veGVuLWh2bS5jIGIvaHcvaTM4Ni94ZW4veGVuLWh2bS5jCmluZGV4IGMyMGM0 YjI3ZjYuLjRiNjJmMDcwY2IgMTAwNjQ0Ci0tLSBhL2h3L2kzODYveGVuL3hlbi1odm0uYworKysg Yi9ody9pMzg2L3hlbi94ZW4taHZtLmMKQEAgLTE0ODUsOCArMTQ4NSw2IEBAIHZvaWQgeGVuX2h2 bV9pbml0KFBDTWFjaGluZVN0YXRlICpwY21zLCBNZW1vcnlSZWdpb24gKipyYW1fbWVtb3J5KQog ICAgIFFMSVNUX0lOSVQoJnN0YXRlLT5kZXZfbGlzdCk7CiAgICAgZGV2aWNlX2xpc3RlbmVyX3Jl Z2lzdGVyKCZzdGF0ZS0+ZGV2aWNlX2xpc3RlbmVyKTsKIAotICAgIHhlbl9idXNfaW5pdCgpOwot CiAgICAgeGVuc3RvcmUgPSB4c19vcGVuKDApOwogICAgIGlmICgheGVuc3RvcmUpIHsKICAgICAg ICAgZXJyb3JfcmVwb3J0KCJDYW4ndCBjb25uZWN0IHRvIHhlbnN0b3JlZCIpOwpAQCAtMTQ5NSwx MiArMTQ5MywxNiBAQCB2b2lkIHhlbl9odm1faW5pdChQQ01hY2hpbmVTdGF0ZSAqcGNtcywgTWVt b3J5UmVnaW9uICoqcmFtX21lbW9yeSkKIAogICAgIHFlbXVfc2V0X2ZkX2hhbmRsZXIoeHNfZmls ZW5vKHhlbnN0b3JlKSwgeGVuc3RvcmVfdXBkYXRlLCBOVUxMLCBOVUxMKTsKIAotICAgIC8qIElu aXRpYWxpemUgYmFja2VuZCBjb3JlICYgZHJpdmVycyAqLwotICAgIGlmICh4ZW5fYmVfaW5pdCgp ICE9IDApIHsKLSAgICAgICAgZXJyb3JfcmVwb3J0KCJ4ZW4gYmFja2VuZCBjb3JlIHNldHVwIGZh aWxlZCIpOwotICAgICAgICBnb3RvIGVycjsKKyAgICBpZiAoIXhlbl9zdHViZG9tX2VuYWJsZWQo KSkgeworICAgICAgICB4ZW5fYnVzX2luaXQoKTsKKworICAgICAgICAvKiBJbml0aWFsaXplIGJh Y2tlbmQgY29yZSAmIGRyaXZlcnMgKi8KKyAgICAgICAgaWYgKHhlbl9iZV9pbml0KCkgIT0gMCkg eworICAgICAgICAgICAgZXJyb3JfcmVwb3J0KCJ4ZW4gYmFja2VuZCBjb3JlIHNldHVwIGZhaWxl ZCIpOworICAgICAgICAgICAgZ290byBlcnI7CisgICAgICAgIH0KKyAgICAgICAgeGVuX2JlX3Jl Z2lzdGVyX2NvbW1vbigpOwogICAgIH0KLSAgICB4ZW5fYmVfcmVnaXN0ZXJfY29tbW9uKCk7CiAK ICAgICBRTElTVF9JTklUKCZ4ZW5fcGh5c21hcCk7CiAgICAgeGVuX3JlYWRfcGh5c21hcChzdGF0 ZSk7Ci0tIAoyLjIwLjEKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0 Lm9yZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8veGVuLWRl dmVs