From nobody Thu Sep 19 00:52:24 2024 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1718882679573985.0854896779213; Thu, 20 Jun 2024 04:24:39 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 839DDB03; Thu, 20 Jun 2024 07:24:38 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id EC51D11DF; Thu, 20 Jun 2024 07:23:05 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 15E7AB08; Thu, 20 Jun 2024 07:22:59 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 A62DEB08 for ; Thu, 20 Jun 2024 07:22:58 -0400 (EDT) Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-310-tMTeUuVSOgSzh1ja5p1JEw-1; Thu, 20 Jun 2024 07:22:57 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 69FC919560AE for ; Thu, 20 Jun 2024 11:22:56 +0000 (UTC) Received: from maggie.brq.redhat.com (unknown [10.43.3.102]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8835C19560AE for ; Thu, 20 Jun 2024 11:22:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: *** X-Spam-Status: No, score=3.0 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,RCVD_IN_SBL_CSS,SPF_HELO_NONE, T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1718882578; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=f4+5mLS1Nywn2H77ma5xHOKBJz3J8lq0cBopWapY53Q=; b=Da27k9qQm2914mEiJfiKroF4DNRvbVqE7AkK5F7/dncY/hYSGZZ5OmbVGc3p8TjyCM29om oegb2fIsb8M0asca4R0gwRcJqIqn2x369sZv32erTcu3Eo7u465+etb7UIHuDVlWS41glA 1jSPxRh5a6Vn2RLs0AeTW4B2aA35yjw= X-MC-Unique: tMTeUuVSOgSzh1ja5p1JEw-1 From: Michal Privoznik To: devel@lists.libvirt.org Subject: [PATCH 03/12] conf: Separate SEV formatting into a function Date: Thu, 20 Jun 2024 13:22:40 +0200 Message-ID: <2038e878b21cc8d2eadce18251dba1ab1f8e9b63.1718882351.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 4P2W6U77OB55DFI5QZDC2KUUPSQNXMOI X-Message-ID-Hash: 4P2W6U77OB55DFI5QZDC2KUUPSQNXMOI X-MailFrom: mprivozn@redhat.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 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: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1718882680934100001 Content-Type: text/plain; charset="utf-8"; x-default="true" To avoid convolution of switch() inside of virDomainSecDefFormat() even more (as new sectypes are added), move formatting into a separate function. Signed-off-by: Michal Privoznik Reviewed-by: Daniel P. Berrang=C3=A9 --- src/conf/domain_conf.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9179cc18bb..264f182d05 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -26670,6 +26670,19 @@ virDomainSEVCommonDefFormat(virBuffer *attrBuf, } =20 =20 +static void +virDomainSEVDefFormat(virBuffer *attrBuf, + virBuffer *childBuf, + virDomainSEVDef *def) +{ + virDomainSEVCommonDefFormat(attrBuf, childBuf, &def->common); + + virBufferAsprintf(childBuf, "0x%04x\n", def->policy); + virBufferEscapeString(childBuf, "%s\n", def->dh_cert); + virBufferEscapeString(childBuf, "%s\n", def->sessio= n); +} + + static void virDomainSecDefFormat(virBuffer *buf, virDomainSecDef *sec) { @@ -26683,18 +26696,9 @@ virDomainSecDefFormat(virBuffer *buf, virDomainSec= Def *sec) virDomainLaunchSecurityTypeToString(sec->sectype)); =20 switch ((virDomainLaunchSecurity) sec->sectype) { - case VIR_DOMAIN_LAUNCH_SECURITY_SEV: { - virDomainSEVDef *sev =3D &sec->data.sev; - - virDomainSEVCommonDefFormat(&attrBuf, &childBuf, &sev->common); - - virBufferAsprintf(&childBuf, "0x%04x\n", sev->pol= icy); - virBufferEscapeString(&childBuf, "%s\n", sev->dh_= cert); - - virBufferEscapeString(&childBuf, "%s\n", sev->s= ession); - + case VIR_DOMAIN_LAUNCH_SECURITY_SEV: + virDomainSEVDefFormat(&attrBuf, &childBuf, &sec->data.sev); break; - } =20 case VIR_DOMAIN_LAUNCH_SECURITY_PV: break; --=20 2.44.2