From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:47710) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3PHA-0003Af-40 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-0002gd-12 for qemu-devel@nongnu.org; Mon, 11 Mar 2019 14:03:47 -0400 Received: from mail-qt1-x842.google.com ([2607:f8b0:4864:20::842]:42651) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3PH2-0002KB-PH for qemu-devel@nongnu.org; Mon, 11 Mar 2019 14:03:42 -0400 Received: by mail-qt1-x842.google.com with SMTP id u7so6108842qtg.9 for ; Mon, 11 Mar 2019 11:03:18 -0700 (PDT) From: Jason Andryuk Date: Mon, 11 Mar 2019 14:02:12 -0400 Message-Id: <20190311180216.18811-3-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 2/6] xen: Move xenstore initialization to common location 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 For the xen stubdom case, we'll want xenstore initialized, but we'll want to skip the rest of xen_be_init. Move the initialization to xen_hvm_init so we can conditionalize calling xen_be_init. xs_domain_open() is deprecated for xs_open(0), so make the replacement as well. Signed-off-by: Jason Andryuk --- hw/i386/xen/xen-hvm.c | 8 ++++++++ hw/xen/xen-legacy-backend.c | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c index 2939122e7c..c20c4b27f6 100644 --- a/hw/i386/xen/xen-hvm.c +++ b/hw/i386/xen/xen-hvm.c @@ -1487,6 +1487,14 @@ void xen_hvm_init(PCMachineState *pcms, MemoryRegion **ram_memory) xen_bus_init(); + xenstore = xs_open(0); + if (!xenstore) { + error_report("Can't connect to xenstored"); + goto err; + } + + 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"); diff --git a/hw/xen/xen-legacy-backend.c b/hw/xen/xen-legacy-backend.c index 36fd1e9b09..bdf2fa917f 100644 --- a/hw/xen/xen-legacy-backend.c +++ b/hw/xen/xen-legacy-backend.c @@ -683,14 +683,6 @@ int xen_be_init(void) { xengnttab_handle *gnttabdev; - xenstore = xs_daemon_open(); - if (!xenstore) { - xen_pv_printf(NULL, 0, "can't connect to xenstored\n"); - return -1; - } - - qemu_set_fd_handler(xs_fileno(xenstore), xenstore_update, NULL, NULL); - if (xen_xc == NULL || xen_fmem == NULL) { /* Check if xen_init() have been called */ goto err; -- 2.20.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jason Andryuk Subject: [PATCH 2/6] xen: Move xenstore initialization to common location Date: Mon, 11 Mar 2019 14:02:12 -0400 Message-ID: <20190311180216.18811-3-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 1h3PGh-0001Ce-7y for xen-devel@lists.xenproject.org; Mon, 11 Mar 2019 18:03:19 +0000 Received: by mail-qt1-x844.google.com with SMTP id s1so6129327qte.5 for ; Mon, 11 Mar 2019 11:03:18 -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 Rm9yIHRoZSB4ZW4gc3R1YmRvbSBjYXNlLCB3ZSdsbCB3YW50IHhlbnN0b3JlIGluaXRpYWxpemVk LCBidXQgd2UnbGwKd2FudCB0byBza2lwIHRoZSByZXN0IG9mIHhlbl9iZV9pbml0LiAgTW92ZSB0 aGUgaW5pdGlhbGl6YXRpb24gdG8KeGVuX2h2bV9pbml0IHNvIHdlIGNhbiBjb25kaXRpb25hbGl6 ZSBjYWxsaW5nIHhlbl9iZV9pbml0LgoKeHNfZG9tYWluX29wZW4oKSBpcyBkZXByZWNhdGVkIGZv ciB4c19vcGVuKDApLCBzbyBtYWtlIHRoZSByZXBsYWNlbWVudAphcyB3ZWxsLgoKU2lnbmVkLW9m Zi1ieTogSmFzb24gQW5kcnl1ayA8amFuZHJ5dWtAZ21haWwuY29tPgotLS0KIGh3L2kzODYveGVu L3hlbi1odm0uYyAgICAgICB8IDggKysrKysrKysKIGh3L3hlbi94ZW4tbGVnYWN5LWJhY2tlbmQu YyB8IDggLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgOCBpbnNlcnRpb25zKCspLCA4IGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2h3L2kzODYveGVuL3hlbi1odm0uYyBiL2h3L2kzODYveGVu L3hlbi1odm0uYwppbmRleCAyOTM5MTIyZTdjLi5jMjBjNGIyN2Y2IDEwMDY0NAotLS0gYS9ody9p Mzg2L3hlbi94ZW4taHZtLmMKKysrIGIvaHcvaTM4Ni94ZW4veGVuLWh2bS5jCkBAIC0xNDg3LDYg KzE0ODcsMTQgQEAgdm9pZCB4ZW5faHZtX2luaXQoUENNYWNoaW5lU3RhdGUgKnBjbXMsIE1lbW9y eVJlZ2lvbiAqKnJhbV9tZW1vcnkpCiAKICAgICB4ZW5fYnVzX2luaXQoKTsKIAorICAgIHhlbnN0 b3JlID0geHNfb3BlbigwKTsKKyAgICBpZiAoIXhlbnN0b3JlKSB7CisgICAgICAgIGVycm9yX3Jl cG9ydCgiQ2FuJ3QgY29ubmVjdCB0byB4ZW5zdG9yZWQiKTsKKyAgICAgICAgZ290byBlcnI7Cisg ICAgfQorCisgICAgcWVtdV9zZXRfZmRfaGFuZGxlcih4c19maWxlbm8oeGVuc3RvcmUpLCB4ZW5z dG9yZV91cGRhdGUsIE5VTEwsIE5VTEwpOworCiAgICAgLyogSW5pdGlhbGl6ZSBiYWNrZW5kIGNv cmUgJiBkcml2ZXJzICovCiAgICAgaWYgKHhlbl9iZV9pbml0KCkgIT0gMCkgewogICAgICAgICBl cnJvcl9yZXBvcnQoInhlbiBiYWNrZW5kIGNvcmUgc2V0dXAgZmFpbGVkIik7CmRpZmYgLS1naXQg YS9ody94ZW4veGVuLWxlZ2FjeS1iYWNrZW5kLmMgYi9ody94ZW4veGVuLWxlZ2FjeS1iYWNrZW5k LmMKaW5kZXggMzZmZDFlOWIwOS4uYmRmMmZhOTE3ZiAxMDA2NDQKLS0tIGEvaHcveGVuL3hlbi1s ZWdhY3ktYmFja2VuZC5jCisrKyBiL2h3L3hlbi94ZW4tbGVnYWN5LWJhY2tlbmQuYwpAQCAtNjgz LDE0ICs2ODMsNiBAQCBpbnQgeGVuX2JlX2luaXQodm9pZCkKIHsKICAgICB4ZW5nbnR0YWJfaGFu ZGxlICpnbnR0YWJkZXY7CiAKLSAgICB4ZW5zdG9yZSA9IHhzX2RhZW1vbl9vcGVuKCk7Ci0gICAg aWYgKCF4ZW5zdG9yZSkgewotICAgICAgICB4ZW5fcHZfcHJpbnRmKE5VTEwsIDAsICJjYW4ndCBj b25uZWN0IHRvIHhlbnN0b3JlZFxuIik7Ci0gICAgICAgIHJldHVybiAtMTsKLSAgICB9Ci0KLSAg ICBxZW11X3NldF9mZF9oYW5kbGVyKHhzX2ZpbGVubyh4ZW5zdG9yZSksIHhlbnN0b3JlX3VwZGF0 ZSwgTlVMTCwgTlVMTCk7Ci0KICAgICBpZiAoeGVuX3hjID09IE5VTEwgfHwgeGVuX2ZtZW0gPT0g TlVMTCkgewogICAgICAgICAvKiBDaGVjayBpZiB4ZW5faW5pdCgpIGhhdmUgYmVlbiBjYWxsZWQg Ki8KICAgICAgICAgZ290byBlcnI7Ci0tIAoyLjIwLjEKCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZl bEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxt YW4vbGlzdGluZm8veGVuLWRldmVs