From nobody Fri Dec 19 20:19:04 2025 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; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1619655326; cv=none; d=zohomail.com; s=zohoarc; b=XiSI/lLboiBSvJiFxhg64XXnDLFiK5WVYXKulR85FjOiBV1NSDmEh7V1Bg3XuohyYYDlBaDKyQ4GySy7ZcqioFzo31ArhZqDQNTbnRpb65weDEh8+cVlPO4jQRMAIimBdq/UtTydPlVPjlVcgf4WIvdaXqjrob65ccRMPCqgeCA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619655326; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=9uXGDDpJ9CrrbQAMDJkXAgE2yF4sZn3Mfqg0mD2vt8w=; b=IF80Z285WMVJRrnbYXj/r2hyXm5eMmyqMl9r2JLKFCvT/QQS//1JStyy5JF369ciyYagc20ZFz6Xrc3k0tB6TpCPDERk7MG5xVQtT2IzWaF4NqsWPShNnO8Fza6CvO5nlu4mA9Gm2VNWxaR0ViTlncZ3pGXJARIQemBw7t5nFL0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1619655326632913.9914555092787; Wed, 28 Apr 2021 17:15:26 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.119631.226254 (Exim 4.92) (envelope-from ) id 1lbuKo-0007ZK-Nz; Thu, 29 Apr 2021 00:15:14 +0000 Received: by outflank-mailman (output) from mailman id 119631.226254; Thu, 29 Apr 2021 00:15:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lbuKo-0007ZA-Jj; Thu, 29 Apr 2021 00:15:14 +0000 Received: by outflank-mailman (input) for mailman id 119631; Thu, 29 Apr 2021 00:15:14 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lbuKn-00072A-Ue for xen-devel@lists.xenproject.org; Thu, 29 Apr 2021 00:15:13 +0000 Received: from mail-qk1-x72e.google.com (unknown [2607:f8b0:4864:20::72e]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 37bb3426-b71e-45e2-bc68-03a2f74e5d3c; Thu, 29 Apr 2021 00:14:44 +0000 (UTC) Received: by mail-qk1-x72e.google.com with SMTP id 66so26014683qkf.2 for ; Wed, 28 Apr 2021 17:14:44 -0700 (PDT) Received: from localhost.localdomain (c-73-89-138-5.hsd1.vt.comcast.net. [73.89.138.5]) by smtp.gmail.com with ESMTPSA id r185sm1021694qkf.78.2021.04.28.17.14.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Apr 2021 17:14:44 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 37bb3426-b71e-45e2-bc68-03a2f74e5d3c 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 :in-reply-to:references; bh=9uXGDDpJ9CrrbQAMDJkXAgE2yF4sZn3Mfqg0mD2vt8w=; b=GnTD7+ioGmWtK61iTA0bx7cyHU0a79TZRJjUpxX7SJpCsngstCsdi8DNFAftO8wNct qdsunU3kYNZsykJBWeKY9spMoDYeZTlwDTrJg5/GttOrqKBg02GZnPcaktxDb3OPGdEj knlQn9X9yacB7NSIEouOOdQ/nIFAbH1jlrd+bAl05cFNz0xU4xUf4cjnhP2WWo4BXCUl vnwqEJmOto/5beyWSbfhiIq7ICi4KgPJqm3562XL8nWxBQnyXRX/JEkuoJRJcOHif0BN Oih51vEEyTJjO4eRNgQ/rrGNSzMqqNkM/8Nz0s3zceE86DnA+yXmOXjk264HW2uoevLo I4yw== 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:in-reply-to:references; bh=9uXGDDpJ9CrrbQAMDJkXAgE2yF4sZn3Mfqg0mD2vt8w=; b=c9sZN3w70RzfS87gsYc4Kb9bz1ipUcCkk1pqCrwvd8NF+KH/I09EY16p2xrEiihFI/ K8rwcwCaYfHZ9LlscadZOgWpbY5ugn6VKtR6lPMbx7oYnAcX62e9JgHRQ0BVlkMp4eYi yVTIJXwGuZWQee8agpe5YOv3CgmeRsTFsdT8QvQgsrAja0mVaUbaEwTi1z9sknck3y8m y6v5EKnx3wvRTRKXcRtx5uVK83YL/VlRUw6Z2KxSPVtnHxZEWmg4UJpgnNdsogNtl3PO JH7L9tOy/R+0CZDy9krzgOLC8PfRB13Y1d9D6/A2QgXSkdOMjIKlwhrSRSI40+KBDdBv Ip5w== X-Gm-Message-State: AOAM530ApSorZxHeTCZxyTqpIiSheFNDiwQ3BIBQu+ViMOXg1aOzId+2 8oaFTqs8Bg6Rpiumz26kYnpC2Wobsvo= X-Google-Smtp-Source: ABdhPJzmlwZ2l6XQ2OEYQV12XIJkjXJHZ2yBLWVjPqShw9X6B6nDd+5PO1V3AVAs411HFMk1LjskBA== X-Received: by 2002:a37:492:: with SMTP id 140mr31742249qke.161.1619655284380; Wed, 28 Apr 2021 17:14:44 -0700 (PDT) From: Nick Rosbrook X-Google-Original-From: Nick Rosbrook To: xen-devel@lists.xenproject.org Cc: Nick Rosbrook , George Dunlap , Ian Jackson , Wei Liu Subject: [PATCH 07/12] golang/xenlight: add logging conveniences for within xenlight Date: Wed, 28 Apr 2021 20:14:29 -0400 Message-Id: <452aac2489990ac0195c62d8cb820fbe5786c466.1619655104.git.rosbrookn@ainfosec.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: <29e665fc1c9313f5e221e9e5e15d7c2d9c1eb4a7.1619655104.git.rosbrookn@ainfosec.com> References: <29e665fc1c9313f5e221e9e5e15d7c2d9c1eb4a7.1619655104.git.rosbrookn@ainfosec.com> X-ZohoMail-DKIM: pass (identity @gmail.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add some logging methods to Context to provide easy use of the Contenxt's xentoollog_logger. These are not exported, but the LogLevel type is so that a later commit can allow the Context's log level to be configurable. Becuase cgo does not support calling C functions with variable arguments, e.g. xtl_log, add an xtl_log_wrap function to the cgo preamble that accepts an already formatted string, and handle the formatting in Go. Signed-off-by: Nick Rosbrook --- tools/golang/xenlight/xenlight.go | 45 +++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/tools/golang/xenlight/xenlight.go b/tools/golang/xenlight/xenl= ight.go index fc3eb0bf3f..f68d7b6e97 100644 --- a/tools/golang/xenlight/xenlight.go +++ b/tools/golang/xenlight/xenlight.go @@ -32,6 +32,15 @@ static const libxl_childproc_hooks childproc_hooks =3D {= .chldowner =3D libxl_sigchl void xenlight_set_chldproc(libxl_ctx *ctx) { libxl_childproc_setmode(ctx, &childproc_hooks, NULL); } + +void xtl_log_wrap(struct xentoollog_logger *logger, + xentoollog_level level, + int errnoval, + const char *context, + const char *msg) +{ + xtl_log(logger, level, errnoval, context, "%s", msg); +} */ import "C" =20 @@ -192,6 +201,42 @@ func (ctx *Context) Close() error { return nil } =20 +// LogLevel represents an xentoollog_level, and can be used to configre th= e log +// level of a Context's logger. +type LogLevel int + +const ( + //LogLevelNone LogLevel =3D C.XTL_NONE + LogLevelDebug LogLevel =3D C.XTL_DEBUG + LogLevelVerbose LogLevel =3D C.XTL_VERBOSE + LogLevelDetail LogLevel =3D C.XTL_DETAIL + LogLevelProgress LogLevel =3D C.XTL_PROGRESS + LogLevelInfo LogLevel =3D C.XTL_INFO + LogLevelNotice LogLevel =3D C.XTL_NOTICE + LogLevelWarn LogLevel =3D C.XTL_WARN + LogLevelError LogLevel =3D C.XTL_ERROR + LogLevelCritical LogLevel =3D C.XTL_CRITICAL + //LogLevelNumLevels LogLevel =3D C.XTL_NUM_LEVELS +) + +func (ctx *Context) log(lvl LogLevel, errnoval int, format string, a ...in= terface{}) { + msg :=3D C.CString(fmt.Sprintf(format, a...)) + defer C.free(unsafe.Pointer(msg)) + context :=3D C.CString("xenlight") + defer C.free(unsafe.Pointer(context)) + + C.xtl_log_wrap((*C.xentoollog_logger)(unsafe.Pointer(ctx.logger)), + C.xentoollog_level(lvl), C.int(errnoval), context, msg) +} + +func (ctx *Context) logd(format string, a ...interface{}) { + ctx.log(LogLevelDebug, -1, format, a...) +} + +func (ctx *Context) logw(format string, a ...interface{}) { + ctx.log(LogLevelWarn, -1, format, a...) +} + /* * Types: Builtins */ --=20 2.17.1