From nobody Mon Feb 9 04:03:27 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1568913496; cv=none; d=zoho.com; s=zohoarc; b=es25Q+l41k2w3HiRp+wfGsPCWBRzx4k19L3JPuGBm0SUHgKDjttSe9KRmadTNRTanlQvU6mRbNuDssDtRFS36hqdcw5CU27+ME3auQ/EX4H9u71QjaTvTPaW/mnTpb9eO9RL4Rz3pV9dhdOi79H5vCaGe2VBBHsZDC0gz2X7580= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568913496; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=yFKI6XKQMSszd5+o+GxQGT7GZzlEi87NEZnCuieGJQI=; b=ZF+XeLIwkNmiQuUnXu5srfzP6K8Z0ZNHwXEse4YxlC89wo+Cjsm/h+D7O2hEmMS1NlidiGL9dnZKgH2MDfcC8JJdvokb/wB55wvzw99gwqEXXscm0NEO5W5qHx1Kim7oiCN9z0Pwn69M+O60ODfp+aj/2LMyaIlLIbPl1qz/mNI= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1568913496644945.2590778227691; Thu, 19 Sep 2019 10:18:16 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iB03C-0000sI-Im; Thu, 19 Sep 2019 17:17:02 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iB03B-0000sC-8A for xen-devel@lists.xenproject.org; Thu, 19 Sep 2019 17:17:01 +0000 Received: from esa6.hc3370-68.iphmx.com (unknown [216.71.155.175]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 49ee74f4-db01-11e9-a337-bc764e2007e4; Thu, 19 Sep 2019 17:16:59 +0000 (UTC) X-Inumbo-ID: 49ee74f4-db01-11e9-a337-bc764e2007e4 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1568913419; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=wpCQu9yT8V2b191ia7CuS8Z5qR1eobgDrX2wdGUOgKQ=; b=esrGqvXY0dKg7XwKYCdCCj6HxKBt/v9V7cnWgVxpCXfAM5JMhwryFwCJ Po0bsteBxtmXVLPHDlKx2eZ2sC+xAA96B3g+35x8TP0tfYCmXCWbuDaZ1 Nb+t8EsS0w/kzGMtl+v111BduWgqyrg/PWrOXYYZdY49hoX1mcDfjeMPN c=; Authentication-Results: esa6.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=anthony.perard@citrix.com; spf=Pass smtp.mailfrom=anthony.perard@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Received-SPF: None (esa6.hc3370-68.iphmx.com: no sender authenticity information available from domain of anthony.perard@citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa6.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="anthony.perard@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa6.hc3370-68.iphmx.com: domain of anthony.perard@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa6.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="anthony.perard@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ~all" Received-SPF: None (esa6.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa6.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: 1Z9O12gCQAHWXw20DejDi4CPdmqS/Tf/oytM+cO6OcJrusLIXJei6RakMM/BaPuUukOspaXL/9 QWPAaOkg9bnAONYov//64rmhUU6kOM1dXM5AyjbflbfSJxKC40U5rIm+ShHJKoExgQ4+m3qxL+ rDKDD0GYOkZp9Gi3wgaBKRxOKihgbCqTw5xp3mTzqPph7v2tsd5GfHuXmPnSrvHxEXmhgHCL3d l6qBRq5opRWnDdCAekOamMPk5DtTFjUXiYPPzb8Vc+359IklKQc3oMFU0qB8Y48pavoFhk7Dgd tXY= X-SBRS: 2.7 X-MesageID: 6062784 X-Ironport-Server: esa6.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.64,524,1559534400"; d="scan'208";a="6062784" From: Anthony PERARD To: Date: Thu, 19 Sep 2019 18:16:28 +0100 Message-ID: <20190919171656.899649-9-anthony.perard@citrix.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190919171656.899649-1-anthony.perard@citrix.com> References: <20190919171656.899649-1-anthony.perard@citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH v2 08/35] libxl: Replace libxl__qmp_initializations by ev_qmp calls X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Anthony PERARD , Ian Jackson , Wei Liu Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Setup a timeout of 10s for all the commands. It used to be about 5s per commands. The order of command is changed, we call 'query-vnc' before 'change-vnc-password', but that should not matter. That makes it easier to call 'change-vnc-password' conditionally. Also 'change' command is replaced by 'change-vnc-password' because 'change' is deprecated. The new command is available in all QEMU versions that also have Xen support. Signed-off-by: Anthony PERARD Acked-by: Ian Jackson --- tools/libxl/libxl_dm.c | 211 ++++++++++++++++++++++++++++++++++- tools/libxl/libxl_internal.h | 8 +- tools/libxl/libxl_qmp.c | 169 ---------------------------- 3 files changed, 212 insertions(+), 176 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 5a2e3497769d..bb5339784ea8 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -2063,11 +2063,13 @@ static int libxl__write_stub_dmargs(libxl__gc *gc, static void dmss_init(libxl__dm_spawn_state *dmss) { libxl__ev_qmp_init(&dmss->qmp); + libxl__ev_time_init(&dmss->timeout); } =20 static void dmss_dispose(libxl__gc *gc, libxl__dm_spawn_state *dmss) { libxl__ev_qmp_dispose(gc, &dmss->qmp); + libxl__ev_time_deregister(gc, &dmss->timeout); } =20 static void spawn_stubdom_pvqemu_cb(libxl__egc *egc, @@ -2462,6 +2464,16 @@ static void device_model_qmp_cb(libxl__egc *egc, lib= xl__ev_qmp *ev, static void device_model_spawn_outcome(libxl__egc *egc, libxl__dm_spawn_state *dmss, int rc); +static void device_model_postconfig_chardev(libxl__egc *egc, + libxl__ev_qmp *qmp, const libxl__json_object *response, int rc); +static void device_model_postconfig_vnc(libxl__egc *egc, + libxl__ev_qmp *qmp, const libxl__json_object *response, int rc); +static void device_model_postconfig_vnc_passwd(libxl__egc *egc, + libxl__ev_qmp *qmp, const libxl__json_object *response, int rc); +static void devise_model_postconfig_timeout(libxl__egc *egc, + libxl__ev_time *ev, const struct timeval *requested_abs, int rc); +static void device_model_postconfig_done(libxl__egc *egc, + libxl__dm_spawn_state *dmss, int rc); =20 void libxl__spawn_local_dm(libxl__egc *egc, libxl__dm_spawn_state *dmss) { @@ -2763,12 +2775,209 @@ static void device_model_spawn_outcome(libxl__egc = *egc, } } =20 + /* Check if spawn failed */ + if (rc) goto out; + if (d_config->b_info.device_model_version =3D=3D LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN) { - libxl__qmp_initializations(gc, dmss->guest_domid, d_config); + rc =3D libxl__ev_time_register_rel(ao, &dmss->timeout, + devise_model_postconfig_timeout, + LIBXL_QMP_CMD_TIMEOUT * 1000); + if (rc) goto out; + dmss->qmp.ao =3D ao; + dmss->qmp.domid =3D dmss->guest_domid; + dmss->qmp.payload_fd =3D -1; + dmss->qmp.callback =3D device_model_postconfig_chardev; + rc =3D libxl__ev_qmp_send(gc, &dmss->qmp, "query-chardev", NULL); + if (rc) goto out; + return; } =20 out: + device_model_postconfig_done(egc, dmss, rc); /* must be last */ +} + +static void device_model_postconfig_chardev(libxl__egc *egc, + libxl__ev_qmp *qmp, const libxl__json_object *response, int rc) +{ + EGC_GC; + libxl__dm_spawn_state *dmss =3D CONTAINER_OF(qmp, *dmss, qmp); + const libxl__json_object *item =3D NULL; + const libxl__json_object *o =3D NULL; + int i =3D 0; + const char *label; + const char *filename; + int port; + char *endptr; + const char *dompath; + const char serial[] =3D "serial"; + const size_t seriall =3D sizeof(serial) - 1; + const char pty[] =3D "pty:"; + const size_t ptyl =3D sizeof(pty) - 1; + + if (rc) goto out; + + /* + * query-chardev response: + * [{ 'label': 'str', + * 'filename': 'str', + * 'frontend-open': 'bool' }, ...] + */ + + for (i =3D 0; (item =3D libxl__json_array_get(response, i)); i++) { + o =3D libxl__json_map_get("label", item, JSON_STRING); + if (!o) goto protocol_error; + label =3D libxl__json_object_get_string(o); + + /* Check if the "label" start with "serial". */ + if (!label || strncmp(label, serial, seriall)) + continue; + port =3D strtol(label + seriall, &endptr, 10); + if (*(label + seriall) =3D=3D '\0' || *endptr !=3D '\0') { + LOGD(ERROR, qmp->domid, + "Invalid serial port number: %s", label); + rc =3D ERROR_QEMU_API; + goto out; + } + + o =3D libxl__json_map_get("filename", item, JSON_STRING); + if (!o) goto protocol_error; + filename =3D libxl__json_object_get_string(o); + + /* Check if filename start with "pty:" */ + if (!filename || strncmp(filename, pty, ptyl)) + continue; + + dompath =3D libxl__xs_get_dompath(gc, qmp->domid); + if (!dompath) { + rc =3D ERROR_FAIL; + goto out; + } + rc =3D libxl__xs_printf(gc, XBT_NULL, + GCSPRINTF("%s/serial/%d/tty", dompath, port), + "%s", filename + ptyl); + if (rc) goto out; + } + + qmp->callback =3D device_model_postconfig_vnc; + rc =3D libxl__ev_qmp_send(gc, qmp, "query-vnc", NULL); + if (rc) goto out; + return; + +protocol_error: + rc =3D ERROR_QEMU_API; + LOGD(ERROR, qmp->domid, + "unexpected response to QMP cmd 'query-chardev', received:\n%s", + JSON(response)); +out: + device_model_postconfig_done(egc, dmss, rc); /* must be last */ +} + +static void device_model_postconfig_vnc(libxl__egc *egc, + libxl__ev_qmp *qmp, const libxl__json_object *response, int rc) +{ + EGC_GC; + libxl__dm_spawn_state *dmss =3D CONTAINER_OF(qmp, *dmss, qmp); + const libxl_vnc_info *vnc =3D libxl__dm_vnc(dmss->guest_config); + const libxl__json_object *o; + libxl__json_object *args =3D NULL; + + if (rc) goto out; + + /* + * query-vnc response: + * { 'enabled': 'bool', '*host': 'str', '*service': 'str' } + */ + + o =3D libxl__json_map_get("enabled", response, JSON_BOOL); + if (!o) goto protocol_error; + if (libxl__json_object_get_bool(o)) { + const char *addr, *port; + const char *dompath; + + o =3D libxl__json_map_get("host", response, JSON_STRING); + if (!o) goto protocol_error; + addr =3D libxl__json_object_get_string(o); + o =3D libxl__json_map_get("service", response, JSON_STRING); + if (!o) goto protocol_error; + port =3D libxl__json_object_get_string(o); + + dompath =3D libxl__xs_get_dompath(gc, qmp->domid); + if (!dompath) { + rc =3D ERROR_FAIL; + goto out; + } + rc =3D libxl__xs_printf(gc, XBT_NULL, + GCSPRINTF("%s/console/vnc-listen", dompath), + "%s", addr); + if (rc) goto out; + rc =3D libxl__xs_printf(gc, XBT_NULL, + GCSPRINTF("%s/console/vnc-port", dompath), + "%s", port); + if (rc) goto out; + } + + if (vnc && vnc->passwd) { + qmp->callback =3D device_model_postconfig_vnc_passwd; + libxl__qmp_param_add_string(gc, &args, "password", vnc->passwd); + rc =3D libxl__ev_qmp_send(gc, qmp, "change-vnc-password", args); + if (rc) goto out; + return; + } + + rc =3D 0; + goto out; + +protocol_error: + rc =3D ERROR_QEMU_API; + LOGD(ERROR, qmp->domid, + "unexpected response to QMP cmd 'query-vnc', received:\n%s", + JSON(response)); +out: + device_model_postconfig_done(egc, dmss, rc); /* must be last */ +} + +static void device_model_postconfig_vnc_passwd(libxl__egc *egc, + libxl__ev_qmp *qmp, const libxl__json_object *response, int rc) +{ + EGC_GC; + libxl__dm_spawn_state *dmss =3D CONTAINER_OF(qmp, *dmss, qmp); + const libxl_vnc_info *vnc =3D libxl__dm_vnc(dmss->guest_config); + const char *dompath; + + if (rc) goto out; + + dompath =3D libxl__xs_get_dompath(gc, qmp->domid); + if (!dompath) { + rc =3D ERROR_FAIL; + goto out; + } + rc =3D libxl__xs_printf(gc, XBT_NULL, + GCSPRINTF("%s/console/vnc-pass", dompath), + "%s", vnc->passwd); + +out: + device_model_postconfig_done(egc, dmss, rc); /* must be last */ +} + +void devise_model_postconfig_timeout(libxl__egc *egc, libxl__ev_time *ev, + const struct timeval *requested_abs, + int rc) +{ + libxl__dm_spawn_state *dmss =3D CONTAINER_OF(ev, *dmss, timeout); + device_model_postconfig_done(egc, dmss, rc); /* must be last */ +} + + +static void device_model_postconfig_done(libxl__egc *egc, + libxl__dm_spawn_state *dmss, + int rc) +{ + EGC_GC; + + if (rc) + LOGD(ERROR, dmss->guest_domid, + "Post DM startup configs failed, rc=3D%d", rc); dmss_dispose(gc, dmss); dmss->callback(egc, dmss, rc); } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index c4834ac9c6c5..f5f234be7e3c 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -100,6 +100,7 @@ #define LIBXL_DEVICE_MODEL_START_TIMEOUT 60 #define LIBXL_DEVICE_MODEL_SAVE_FILE XEN_LIB_DIR "/qemu-save" /* .$domid */ #define LIBXL_DEVICE_MODEL_RESTORE_FILE XEN_LIB_DIR "/qemu-resume" /* .$do= mid */ +#define LIBXL_QMP_CMD_TIMEOUT 10 #define LIBXL_STUBDOM_START_TIMEOUT 30 #define LIBXL_QEMU_BODGE_TIMEOUT 2 #define LIBXL_XENCONSOLE_LIMIT 1048576 @@ -1947,8 +1948,6 @@ _hidden libxl__qmp_handler *libxl__qmp_initialize(lib= xl__gc *gc, _hidden int libxl__qmp_run_command_flexarray(libxl__gc *gc, int domid, const char *cmd, flexarray_t *array); -/* ask to QEMU the serial port information and store it in xenstore. */ -_hidden int libxl__qmp_query_serial(libxl__qmp_handler *qmp); _hidden int libxl__qmp_pci_add(libxl__gc *gc, int d, libxl_device_pci *pci= dev); _hidden int libxl__qmp_pci_del(libxl__gc *gc, int domid, libxl_device_pci *pcidev); @@ -1994,10 +1993,6 @@ _hidden void libxl__qmp_close(libxl__qmp_handler *qm= p); * nothing happen */ _hidden void libxl__qmp_cleanup(libxl__gc *gc, uint32_t domid); =20 -/* this helper calls qmp_initialize, query_serial and qmp_close */ -_hidden int libxl__qmp_initializations(libxl__gc *gc, uint32_t domid, - const libxl_domain_config *guest_co= nfig); - /* `data' should contain a byte to send. * When dealing with a non-blocking fd, it returns * ERROR_NOT_READY on EWOULDBLOCK @@ -3954,6 +3949,7 @@ struct libxl__dm_spawn_state { /* mixed - spawn.ao must be initialised by user; rest is private: */ libxl__spawn_state spawn; libxl__ev_qmp qmp; + libxl__ev_time timeout; /* filled in by user, must remain valid: */ uint32_t guest_domid; /* domain being served */ libxl_domain_config *guest_config; diff --git a/tools/libxl/libxl_qmp.c b/tools/libxl/libxl_qmp.c index f1529925ee0e..0d6aedcc7d3c 100644 --- a/tools/libxl/libxl_qmp.c +++ b/tools/libxl/libxl_qmp.c @@ -143,121 +143,6 @@ static const int QMP_SOCKET_CONNECT_TIMEOUT =3D 5; * QMP callbacks functions */ =20 -static int store_serial_port_info(libxl__qmp_handler *qmp, - const char *chardev, - int port) -{ - GC_INIT(qmp->ctx); - char *path =3D NULL; - int ret =3D 0; - - if (!(chardev && strncmp("pty:", chardev, 4) =3D=3D 0)) { - return 0; - } - - path =3D libxl__xs_get_dompath(gc, qmp->domid); - path =3D GCSPRINTF("%s/serial/%d/tty", path, port); - - ret =3D libxl__xs_printf(gc, XBT_NULL, path, "%s", chardev + 4); - - GC_FREE; - return ret; -} - -static int register_serials_chardev_callback(libxl__qmp_handler *qmp, - const libxl__json_object *o, - void *unused) -{ - const libxl__json_object *obj =3D NULL; - const libxl__json_object *label =3D NULL; - const char *s =3D NULL; - int i =3D 0; - const char *chardev =3D NULL; - int ret =3D 0; - - for (i =3D 0; (obj =3D libxl__json_array_get(o, i)); i++) { - if (!libxl__json_object_is_map(obj)) - continue; - label =3D libxl__json_map_get("label", obj, JSON_STRING); - s =3D libxl__json_object_get_string(label); - - if (s && strncmp("serial", s, strlen("serial")) =3D=3D 0) { - const libxl__json_object *filename =3D NULL; - char *endptr =3D NULL; - int port_number; - - filename =3D libxl__json_map_get("filename", obj, JSON_STRING); - chardev =3D libxl__json_object_get_string(filename); - - s +=3D strlen("serial"); - port_number =3D strtol(s, &endptr, 10); - if (*s =3D=3D 0 || *endptr !=3D 0) { - LIBXL__LOGD(qmp->ctx, LIBXL__LOG_ERROR, qmp->domid, - "Invalid serial port number: %s", s); - return -1; - } - ret =3D store_serial_port_info(qmp, chardev, port_number); - if (ret) { - LIBXL__LOGD_ERRNO(qmp->ctx, LIBXL__LOG_ERROR, qmp->domid, - "Failed to store serial port information" - " in xenstore"); - return ret; - } - } - }; - - return ret; -} - -static int qmp_write_domain_console_item(libxl__gc *gc, int domid, - const char *item, const char *val= ue) -{ - char *path; - - path =3D libxl__xs_get_dompath(gc, domid); - path =3D GCSPRINTF("%s/console/%s", path, item); - - return libxl__xs_printf(gc, XBT_NULL, path, "%s", value); -} - -static int qmp_register_vnc_callback(libxl__qmp_handler *qmp, - const libxl__json_object *o, - void *unused) -{ - GC_INIT(qmp->ctx); - const libxl__json_object *obj; - const char *addr, *port; - int rc =3D -1; - - if (!libxl__json_object_is_map(o)) { - goto out; - } - - obj =3D libxl__json_map_get("enabled", o, JSON_BOOL); - if (!obj || !libxl__json_object_get_bool(obj)) { - rc =3D 0; - goto out; - } - - obj =3D libxl__json_map_get("host", o, JSON_STRING); - addr =3D libxl__json_object_get_string(obj); - obj =3D libxl__json_map_get("service", o, JSON_STRING); - port =3D libxl__json_object_get_string(obj); - - if (!addr || !port) { - LOGD(ERROR, qmp->domid, "Failed to retrieve VNC connect informatio= n."); - goto out; - } - - rc =3D qmp_write_domain_console_item(gc, qmp->domid, "vnc-listen", add= r); - if (!rc) - rc =3D qmp_write_domain_console_item(gc, qmp->domid, "vnc-port", p= ort); - -out: - GC_FREE; - return rc; -} - static int qmp_capabilities_callback(libxl__qmp_handler *qmp, const libxl__json_object *o, void *un= used) { @@ -851,20 +736,6 @@ void libxl__qmp_cleanup(libxl__gc *gc, uint32_t domid) } } =20 -int libxl__qmp_query_serial(libxl__qmp_handler *qmp) -{ - return qmp_synchronous_send(qmp, "query-chardev", NULL, - register_serials_chardev_callback, - NULL, qmp->timeout); -} - -static int qmp_query_vnc(libxl__qmp_handler *qmp) -{ - return qmp_synchronous_send(qmp, "query-vnc", NULL, - qmp_register_vnc_callback, - NULL, qmp->timeout); -} - static int pci_add_callback(libxl__qmp_handler *qmp, const libxl__json_object *response, void *opaq= ue) { @@ -1085,24 +956,6 @@ int libxl__qmp_restore(libxl__gc *gc, int domid, cons= t char *state_file) NULL, NULL); } =20 -static int qmp_change(libxl__gc *gc, libxl__qmp_handler *qmp, - char *device, char *target, char *arg) -{ - libxl__json_object *args =3D NULL; - int rc =3D 0; - - libxl__qmp_param_add_string(gc, &args, "device", device); - libxl__qmp_param_add_string(gc, &args, "target", target); - if (arg) { - libxl__qmp_param_add_string(gc, &args, "arg", arg); - } - - rc =3D qmp_synchronous_send(qmp, "change", args, - NULL, NULL, qmp->timeout); - - return rc; -} - int libxl__qmp_resume(libxl__gc *gc, int domid) { return qmp_run_command(gc, domid, "cont", NULL, NULL, NULL); @@ -1293,28 +1146,6 @@ int libxl_qemu_monitor_command(libxl_ctx *ctx, uint3= 2_t domid, return AO_INPROGRESS; } =20 -int libxl__qmp_initializations(libxl__gc *gc, uint32_t domid, - const libxl_domain_config *guest_config) -{ - const libxl_vnc_info *vnc =3D libxl__dm_vnc(guest_config); - libxl__qmp_handler *qmp =3D NULL; - int ret =3D 0; - - qmp =3D libxl__qmp_initialize(gc, domid); - if (!qmp) - return -1; - ret =3D libxl__qmp_query_serial(qmp); - if (!ret && vnc && vnc->passwd) { - ret =3D qmp_change(gc, qmp, "vnc", "password", vnc->passwd); - qmp_write_domain_console_item(gc, domid, "vnc-pass", vnc->passwd); - } - if (!ret) { - ret =3D qmp_query_vnc(qmp); - } - libxl__qmp_close(qmp); - return ret; -} - =20 /* * Functions using libxl__ev_qmp --=20 Anthony PERARD _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel