From nobody Fri Dec 19 04:35:21 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1743071792; cv=none; d=zohomail.com; s=zohoarc; b=BpGhbZNnelxjshOMOeSoFQ6B8GupVncLXrPfackyg/gZaDVLXV913p7iEauZ06S1bMAlz4NfzSq00NpJ2oIawKWdjMLNg3DRRzghGxposLUaW1OVdZYgQJq9TSJn89iOyv/30QLpw8dK+tvizyBY0DPneKZUrItY+HNZM0mDkEU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1743071792; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id; bh=ae2FgTzEbMjLTrPPQbi4YMS7LekwkYIhJSbRAdD7EMw=; b=OH0hxyPDIWokVK6D7fi/uuqwW47K/IDaJwOIQ2DSWx9vEncD0p5AYKDKKojvFRCDKJ/gBv5WTmgnmJja9TP4ODC+yVbAT/b8aM0u0l/3tQZqGr6Q0QpAIjxLUDg0buSie/l1hwiUCXukNXMP+a/OqrvMJJbSej0LYhC8oVP71Yc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 174307179275088.52355533858508; Thu, 27 Mar 2025 03:36:32 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 24BE5D10; Thu, 27 Mar 2025 06:36:32 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id C7C2411B4; Thu, 27 Mar 2025 06:35:25 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id D697413A3; Thu, 27 Mar 2025 06:35:17 -0400 (EDT) Received: from relay.virtuozzo.com (relay.virtuozzo.com [130.117.225.111]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 3EA9611B4 for ; Thu, 27 Mar 2025 06:35:17 -0400 (EDT) Received: from [130.117.225.5] (helo=vz9-barybin-2.ch-qa.vzint.dev) by relay.virtuozzo.com with esmtp (Exim 4.96) (envelope-from ) id 1txkHX-007ahx-2f; Thu, 27 Mar 2025 11:19:12 +0100 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuozzo.com; s=relay; h=MIME-Version:Message-ID:Date:Subject:From: Content-Type; bh=H6/F5z6FUOjAcjbQNjY2Jzhuf7GiBaVLKakR0oftQSw=; b=ocYNBDbEFdBN o6DGP6wiqMaPWCTo6gkGV3lNcmPf2kB4+n0ta7kvlShc7fRrBTzdXKbUAawIz/StDQlct7sp2XcG5 MCxJ8kVHzf4/k5cQ9a8fPoCKUqXNvx1qMdSTNb5CYYwnAz4qFB0m0bEfC7i/vOHnQt58Q8eC13Hsh tFNlG29H13mLpe4ykFKrgXWak447ry0FtgGorg37NI3iLnHzBYTFrKM8vqUABPc2aUPjep1QCE9gq OarjcVSHc1g3EDDKL/mox5TR1k50x4ct9hz3ZSRFCqEE7D71kGmZHWXIDSnvpyNw92A96aQ1FUmCa PRWW1A2jlSwSaupsXlH2oQ==; To: devel@lists.libvirt.org Subject: [PATCH 2/4] src: conf: add parsing/formatting for 'coredump_format' value Date: Thu, 27 Mar 2025 13:14:38 +0300 Message-ID: <20250327101903.199286-3-nikolai.barybin@virtuozzo.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250327101903.199286-1-nikolai.barybin@virtuozzo.com> References: <20250327101903.199286-1-nikolai.barybin@virtuozzo.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: GBPOJ5CJWPLYERT7I6DR4T6FQW7D2ARL X-Message-ID-Hash: GBPOJ5CJWPLYERT7I6DR4T6FQW7D2ARL X-MailFrom: nikolai.barybin@virtuozzo.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: den@openvz.org, Nikolai Barybin X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: From: Nikolai Barybin via Devel Reply-To: Nikolai Barybin X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1743071794315019000 Content-Type: text/plain; charset="utf-8" Signed-off-by: Nikolai Barybin --- src/conf/domain_conf.c | 64 ++++++++++++++++++++++++++++++++++++++++ src/conf/domain_conf.h | 2 ++ src/libvirt_private.syms | 2 ++ 3 files changed, 68 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 99ecb03067..89dceacf79 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -303,6 +303,15 @@ VIR_ENUM_IMPL(virDomainLifecycleAction, "coredump-restart", ); =20 +VIR_ENUM_IMPL(virDomainCoreDumpFormat, + VIR_DOMAIN_CORE_DUMP_FORMAT_LAST, + "raw", + "kdump-zlib", + "kdump-lzo", + "kdump-snappy", + "win-dmp", +); + VIR_ENUM_IMPL(virDomainLockFailure, VIR_DOMAIN_LOCK_FAILURE_LAST, "default", @@ -13820,6 +13829,29 @@ virDomainRedirFilterDefParseXML(xmlNodePtr node, return NULL; } =20 +static int +virDomainCoredumpFormatParseXML(xmlXPathContextPtr ctxt, + const char *name, + const char *xpath, + int *val, + int defaultVal, + virEventActionFromStringFunc convFunc) +{ + g_autofree char *tmp =3D virXPathString(xpath, ctxt); + + if (tmp =3D=3D NULL) { + *val =3D defaultVal; + } else { + *val =3D convFunc(tmp); + if (*val < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown %1$s format: %2$s"), name, tmp); + return -1; + } + } + return 0; +} + static int virDomainEventActionParseXML(xmlXPathContextPtr ctxt, const char *name, @@ -19163,6 +19195,13 @@ virDomainDefLifecycleParse(virDomainDef *def, virDomainLifecycleActionTypeFromStrin= g) < 0) return -1; =20 + if (virDomainCoredumpFormatParseXML(ctxt, "coredump_format", + "string(./coredump_format[1])", + &def->coredumpFormat, + VIR_DOMAIN_CORE_DUMP_FORMAT_RAW, + virDomainCoreDumpFormatTypeFromStr= ing) < 0) + return -1; + if (virDomainEventActionParseXML(ctxt, "on_lockfailure", "string(./on_lockfailure[1])", &def->onLockFailure, @@ -22857,6 +22896,25 @@ virDomainEventActionDefFormat(virBuffer *buf, } =20 =20 +static int +virDomainCoreDumpFormatDefFormat(virBuffer *buf, + int type, + const char *name, + virEventActionToStringFunc convFunc) +{ + const char *typeStr =3D convFunc(type); + if (!typeStr) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unexpected %1$s coredump format: %2$d"), name, t= ype); + return -1; + } + + virBufferAsprintf(buf, "<%s>%s\n", name, typeStr, name); + + return 0; +} + + static void virSecurityLabelDefFormat(virBuffer *buf, virSecurityLabelDef *def, @@ -29023,6 +29081,12 @@ virDomainDefFormatInternalSetRootName(virDomainDef= *def, "on_crash", virDomainLifecycleActionTypeToString= ) < 0) return -1; + if ((def->onCrash =3D=3D VIR_DOMAIN_LIFECYCLE_ACTION_COREDUMP_DESTROY = || + def->onCrash =3D=3D VIR_DOMAIN_LIFECYCLE_ACTION_COREDUMP_RESTART) = && + virDomainCoreDumpFormatDefFormat(buf, def->coredumpFormat, + "coredump_format", + virDomainCoreDumpFormatTypeToStri= ng) < 0) + return -1; if (def->onLockFailure !=3D VIR_DOMAIN_LOCK_FAILURE_DEFAULT && virDomainEventActionDefFormat(buf, def->onLockFailure, "on_lockfailure", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 0d1dd954ae..6e43282160 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3144,6 +3144,7 @@ struct _virDomainDef { int onReboot; int onPoweroff; int onCrash; + int coredumpFormat; =20 int onLockFailure; /* enum virDomainLockFailureAction */ =20 @@ -4281,6 +4282,7 @@ VIR_ENUM_DECL(virDomainCapabilitiesPolicy); VIR_ENUM_DECL(virDomainProcessCapsFeature); VIR_ENUM_DECL(virDomainLifecycle); VIR_ENUM_DECL(virDomainLifecycleAction); +VIR_ENUM_DECL(virDomainCoreDumpFormat); VIR_ENUM_DECL(virDomainDevice); VIR_ENUM_DECL(virDomainDiskDevice); VIR_ENUM_DECL(virDomainDiskGeometryTrans); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 812fa4e435..72f9e3418f 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -303,6 +303,8 @@ virDomainControllerPCIModelNameTypeFromString; virDomainControllerPCIModelNameTypeToString; virDomainControllerRemove; virDomainControllerTypeToString; +virDomainCoreDumpFormatTypeFromString; +virDomainCoreDumpFormatTypeToString; virDomainCpuPlacementModeTypeFromString; virDomainCpuPlacementModeTypeToString; virDomainCryptoBackendTypeFromString; --=20 2.43.5