From nobody Tue Feb 10 02:43:55 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1585842417; cv=none; d=zohomail.com; s=zohoarc; b=OzxVCmkJrKdXW1IEhb7gOWgH7rpJj5UMg+RJ9MK+OPBpyYlh+4g+lK8Fog2sv7+ErNHvEnlMBSk64BoAxA4WLNb1nXUgt5k/HeyNgcRGvvlZIvdGpqN4vwiuRjfaJh8l3uIQMLUmxDmxsJF0Jtir/6yWoDe/JMDirdwMgqBFASM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585842417; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=NjdsYjcPZeKRSXMeQfT2Zj4gsK5uHmlzc0WLUdJpBgM=; b=LjQVUlaVwNNcw56vT8XHDROIN1U20xK4nix9B9zgJBKNmxkW0moXK3lRKQjrTvmzxkumI75mzdCx02k7eRUCXvnZu1PM/kJCRHDGggCmtdpmssdQxGHmA4U8EQVIvXC2fygSg9n3sIPvkf/9DLVpgp5IwWrK8lTuw8RPkJ8SpE8= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) 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 1585842417068473.06038183824796; Thu, 2 Apr 2020 08:46:57 -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 1jK23D-0003pe-Al; Thu, 02 Apr 2020 15:46:39 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jK23B-0003oj-U6 for xen-devel@lists.xenproject.org; Thu, 02 Apr 2020 15:46:37 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 1a56d96c-74f9-11ea-bc01-12813bfff9fa; Thu, 02 Apr 2020 15:46:23 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 5C92EAE61; Thu, 2 Apr 2020 15:46:21 +0000 (UTC) X-Inumbo-ID: 1a56d96c-74f9-11ea-bc01-12813bfff9fa X-Virus-Scanned: by amavisd-new at test-mx.suse.de From: Juergen Gross To: xen-devel@lists.xenproject.org Subject: [PATCH v7 10/12] tools/libxl: use libxenhypfs for setting xen runtime parameters Date: Thu, 2 Apr 2020 17:46:14 +0200 Message-Id: <20200402154616.16927-11-jgross@suse.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20200402154616.16927-1-jgross@suse.com> References: <20200402154616.16927-1-jgross@suse.com> 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: Juergen Gross , Anthony PERARD , Ian Jackson , Wei Liu Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Instead of xc_set_parameters() use xenhypfs_write() for setting parameters of the hypervisor. Signed-off-by: Juergen Gross --- V6: - new patch --- tools/Rules.mk | 2 +- tools/libxl/Makefile | 3 ++- tools/libxl/libxl.c | 53 +++++++++++++++++++++++++++++++++++++++-= ---- tools/libxl/libxl_internal.h | 1 + tools/libxl/xenlight.pc.in | 2 +- tools/xl/xl_misc.c | 1 - 6 files changed, 52 insertions(+), 10 deletions(-) diff --git a/tools/Rules.mk b/tools/Rules.mk index 711e9598cd..ee0f130276 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -180,7 +180,7 @@ CFLAGS +=3D -O2 -fomit-frame-pointer endif =20 CFLAGS_libxenlight =3D -I$(XEN_XENLIGHT) $(CFLAGS_libxenctrl) $(CFLAGS_xen= include) -SHDEPS_libxenlight =3D $(SHLIB_libxenctrl) $(SHLIB_libxenstore) +SHDEPS_libxenlight =3D $(SHLIB_libxenctrl) $(SHLIB_libxenstore) $(SHLIB_li= bxenhypfs) LDLIBS_libxenlight =3D $(SHDEPS_libxenlight) $(XEN_XENLIGHT)/libxenlight$(= libextension) SHLIB_libxenlight =3D $(SHDEPS_libxenlight) -Wl,-rpath-link=3D$(XEN_XENLI= GHT) =20 diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index 69fcf21577..a89ebab0b4 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -20,7 +20,7 @@ LIBUUID_LIBS +=3D -luuid endif =20 LIBXL_LIBS =3D -LIBXL_LIBS =3D $(LDLIBS_libxentoollog) $(LDLIBS_libxenevtchn) $(LDLIBS_lib= xenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) $(LDLIBS_libxentoolcor= e) $(PTYFUNCS_LIBS) $(LIBUUID_LIBS) +LIBXL_LIBS =3D $(LDLIBS_libxentoollog) $(LDLIBS_libxenevtchn) $(LDLIBS_lib= xenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenhypfs) $(LDLIBS_libxenstore) = $(LDLIBS_libxentoolcore) $(PTYFUNCS_LIBS) $(LIBUUID_LIBS) ifeq ($(CONFIG_LIBNL),y) LIBXL_LIBS +=3D $(LIBNL3_LIBS) endif @@ -33,6 +33,7 @@ CFLAGS_LIBXL +=3D $(CFLAGS_libxentoolcore) CFLAGS_LIBXL +=3D $(CFLAGS_libxenevtchn) CFLAGS_LIBXL +=3D $(CFLAGS_libxenctrl) CFLAGS_LIBXL +=3D $(CFLAGS_libxenguest) +CFLAGS_LIBXL +=3D $(CFLAGS_libxenhypfs) CFLAGS_LIBXL +=3D $(CFLAGS_libxenstore) ifeq ($(CONFIG_LIBNL),y) CFLAGS_LIBXL +=3D $(LIBNL3_CFLAGS) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index f60fd3e4fd..621acc88f3 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -663,15 +663,56 @@ int libxl_set_parameters(libxl_ctx *ctx, char *params) { int ret; GC_INIT(ctx); + char *par, *val, *end, *path; + xenhypfs_handle *hypfs; =20 - ret =3D xc_set_parameters(ctx->xch, params); - if (ret < 0) { - LOGEV(ERROR, ret, "setting parameters"); - GC_FREE; - return ERROR_FAIL; + hypfs =3D xenhypfs_open(ctx->lg, 0); + if (!hypfs) { + LOGE(ERROR, "opening Xen hypfs"); + ret =3D ERROR_FAIL; + goto out; } + + while (isblank(*params)) + params++; + + for (par =3D params; *par; par =3D end) { + end =3D strchr(par, ' '); + if (!end) + end =3D par + strlen(par); + + val =3D strchr(par, '=3D'); + if (val > end) + val =3D NULL; + if (!val && !strncmp(par, "no", 2)) { + path =3D libxl__sprintf(gc, "/params/%s", par + 2); + path[end - par - 2 + 8] =3D 0; + val =3D "no"; + par +=3D 2; + } else { + path =3D libxl__sprintf(gc, "/params/%s", par); + path[val - par + 8] =3D 0; + val =3D libxl__strndup(gc, val + 1, end - val - 1); + } + + LOG(DEBUG, "setting node \"%s\" to value \"%s\"", path, val); + ret =3D xenhypfs_write(hypfs, path, val); + if (ret < 0) { + LOGE(ERROR, "setting parameters"); + ret =3D ERROR_FAIL; + goto out; + } + + while (isblank(*end)) + end++; + } + + ret =3D 0; + +out: + xenhypfs_close(hypfs); GC_FREE; - return 0; + return ret; } =20 static int fd_set_flags(libxl_ctx *ctx, int fd, diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 5f39e44cb9..7153beb8f8 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -56,6 +56,7 @@ #define XC_WANT_COMPAT_MAP_FOREIGN_API #include #include +#include #include =20 #include diff --git a/tools/libxl/xenlight.pc.in b/tools/libxl/xenlight.pc.in index c0f769fd20..6b351ba096 100644 --- a/tools/libxl/xenlight.pc.in +++ b/tools/libxl/xenlight.pc.in @@ -9,4 +9,4 @@ Description: The Xenlight library for Xen hypervisor Version: @@version@@ Cflags: -I${includedir} Libs: @@libsflag@@${libdir} -lxenlight -Requires.private: xentoollog,xenevtchn,xencontrol,xenguest,xenstore +Requires.private: xentoollog,xenevtchn,xencontrol,xenguest,xenstore,xenhyp= fs diff --git a/tools/xl/xl_misc.c b/tools/xl/xl_misc.c index 20ed605f4f..08f0fb6dc9 100644 --- a/tools/xl/xl_misc.c +++ b/tools/xl/xl_misc.c @@ -168,7 +168,6 @@ int main_set_parameters(int argc, char **argv) =20 if (libxl_set_parameters(ctx, params)) { fprintf(stderr, "cannot set parameters: %s\n", params); - fprintf(stderr, "Use \"xl dmesg\" to look for possible reason.\n"); return EXIT_FAILURE; } =20 --=20 2.16.4