From patchwork Tue Jul 18 14:25:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksandr Grytsov X-Patchwork-Id: 9848517 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 47AED602C8 for ; Tue, 18 Jul 2017 14:27:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 39FDF26E74 for ; Tue, 18 Jul 2017 14:27:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2D0002856B; Tue, 18 Jul 2017 14:27:56 +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=-3.6 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_SPAM, 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 A6FEB26E74 for ; Tue, 18 Jul 2017 14:27:55 +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 1dXTRf-0002bn-4C; Tue, 18 Jul 2017 14:25:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dXTRd-0002ZX-OB for xen-devel@lists.xenproject.org; Tue, 18 Jul 2017 14:25:49 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id E8/7C-01712-C6A1E695; Tue, 18 Jul 2017 14:25:48 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrKIsWRWlGSWpSXmKPExsVyMfS6o26OVF6 kwZ+VvBbft0xmcmD0OPzhCksAYxRrZl5SfkUCa0bbvlWMBa+NK64uWs7ewPhZo4uRi0NIYDqj xJ3+N+wgDovASxaJhmsNzCCOhEA/q8SWVz1ADgeQkySx/5xpFyMnkFkh0XzyNiuILSQgL3Gw5 TI7hD2NSWLLF2UQm01AS+L+7RVsILaIgJLEvVWTmUBsZoEUib3r2hhBbGEBd4lVH/vB5rAIqE o8O3kKzOYVcJC48eA4K8QuOYmb5zrBTuAUcJTYOqMcYhVQSesr9gmMAgsYGVYxqhenFpWlFum a6iUVZaZnlOQmZuboGhqY6uWmFhcnpqfmJCYV6yXn525iBAYVAxDsYPzS73yIUZKDSUmUd/WB 3EghvqT8lMqMxOKM+KLSnNTiQ4waHBwCP5/+bWGUYsnLz0tVkuCdIJkXKSRYlJqeWpGWmQMMe 5hSCQ4eJRHefAmgNG9xQWJucWY6ROoUoyXHlSvrvjBxTDmwHUi+mvD/G5MQ2Dwpcd4OkHkCIA 0ZpXlw42CxeYlRVkqYlxHoWCGegtSi3MwSVPlXjOIcjErCvAUgU3gy80rgtr4COogJ6CBh3xy Qg0oSEVJSDYx6/R62/MrqlxJjhOOlLc5khaZc1N89ffOdSjb755q7O55sU3MxOfbznYk+W/it 6Y57Xu1b6sDz9OglVeteo6Dl2vs11KOWLhSy5LaO2/Fd2ctJz6/4wwbHulSJKaVaL09x7kj28 u4+qxrv7HZd0GVOpKp+7C2bb/sP/fKq3TtxcseKpdJLDyixFGckGmoxFxUnAgD1/XmFyAIAAA == X-Env-Sender: al1img@gmail.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1500387947!100536170!1 X-Originating-IP: [209.85.215.65] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.25; banners=-,-,- X-VirusChecked: Checked Received: (qmail 46592 invoked from network); 18 Jul 2017 14:25:48 -0000 Received: from mail-lf0-f65.google.com (HELO mail-lf0-f65.google.com) (209.85.215.65) by server-7.tower-206.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 18 Jul 2017 14:25:48 -0000 Received: by mail-lf0-f65.google.com with SMTP id t72so2015219lff.0 for ; Tue, 18 Jul 2017 07:25:48 -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=Paw+aXS6hLaPV+gI2G+SSNCUFvmnPGbb+uip8+g05wE=; b=FLVYrX82CTSAlNUej0K6A0oCQNUTj42E+hjdu4aZAL18igKmzPq93a7rtzgh2+2CJP 0rAkv85TGflCdlVDUtzNT3SNHuavO62Y1Yk4LIQtHNmdYBBRHWy21HA5EpxStWWmobiY 0v0BIIZwT/HRBHLFO2Ysyghf1v27mUsaxNBcy4z0BgcbSrzZA2sk8NF3xYFsG1SEYJzj XYZDj2eLeyozuhf85XC+jiCNy9zEhPPpc2jSp0AJiYEOIushibfVFvwcd3Hrf/RFA6xO uBr6NoAneqzTEgUom/zyifFodV8HCO9swVi5d4ZkB8YMOzmWR0ZA7N1hnYjAXYo3PKM/ ZqvQ== 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=Paw+aXS6hLaPV+gI2G+SSNCUFvmnPGbb+uip8+g05wE=; b=MYcaf1GooO41ccfUQeF6Y79fYDB5P0TVuCeiJa8NuBX0tVoIn0HY4l/Glpmzs++A7U yy7sG6qxTbVk0cAeJ/HswnRI2o4exvbqeytDKb/qKKnTyWaIUfgGlL1ueKkIBNJeeLbA 84baN7PFgb/T6JPgg5pdto28rcwMZVxivbfdNZHYMte/yD8qbHdrVoQ1OuVpL1t8OQtm syKYfURhPRVM7Ijz54l6aUPsn7jdlCcJ/1BbqB4y7l71aSU06oIotQE7KONka5n/l7Js kSrUM2HCz4B9ppghjbxnjojwZNkL4nDWi7KQ3E4rTB1Dll3G23nyWiK97LQXmtNQPoMk QJ4g== X-Gm-Message-State: AIVw112eSrDk5uMtwgO/ajovvJRi9A5ZOuT9rp9tYMMXqArv8WWDVucc ywPpDhgaeis+mo2cncs= X-Received: by 10.25.235.200 with SMTP id f69mr869604lfk.46.1500387947245; Tue, 18 Jul 2017 07:25:47 -0700 (PDT) Received: from al1-pc.kyiv.epam.com (ll-58.209.223.85.sovam.net.ua. [85.223.209.58]) by smtp.gmail.com with ESMTPSA id s134sm620442lfe.27.2017.07.18.07.25.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 18 Jul 2017 07:25:46 -0700 (PDT) From: Oleksandr Grytsov To: xen-devel@lists.xenproject.org Date: Tue, 18 Jul 2017 17:25:24 +0300 Message-Id: <1500387930-16317-8-git-send-email-al1img@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1500387930-16317-1-git-send-email-al1img@gmail.com> References: <1500387930-16317-1-git-send-email-al1img@gmail.com> Cc: ian.jackson@eu.citrix.com, wei.liu2@citrix.com, Oleksandr Grytsov Subject: [Xen-devel] [PATCH v4 07/13] 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 | 79 ++++++++------------------------------------ tools/libxl/libxl_create.c | 5 +-- tools/libxl/libxl_dm.c | 3 +- tools/libxl/libxl_internal.h | 6 +--- 4 files changed, 19 insertions(+), 74 deletions(-) diff --git a/tools/libxl/libxl_console.c b/tools/libxl/libxl_console.c index 446e766..48fccec 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,68 +603,6 @@ 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; -} - -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); - - if (vkb->devid == -1) { - if ((vkb->devid = libxl__device_nextid(gc, domid, "vkb")) < 0) { - rc = ERROR_FAIL; - 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; @@ -789,7 +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) +static LIBXL_DEFINE_UPDATE_DEVID(vkb, "vkbd") + +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 f483475..9634811 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -1346,7 +1346,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; @@ -1372,7 +1372,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 44ebd70..b37f47e 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -1978,7 +1978,8 @@ static void spawn_stub_launch_dm(libxl__egc *egc, ret = libxl__device_vfb_add(gc, dm_domid, &dm_config->vfbs[0]); if (ret) goto out; - ret = libxl__device_vkb_add(gc, dm_domid, &dm_config->vkbs[0]); + ret = libxl__device_add(gc, dm_domid, &libxl__vkb_devtype, + &dm_config->vkbs[0]); if (ret) goto out; diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index c53bbd1..49440d7 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, _hidden int libxl__device_nic_setdefault(libxl__gc *gc, libxl_device_nic *nic, uint32_t domid, 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 int libxl__device_pci_setdefault(libxl__gc *gc, libxl_device_pci *pci); _hidden void libxl__rdm_setdefault(libxl__gc *gc, libxl_domain_build_info *b_info); @@ -2658,10 +2657,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); @@ -3552,6 +3547,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;