From patchwork Tue Sep 12 13:48:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksandr Grytsov X-Patchwork-Id: 9949281 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 0F15E60360 for ; Tue, 12 Sep 2017 13:51:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F3BE9287A9 for ; Tue, 12 Sep 2017 13:51:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E8A4428FE3; Tue, 12 Sep 2017 13:51:13 +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 3BB0428F9C for ; Tue, 12 Sep 2017 13:51:13 +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 1drlYV-0005lo-8A; Tue, 12 Sep 2017 13:48:47 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1drlYU-0005it-4F for xen-devel@lists.xenproject.org; Tue, 12 Sep 2017 13:48:46 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id D0/9E-01754-DB5E7B95; Tue, 12 Sep 2017 13:48:45 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrOIsWRWlGSWpSXmKPExsVyMfS6k+6Op9s jDa6t1LT4vmUykwOjx+EPV1gCGKNYM/OS8isSWDO+v5QruBJfsetwYgPjLLcuRi4OIYEZjBIz jt5mAnFYBF6ySPyedYIFxJEQ6GeVaDo/lb2LkRPISZJYtP08C4SdJvF/8162LkYOILtC4vKKY JCwkIC8xMGWy+wQU6cwSazpWMAGkmAT0JK4f3sFmC0ioCRxb9VkJhCbWSBFYu+6NkYQW1jAQ2 Lm1T2sIDNZBFQlvh+MBgnzCjhK3OmYxgSxVk7i5rlOZhCbEyje/ruLGWKvg8SVNXvYJjAKLmB kWMWoUZxaVJZapGtorpdUlJmeUZKbmJmja2hgqpebWlycmJ6ak5hUrJecn7uJERhsDECwg/Hi ac9DjJIcTEqivMr3t0cK8SXlp1RmJBZnxBeV5qQWH2LU4OAQ+Pn0bwujFEtefl6qkgSvOzCoh QSLUtNTK9Iyc4DxAFMqwcGjJMKbBZLmLS5IzC3OTIdInWK057hw59IfJo5jmy4DyQN7bgHJjp t3/zAJgU2VEucNBWkTAGnLKM2DGwqL30uMslLCvIxAJwvxFKQW5WaWoMq/YhTnYFQS5v38BGg KT2ZeCdzuV0BnMQGdxXNpC8hZJYkIKakGRvFrX55+7Npz2e2QAnfnt7lrNR+u1LsUJ6th054l W/ss7sC1DSbvi/0NZXn9ulhUmCxe83sXmN5LWNO2z1DqWe6FDTtZ9JyeVLIv2rG3ZVevHIuMR s8dKdOmTLnb0Z48F8L7+h76sGjscdBind6j4KvFkL92etn53NfCv+NCJ0sJXIx50bpciaU4I9 FQi7moOBEAyhaQRdoCAAA= X-Env-Sender: al1img@gmail.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1505224120!90567327!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 64218 invoked from network); 12 Sep 2017 13:48:40 -0000 Received: from mail-lf0-f66.google.com (HELO mail-lf0-f66.google.com) (209.85.215.66) by server-2.tower-206.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 12 Sep 2017 13:48:40 -0000 Received: by mail-lf0-f66.google.com with SMTP id m199so5376214lfe.5 for ; Tue, 12 Sep 2017 06:48:40 -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=YIBsbj8tSBhnHGMyHleRcKeiDk3ip2EoJK9talPXnKw=; b=RkPIFbclwD4Kq0stzMPJC1hO7a9OsBJOfSvEUtVsyJiipU8HNW4oz9zS23nr9kPfXy ReP1quHgjNG6jovON4zZNcPfPcdmMDXG0NA3xm9ZTOdzwXI1aWa5UG8m0FsBaq1uvFUA 0Zbj1P6oAHXqHJymW7VrMKl2Mm2GGvkcZ3sA5+3iciHOYYbOlc5Aml7YRSl42F+OPA6Q bfBLIWEzF34Xtkmkrpo5I8fwQ4x0UUgmgDuWDBoToM60fTADDPbVb1TsLIlqbgzoHtsF i2fH2UcG8t0eDnMOcZqxzaxuVzf05LpgQqB+mJDmSpt2POMJIKWy/fUc9sJg30ZSRuBH b42w== 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=YIBsbj8tSBhnHGMyHleRcKeiDk3ip2EoJK9talPXnKw=; b=gKRqq1FY8LJN1bisazJRwcxGaASQcu1QVLhaWQJP+wEB8BsOU8H0uccrkZ8DBoHWxU aFK/RTFN2Hg47SClO9d2zALQfQZEkDtoxiVZ/+0i6XLPQwNn8jTaCQZU4bad7LQ71M5C 2jYQt7M3iCdwnqiBkEMv19be58XKhzytN49zaqHk0gYIhqM2c4bOSXNgHt4CXC+qC7dl g4dt8G84uuKOoB0DMpFh+ZUQU2RTFYSqNVkUYc6qy3V0PSiXSfDOatnNnpazcB3q3fYh lBoyoxxM6L+NzTuoF9FkdFw2CvVs8v1a6JM3QXB8FS6h4fsDOFhP4yVplT3T37Uu5lVL axPQ== X-Gm-Message-State: AHPjjUgdn/3T8rewpPjoyzT7JqlbYgbgiWKwHAP4XrgVWqCjbrjP+ycR QQi/lZgCG/MlU4tac7Q= X-Google-Smtp-Source: AOwi7QD+z9E7rMIa0ky5MMZQ7r87tsc9lpcXZjGdE26N1AK/IpsgcRdeQlrCsbX7YGEfIy/EoD+ACw== X-Received: by 10.25.20.75 with SMTP id k72mr4675927lfi.261.1505224119645; Tue, 12 Sep 2017 06:48:39 -0700 (PDT) Received: from al1-pc.kyiv.epam.com (ll-56.209.223.85.sovam.net.ua. [85.223.209.56]) by smtp.gmail.com with ESMTPSA id s5sm690074lfb.14.2017.09.12.06.48.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 12 Sep 2017 06:48:38 -0700 (PDT) From: Oleksandr Grytsov To: xen-devel@lists.xenproject.org Date: Tue, 12 Sep 2017 16:48:17 +0300 Message-Id: <1505224098-19330-13-git-send-email-al1img@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1505224098-19330-1-git-send-email-al1img@gmail.com> References: <1505224098-19330-1-git-send-email-al1img@gmail.com> Cc: ian.jackson@eu.citrix.com, wei.liu2@citrix.com, Oleksandr Grytsov Subject: [Xen-devel] [PATCH v6 12/13] libxl: change vtpm 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.h | 12 +-- tools/libxl/libxl_vtpm.c | 221 +++++++++++++---------------------------------- tools/xl/xl_vtpm.c | 3 +- 3 files changed, 69 insertions(+), 167 deletions(-) diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index abe129e..65c4aaa 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -1606,9 +1606,6 @@ libxl_vcpuinfo *libxl_list_vcpu(libxl_ctx *ctx, uint32_t domid, int *nb_vcpu, int *nr_cpus_out); void libxl_vcpuinfo_list_free(libxl_vcpuinfo *, int nr_vcpus); -void libxl_device_vtpm_list_free(libxl_device_vtpm*, int nr_vtpms); -void libxl_vtpminfo_list_free(libxl_vtpminfo *, int nr_vtpms); - /* * Devices * ======= @@ -1883,9 +1880,14 @@ int libxl_device_vtpm_destroy(libxl_ctx *ctx, uint32_t domid, const libxl_asyncop_how *ao_how) LIBXL_EXTERNAL_CALLERS_ONLY; -libxl_device_vtpm *libxl_device_vtpm_list(libxl_ctx *ctx, uint32_t domid, int *num); +libxl_device_vtpm *libxl_device_vtpm_list(libxl_ctx *ctx, + uint32_t domid, int *num) + LIBXL_EXTERNAL_CALLERS_ONLY; +void libxl_device_vtpm_list_free(libxl_device_vtpm*, int num) + LIBXL_EXTERNAL_CALLERS_ONLY; int libxl_device_vtpm_getinfo(libxl_ctx *ctx, uint32_t domid, - libxl_device_vtpm *vtpm, libxl_vtpminfo *vtpminfo); + libxl_device_vtpm *vtpm, libxl_vtpminfo *vtpminfo) + LIBXL_EXTERNAL_CALLERS_ONLY; /* Virtual displays */ int libxl_device_vdispl_add(libxl_ctx *ctx, uint32_t domid, diff --git a/tools/libxl/libxl_vtpm.c b/tools/libxl/libxl_vtpm.c index 3eca38e..2132087 100644 --- a/tools/libxl/libxl_vtpm.c +++ b/tools/libxl/libxl_vtpm.c @@ -51,165 +51,72 @@ static void libxl__update_config_vtpm(libxl__gc *gc, libxl_device_vtpm *dst, static LIBXL_DEFINE_UPDATE_DEVID(vtpm, "vtpm") +static int libxl__set_xenstore_vtpm(libxl__gc *gc, uint32_t domid, + libxl_device_vtpm *vtpm, + flexarray_t *back, flexarray_t *front, + flexarray_t *ro_front) +{ + flexarray_append_pair(back, "handle", GCSPRINTF("%d", vtpm->devid)); + flexarray_append_pair(back, "uuid", + GCSPRINTF(LIBXL_UUID_FMT, + LIBXL_UUID_BYTES(vtpm->uuid))); + flexarray_append_pair(back, "resume", "False"); + + flexarray_append_pair(front, "handle", GCSPRINTF("%d", vtpm->devid)); + + return 0; +} + static void libxl__device_vtpm_add(libxl__egc *egc, uint32_t domid, libxl_device_vtpm *vtpm, libxl__ao_device *aodev) { - STATE_AO_GC(aodev->ao); - flexarray_t *front; - flexarray_t *back; - libxl__device *device; - int rc; - xs_transaction_t t = XBT_NULL; - libxl_domain_config d_config; - libxl_device_vtpm vtpm_saved; - libxl__domain_userdata_lock *lock = NULL; - - libxl_domain_config_init(&d_config); - libxl_device_vtpm_init(&vtpm_saved); - libxl_device_vtpm_copy(CTX, &vtpm_saved, vtpm); - - rc = libxl__device_vtpm_setdefault(gc, domid, vtpm, aodev->update_json); - if (rc) goto out; - - front = flexarray_make(gc, 16, 1); - back = flexarray_make(gc, 16, 1); - - rc = libxl__device_vtpm_update_devid(gc, domid, vtpm); - if (rc) goto out; - - libxl__update_config_vtpm(gc, &vtpm_saved, vtpm); - - GCNEW(device); - rc = libxl__device_from_vtpm(gc, domid, vtpm, 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(back, "handle"); - flexarray_append(back, GCSPRINTF("%d", vtpm->devid)); - - flexarray_append(back, "uuid"); - flexarray_append(back, GCSPRINTF(LIBXL_UUID_FMT, LIBXL_UUID_BYTES(vtpm->uuid))); - flexarray_append(back, "resume"); - flexarray_append(back, "False"); - - flexarray_append(front, "backend-id"); - flexarray_append(front, GCSPRINTF("%d", vtpm->backend_domid)); - flexarray_append(front, "state"); - flexarray_append(front, GCSPRINTF("%d", XenbusStateInitialising)); - flexarray_append(front, "handle"); - flexarray_append(front, GCSPRINTF("%d", vtpm->devid)); - - if (aodev->update_json) { - lock = libxl__lock_domain_userdata(gc, domid); - if (!lock) { - rc = ERROR_LOCK_FAIL; - goto out; - } + libxl__device_add_async(egc, domid, &libxl__vtpm_devtype, vtpm, aodev); +} - rc = libxl__get_domain_configuration(gc, domid, &d_config); - if (rc) goto out; +static int libxl__vtpm_from_xenstore(libxl__gc *gc, const char *libxl_path, + libxl_devid devid, + libxl_device_vtpm *vtpm) +{ + int rc; + char *be_path; + char *uuid; - DEVICE_ADD(vtpm, vtpms, domid, &vtpm_saved, COMPARE_DEVID, &d_config); + vtpm->devid = devid; - rc = libxl__dm_check_start(gc, &d_config, domid); - if (rc) goto out; - } + be_path = libxl__xs_read(gc, XBT_NULL, GCSPRINTF("%s/backend", libxl_path)); - for (;;) { - rc = libxl__xs_transaction_start(gc, &t); - if (rc) goto out; - - rc = libxl__device_exists(gc, t, device); - if (rc < 0) goto out; - if (rc == 1) { /* already exists in xenstore */ - LOGD(ERROR, domid, "device already exists in xenstore"); - aodev->action = LIBXL__DEVICE_ACTION_ADD; /* for error message */ - rc = ERROR_DEVICE_EXISTS; - goto out; - } + rc = libxl__backendpath_parse_domid(gc, be_path, &vtpm->backend_domid); + if (rc) return rc; - if (aodev->update_json) { - rc = libxl__set_domain_configuration(gc, domid, &d_config); - if (rc) goto out; + uuid = libxl__xs_read(gc, XBT_NULL, GCSPRINTF("%s/uuid", be_path)); + if (uuid) { + if(libxl_uuid_from_string(&(vtpm->uuid), uuid)) { + LOGD(ERROR, vtpm->backend_domid, "%s/uuid is a malformed uuid?? " + "(%s) Probably a bug!!\n", be_path, uuid); + return ERROR_FAIL; } - - libxl__device_generic_add(gc, t, device, - libxl__xs_kvs_of_flexarray(gc, back), - libxl__xs_kvs_of_flexarray(gc, front), - NULL); - - rc = libxl__xs_transaction_commit(gc, &t); - if (!rc) break; - if (rc < 0) goto out; } - aodev->dev = device; - aodev->action = LIBXL__DEVICE_ACTION_ADD; - libxl__wait_device_connection(egc, aodev); - - rc = 0; -out: - libxl__xs_transaction_abort(gc, &t); - if (lock) libxl__unlock_domain_userdata(lock); - libxl_device_vtpm_dispose(&vtpm_saved); - libxl_domain_config_dispose(&d_config); - aodev->rc = rc; - if(rc) aodev->callback(egc, aodev); - return; + return 0; } libxl_device_vtpm *libxl_device_vtpm_list(libxl_ctx *ctx, uint32_t domid, int *num) { - GC_INIT(ctx); + libxl_device_vtpm *r; - libxl_device_vtpm* vtpms = NULL; - char *libxl_path; - char** dir = NULL; - unsigned int ndirs = 0; - int rc; + GC_INIT(ctx); - *num = 0; - - libxl_path = GCSPRINTF("%s/device/vtpm", libxl__xs_libxl_path(gc, domid)); - dir = libxl__xs_directory(gc, XBT_NULL, libxl_path, &ndirs); - if (dir && ndirs) { - vtpms = malloc(sizeof(*vtpms) * ndirs); - libxl_device_vtpm* vtpm; - libxl_device_vtpm* end = vtpms + ndirs; - for(vtpm = vtpms; vtpm < end; ++vtpm, ++dir) { - char* tmp; - const char* be_path = libxl__xs_read(gc, XBT_NULL, - GCSPRINTF("%s/%s/backend", - libxl_path, *dir)); - - libxl_device_vtpm_init(vtpm); - - vtpm->devid = atoi(*dir); - - rc = libxl__backendpath_parse_domid(gc, be_path, - &vtpm->backend_domid); - if (rc) return NULL; - - tmp = libxl__xs_read(gc, XBT_NULL, GCSPRINTF("%s/uuid", libxl_path)); - if (tmp) { - if(libxl_uuid_from_string(&(vtpm->uuid), tmp)) { - LOGD(ERROR, domid, "%s/uuid is a malformed uuid?? (%s) Probably a bug!!\n", be_path, tmp); - free(vtpms); - return NULL; - } - } - } - } - *num = ndirs; + r = libxl__device_list(gc, &libxl__vtpm_devtype, domid, "vtpm", num); GC_FREE; - return vtpms; + + return r; +} + +void libxl_device_vtpm_list_free(libxl_device_vtpm* list, int num) +{ + libxl__device_list_free(&libxl__vtpm_devtype, list, num); } int libxl_device_vtpm_getinfo(libxl_ctx *ctx, @@ -281,11 +188,12 @@ int libxl_devid_to_device_vtpm(libxl_ctx *ctx, int devid, libxl_device_vtpm *vtpm) { + GC_INIT(ctx); libxl_device_vtpm *vtpms; int nb, i; int rc; - vtpms = libxl_device_vtpm_list(ctx, domid, &nb); + vtpms = libxl__device_list(gc, &libxl__vtpm_devtype, domid, "vtpm", &nb); if (!vtpms) return ERROR_FAIL; @@ -301,7 +209,8 @@ int libxl_devid_to_device_vtpm(libxl_ctx *ctx, } } - libxl_device_vtpm_list_free(vtpms, nb); + libxl__device_list_free(&libxl__vtpm_devtype, vtpms, nb); + GC_FREE; return rc; } @@ -314,11 +223,12 @@ static int libxl_device_vtpm_compare(libxl_device_vtpm *d1, int libxl_uuid_to_device_vtpm(libxl_ctx *ctx, uint32_t domid, libxl_uuid* uuid, libxl_device_vtpm *vtpm) { + GC_INIT(ctx); libxl_device_vtpm *vtpms; int nb, i; int rc; - vtpms = libxl_device_vtpm_list(ctx, domid, &nb); + vtpms = libxl__device_list(gc, &libxl__vtpm_devtype, domid, "vtpm", &nb); if (!vtpms) return ERROR_FAIL; @@ -334,26 +244,11 @@ int libxl_uuid_to_device_vtpm(libxl_ctx *ctx, uint32_t domid, } } - libxl_device_vtpm_list_free(vtpms, nb); + libxl__device_list_free(&libxl__vtpm_devtype, vtpms, nb); + GC_FREE; return rc; } -void libxl_vtpminfo_list_free(libxl_vtpminfo* list, int nr) -{ - int i; - for (i = 0; i < nr; i++) - libxl_vtpminfo_dispose(&list[i]); - free(list); -} - -void libxl_device_vtpm_list_free(libxl_device_vtpm* list, int nr) -{ - int i; - for (i = 0; i < nr; i++) - libxl_device_vtpm_dispose(&list[i]); - free(list); -} - static void libxl_device_vtpm_update_config(libxl__gc *gc, void *d, void *s) { libxl__update_config_vtpm(gc, d, s); @@ -364,7 +259,13 @@ static LIBXL_DEFINE_DEVICES_ADD(vtpm) LIBXL_DEFINE_DEVICE_REMOVE(vtpm) DEFINE_DEVICE_TYPE_STRUCT(vtpm, - .update_config = libxl_device_vtpm_update_config + .update_config = libxl_device_vtpm_update_config, + .from_xenstore = (int (*)(libxl__gc *, const char *, libxl_devid, void *)) + libxl__vtpm_from_xenstore, + .set_xenstore_config = (int (*)(libxl__gc *, uint32_t, void *, + flexarray_t *back, flexarray_t *front, + flexarray_t *ro_front)) + libxl__set_xenstore_vtpm ); /* diff --git a/tools/xl/xl_vtpm.c b/tools/xl/xl_vtpm.c index 6f56be0..0ba5041 100644 --- a/tools/xl/xl_vtpm.c +++ b/tools/xl/xl_vtpm.c @@ -105,9 +105,8 @@ int main_vtpmlist(int argc, char **argv) libxl_vtpminfo_dispose(&vtpminfo); } - libxl_device_vtpm_dispose(&vtpms[i]); } - free(vtpms); + libxl_device_vtpm_list_free(vtpms, nb); } return 0; }