From patchwork Mon Sep 11 17:14:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksandr Grytsov X-Patchwork-Id: 9947751 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2425D6024A for ; Mon, 11 Sep 2017 17:17:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1501628CCA for ; Mon, 11 Sep 2017 17:17:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 09C8928CD3; Mon, 11 Sep 2017 17:17:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7CE3F28CCA for ; Mon, 11 Sep 2017 17:17:50 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1drSJ1-0001wm-5A; Mon, 11 Sep 2017 17:15:31 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1drSIz-0001vc-68 for xen-devel@lists.xenproject.org; Mon, 11 Sep 2017 17:15:29 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id 34/68-01910-0B4C6B95; Mon, 11 Sep 2017 17:15:28 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrCIsWRWlGSWpSXmKPExsVyMfS6k+76I9s iDd7uNbD4vmUykwOjx+EPV1gCGKNYM/OS8isSWDMWvNzGWtBvXDH77TrGBsa5Gl2MXBxCAjMY Je6cfsIG4rAIvGSRmPFvAmMXIyeHhEA/q8TWXXEQdpzEheXnmSHsNImfW34zQdgVEt0/X4LFh QTkJQ62XGaHmDqNSeLp4i3sIAk2AS2J+7dXsIHYIgJKEvdWTQZrZhZIkdi7rg1smbCAu8TZye vBbBYBVYnpH+ezgti8Ag4S+7c+gVomJ3HzXCfYMk4BR4klU7pYIRY7SBx53sk+gVFwASPDKka N4tSistQiXSMjvaSizPSMktzEzBxdQwNjvdzU4uLE9NScxKRiveT83E2MwJCrZ2Bg3ME49YTf IUZJDiYlUd53x7dECvEl5adUZiQWZ8QXleakFh9i1ODgEPj59G8LoxRLXn5eqpIE78HD2yKFB ItS01Mr0jJzgFEBUyrBwaMkwpsDkuYtLkjMLc5Mh0idYrTkuHDn0h8mjgN7bgHJjpt3/zAJgc 2TEuddBNIgANKQUZoHNw4WuZcYZaWEeRkZGBiEeApSi3IzS1DlXzGKczAqCfPmgkzhycwrgdv 6CuggJqCDeC5tATmoJBEhJdXAKLHX5qTHn0Xx/feK1timPXvXuJOhySFY/9euz/ttlaZ7v5km fODmh49xpydL8FukpZ+f/ulL9Kzo4IdfMtebzHvVY35s87sntSfc/U6K5S5w5blm8lp6pz+3f ZHecocNYT88DA95ZLVKvs03qvlnbL/ZQ3pb9hPuT5O3lCR+WyLU73d3jwDbVyWW4oxEQy3mou JEAPjdr//XAgAA X-Env-Sender: al1img@gmail.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1505150127!114327294!1 X-Originating-IP: [209.85.215.66] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12770 invoked from network); 11 Sep 2017 17:15:27 -0000 Received: from mail-lf0-f66.google.com (HELO mail-lf0-f66.google.com) (209.85.215.66) by server-8.tower-31.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 11 Sep 2017 17:15:27 -0000 Received: by mail-lf0-f66.google.com with SMTP id l196so4237673lfl.3 for ; Mon, 11 Sep 2017 10:15:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=rWGaBookVPQe/lAEGzA8kwtj31s91z1InId9O93iFRo=; b=XQaQ2sUOJZQYsipBWvNteiDZi0Pk05xSEUHmvByzGuiXln8sEoalkQtPg1ASZE0EBO 3GZvoFo8+ZEYyZY4zZ5QjBYtW2rKFcBDuxQuZygJUCCtCiExSNmSCweYqAa8bOaBiGzw jtxWZw1QVRgIUR6tqtCPNX0e5/S1VNL+pX6ORqWrF9r3Q5AhUn/ia3gcQlemhJ9dLK25 wvMB+Nk5FCxTP+vdHBdlAB6R4YqfChzreETd83IlQlPBkkKoWmQeMQ1MyLPmfawVi7Mb cuDa012bVzyuELWM+EzLfAPgPDLyEacanQNqm2qJiF3R54FY3VxDyrUzCiwqMUO5A2U5 Yd0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=rWGaBookVPQe/lAEGzA8kwtj31s91z1InId9O93iFRo=; b=KKFlIXUi1ChR0s1bYsLWQHCckbNhjmmXLQ/qqU3/yVkjrWBLZRL3KAgCxMSFp+o057 zhKGLBWWfhvV4wy3/raZf58PpUCDOabvlBbnLwFESj/jTbB4fdpSXDAX+LCa8qGUb1b6 5DkZzs0BEwG0IwVTxq8u7dNU/mrMui+486hdgijYtFfDDiosIsTgZPtoVqkyiEnrwJNc rOUJcskVsdPDQMMeqRLE7vYGRJPTQLSDcYjTcdgHG10KoTH8ae8P9uYfCcm3Md4w5eU2 NL4CQYdrcezA3wq57kKjg6KdkCZ37RsUZgRrGwmBxhyTtoC/MRE4eOIlKJWQNwpnK9b6 2dNg== X-Gm-Message-State: AHPjjUiOscHqh9kYfVvd8kh1NNsYJqvQBtAlZRJtEqGzjwkijMQhPjac 7iw7evT7i/azqua8 X-Google-Smtp-Source: ADKCNb6XE3T+NqUiIGONNU90CCP+Ennm+Pq/6c4mE9ZyMp39dG8h/LJvq7BzHiVKXK/nCGG1sY8JFQ== X-Received: by 10.46.83.19 with SMTP id h19mr4270967ljb.183.1505150126618; Mon, 11 Sep 2017 10:15:26 -0700 (PDT) Received: from al1-pc.kyiv.epam.com (ll-57.209.223.85.sovam.net.ua. [85.223.209.57]) by smtp.gmail.com with ESMTPSA id g21sm1893044lje.52.2017.09.11.10.15.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 11 Sep 2017 10:15:25 -0700 (PDT) From: Oleksandr Grytsov To: xen-devel@lists.xenproject.org Date: Mon, 11 Sep 2017 20:14:57 +0300 Message-Id: <1505150102-30806-8-git-send-email-al1img@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1505150102-30806-1-git-send-email-al1img@gmail.com> References: <1505150102-30806-1-git-send-email-al1img@gmail.com> Cc: ian.jackson@eu.citrix.com, wei.liu2@citrix.com, Oleksandr Grytsov Subject: [Xen-devel] [PATCH v5 07/12] libxl: change vkb to use generec add function X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Oleksandr Grytsov Signed-off-by: Oleksandr Grytsov Acked-by: Wei Liu --- tools/libxl/libxl_console.c | 74 +++++++------------------------------------- tools/libxl/libxl_create.c | 5 +-- tools/libxl/libxl_dm.c | 6 ++-- tools/libxl/libxl_internal.h | 6 +--- 4 files changed, 19 insertions(+), 72 deletions(-) diff --git a/tools/libxl/libxl_console.c b/tools/libxl/libxl_console.c index 6181b05..e4a0daf 100644 --- a/tools/libxl/libxl_console.c +++ b/tools/libxl/libxl_console.c @@ -583,11 +583,10 @@ int libxl_device_channel_getinfo(libxl_ctx *ctx, uint32_t domid, return rc; } -int libxl__device_vkb_setdefault(libxl__gc *gc, libxl_device_vkb *vkb) +static int libxl__device_vkb_setdefault(libxl__gc *gc, uint32_t domid, + libxl_device_vkb *vkb, bool hotplug) { - int rc; - rc = libxl__resolve_domid(gc, vkb->backend_domname, &vkb->backend_domid); - return rc; + return libxl__resolve_domid(gc, vkb->backend_domname, &vkb->backend_domid); } static int libxl__device_from_vkb(libxl__gc *gc, uint32_t domid, @@ -604,66 +603,8 @@ static int libxl__device_from_vkb(libxl__gc *gc, uint32_t domid, return 0; } -int libxl_device_vkb_add(libxl_ctx *ctx, uint32_t domid, libxl_device_vkb *vkb, - const libxl_asyncop_how *ao_how) -{ - AO_CREATE(ctx, domid, ao_how); - int rc; - - rc = libxl__device_vkb_add(gc, domid, vkb); - if (rc) { - LOGD(ERROR, domid, "Unable to add vkb device"); - goto out; - } - -out: - libxl__ao_complete(egc, ao, rc); - return AO_INPROGRESS; -} - static LIBXL_DEFINE_UPDATE_DEVID(vkb, "vkb") -int libxl__device_vkb_add(libxl__gc *gc, uint32_t domid, - libxl_device_vkb *vkb) -{ - flexarray_t *front; - flexarray_t *back; - libxl__device device; - int rc; - - rc = libxl__device_vkb_setdefault(gc, vkb); - if (rc) goto out; - - front = flexarray_make(gc, 16, 1); - back = flexarray_make(gc, 16, 1); - - rc = libxl__device_vkb_update_devid(gc, domid, vkb); - if (rc) goto out; - - rc = libxl__device_from_vkb(gc, domid, vkb, &device); - if (rc != 0) goto out; - - flexarray_append(back, "frontend-id"); - flexarray_append(back, GCSPRINTF("%d", domid)); - flexarray_append(back, "online"); - flexarray_append(back, "1"); - flexarray_append(back, "state"); - flexarray_append(back, GCSPRINTF("%d", XenbusStateInitialising)); - - flexarray_append(front, "backend-id"); - flexarray_append(front, GCSPRINTF("%d", vkb->backend_domid)); - flexarray_append(front, "state"); - flexarray_append(front, GCSPRINTF("%d", XenbusStateInitialising)); - - libxl__device_generic_add(gc, XBT_NULL, &device, - libxl__xs_kvs_of_flexarray(gc, back), - libxl__xs_kvs_of_flexarray(gc, front), - NULL); - rc = 0; -out: - return rc; -} - int libxl__device_vfb_setdefault(libxl__gc *gc, libxl_device_vfb *vfb) { int rc; @@ -785,8 +726,17 @@ out: * 2. dynamically add/remove qemu chardevs via qmp messages. */ /* vkb */ + +#define libxl__add_vkbs NULL +#define libxl_device_vkb_list NULL +#define libxl_device_vkb_compare NULL + LIBXL_DEFINE_DEVICE_REMOVE(vkb) +DEFINE_DEVICE_TYPE_STRUCT(vkb, + .skip_attach = 1 +); + /* vfb */ LIBXL_DEFINE_DEVICE_REMOVE(vfb) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 26aa2a4..8c0c12d 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -1349,7 +1349,7 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, } libxl_device_vkb_init(&vkb); - libxl__device_vkb_add(gc, domid, &vkb); + libxl__device_add(gc, domid, &libxl__vkb_devtype, &vkb); libxl_device_vkb_dispose(&vkb); dcs->sdss.dm.guest_domid = domid; @@ -1375,7 +1375,8 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, for (i = 0; i < d_config->num_vfbs; i++) { libxl__device_vfb_add(gc, domid, &d_config->vfbs[i]); - libxl__device_vkb_add(gc, domid, &d_config->vkbs[i]); + libxl__device_add(gc, domid, &libxl__vkb_devtype, + &d_config->vkbs[i]); } init_console_info(gc, &console, 0); diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index ee20930..0712a34 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -1986,9 +1986,9 @@ static void spawn_stub_launch_dm(libxl__egc *egc, goto out; } if (dm_config->num_vkbs) { - ret = libxl__device_vkb_add(gc, dm_domid, &dm_config->vkbs[0]); - if (ret) - goto out; + ret = libxl__device_add(gc, dm_domid, &libxl__vkb_devtype, + &dm_config->vkbs[0]); + if (ret) goto out; } if (guest_config->b_info.u.hvm.serial) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 87f6d32..c2ef67f 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1248,7 +1248,6 @@ _hidden int libxl__device_disk_setdefault(libxl__gc *gc, uint32_t domid, _hidden int libxl__device_nic_setdefault(libxl__gc *gc, uint32_t domid, libxl_device_nic *nic, bool hotplug); _hidden int libxl__device_vfb_setdefault(libxl__gc *gc, libxl_device_vfb *vfb); -_hidden int libxl__device_vkb_setdefault(libxl__gc *gc, libxl_device_vkb *vkb); _hidden void libxl__rdm_setdefault(libxl__gc *gc, libxl_domain_build_info *b_info); @@ -2657,10 +2656,6 @@ struct libxl__multidev { * it's a valid state. */ -/* Internal function to connect a vkb device */ -_hidden int libxl__device_vkb_add(libxl__gc *gc, uint32_t domid, - libxl_device_vkb *vkb); - /* Internal function to connect a vfb device */ _hidden int libxl__device_vfb_add(libxl__gc *gc, uint32_t domid, libxl_device_vfb *vfb); @@ -3551,6 +3546,7 @@ static inline int *libxl__device_type_get_num( return (int *)((void *)d_config + dt->num_offset); } +extern const struct libxl_device_type libxl__vkb_devtype; extern const struct libxl_device_type libxl__disk_devtype; extern const struct libxl_device_type libxl__nic_devtype; extern const struct libxl_device_type libxl__vtpm_devtype;