From nobody Wed Mar 12 13:49:26 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=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 1741694390853572.6635082191923; Tue, 11 Mar 2025 04:59:50 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 4C5691C9E; Tue, 11 Mar 2025 07:59:46 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id F03431CC7; Tue, 11 Mar 2025 07:59:14 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 6A5AE1BA2; Tue, 11 Mar 2025 07:59:10 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 E6C471B9C for ; Tue, 11 Mar 2025 07:59:09 -0400 (EDT) Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-155-lm9CNvT2M8GTr302O-VtVg-1; Tue, 11 Mar 2025 07:59:08 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 82D1C180025E for ; Tue, 11 Mar 2025 11:59:07 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.2]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8472519560AB for ; Tue, 11 Mar 2025 11:59:06 +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=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,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; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741694349; 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=+7wcoiBiPZ0IRwRpCuHSwm8j7oAP7zFE1fYnvfNEWKM=; b=Vya+gQPqB8FBuNTz/CpMKafI4yI2m2X/ZOGu7JkCETRkL4Uhk74dprEJeWfOPJXtk9jdjw k3qBLFkqbHFbWhT5x/sQeBAi2rRadtHF46GE9QrUUvrcjK1WUv58RMTZyBdhIxpg18w1ZS ID5ELHo/ZyGw7gHvwC2Px6OmNp6OBh8= X-MC-Unique: lm9CNvT2M8GTr302O-VtVg-1 X-Mimecast-MFC-AGG-ID: lm9CNvT2M8GTr302O-VtVg_1741694347 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 1/3] qemuDomainGetLaunchSecurityInfo: Don't forget unlock VM object on (impossible) error Date: Tue, 11 Mar 2025 12:59:01 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: Is7aM4usvOk5pVFLE_CAPf3FOHkutQc5K9WAmTyvHXg_1741694347 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: QSY4N6IRWABW2AIE5AKEFZTJH3FZBBKS X-Message-ID-Hash: QSY4N6IRWABW2AIE5AKEFZTJH3FZBBKS X-MailFrom: pkrempa@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: 1741694392456019000 Content-Type: text/plain; charset="utf-8" If 'vm->def->sec->sectype' would be invalid; which is currently not possible; we'd not unlock the domain object. Fix the logic even when the bug currently can't happen. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a5122d0cd6..45bb3c09aa 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -19056,7 +19056,7 @@ qemuDomainGetLaunchSecurityInfo(virDomainPtr domain, case VIR_DOMAIN_LAUNCH_SECURITY_NONE: case VIR_DOMAIN_LAUNCH_SECURITY_LAST: virReportEnumRangeError(virDomainLaunchSecurity, vm->def->sec->sec= type); - return -1; + goto cleanup; } ret =3D 0; --=20 2.48.1 From nobody Wed Mar 12 13:49:26 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=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 1741694405776306.75201395344584; Tue, 11 Mar 2025 05:00:05 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id BB4971C69; Tue, 11 Mar 2025 08:00:04 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 971F21CD9; Tue, 11 Mar 2025 07:59:16 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id A65C31BFF; Tue, 11 Mar 2025 07:59:12 -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 294961B9C for ; Tue, 11 Mar 2025 07:59:12 -0400 (EDT) Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-350-mFUEuK8BPAi959d4iFprsA-1; Tue, 11 Mar 2025 07:59:10 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 16E2D1800266 for ; Tue, 11 Mar 2025 11:59:09 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.2]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1B2C619560AF for ; Tue, 11 Mar 2025 11:59:07 +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=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,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; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741694351; 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=Dbhfx3XpsxBPt8eLm3dp6EaXrjeM1TTgJVzur6hRFHI=; b=AtNYVLoj4cxc3VbTaMnvtKuz/3NQzIxq6j3TZKSyaCzUtDEs0HZy8ywjG8jXrUynrl598t jQcT2+A4acwiUKFNC23Rp3lmzgbXPNgfALFabjy7KLlWPi/1JUClz9InVmvd6QDV94bq1u 5L1xxP1jFh85aNIAHceXZuVKBQXelvE= X-MC-Unique: mFUEuK8BPAi959d4iFprsA-1 X-Mimecast-MFC-AGG-ID: mFUEuK8BPAi959d4iFprsA_1741694349 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 2/3] qemuDomainGetLaunchSecurityInfo: Use virTypedParamList to construct return value Date: Tue, 11 Mar 2025 12:59:02 +0100 Message-ID: <4b36d60fde66e200ea66cbc9bddf4929886bc458.1741694252.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 82UpnRHsFmzdY5KdXhKO8f7rF7vJD-IdyU1PtaDUZ4s_1741694349 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: IRB7PC5RRVLIH6FDKR7HWTPMIOCFKDCI X-Message-ID-Hash: IRB7PC5RRVLIH6FDKR7HWTPMIOCFKDCI X-MailFrom: pkrempa@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: 1741694407289019100 Content-Type: text/plain; charset="utf-8" Simplify the code by using the modern helpers. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- src/qemu/qemu_driver.c | 42 ++++++++++++++---------------------------- 1 file changed, 14 insertions(+), 28 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 45bb3c09aa..a40db1dd2e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -18948,15 +18948,13 @@ qemuNodeGetSEVInfo(virConnectPtr conn, static int qemuDomainGetSEVInfo(virDomainObj *vm, - virTypedParameterPtr *params, - int *nparams, + virTypedParamList *list, unsigned int flags) { int ret =3D -1; int rv; g_autofree char *tmp =3D NULL; qemuMonitorSEVInfo info =3D { }; - int maxpar =3D 0; virCheckFlags(VIR_TYPED_PARAM_STRING_OKAY, -1); @@ -18981,36 +18979,20 @@ qemuDomainGetSEVInfo(virDomainObj *vm, if (rv < 0) goto endjob; - if (virTypedParamsAddString(params, nparams, &maxpar, - VIR_DOMAIN_LAUNCH_SECURITY_SEV_MEASUREMENT, - tmp) < 0) - goto endjob; - if (virTypedParamsAddUInt(params, nparams, &maxpar, - VIR_DOMAIN_LAUNCH_SECURITY_SEV_API_MAJOR, - info.apiMajor) < 0) - goto endjob; - if (virTypedParamsAddUInt(params, nparams, &maxpar, - VIR_DOMAIN_LAUNCH_SECURITY_SEV_API_MINOR, - info.apiMinor) < 0) - goto endjob; - if (virTypedParamsAddUInt(params, nparams, &maxpar, - VIR_DOMAIN_LAUNCH_SECURITY_SEV_BUILD_ID, - info.buildID) < 0) - goto endjob; + virTypedParamListAddString(list, tmp, VIR_DOMAIN_LAUNCH_SECURITY_SEV_M= EASUREMENT); + virTypedParamListAddUInt(list, info.apiMajor, VIR_DOMAIN_LAUNCH_SECURI= TY_SEV_API_MAJOR); + virTypedParamListAddUInt(list, info.apiMinor, VIR_DOMAIN_LAUNCH_SECURI= TY_SEV_API_MINOR); + virTypedParamListAddUInt(list, info.buildID, VIR_DOMAIN_LAUNCH_SECURIT= Y_SEV_BUILD_ID); switch (info.type) { case QEMU_MONITOR_SEV_GUEST_TYPE_SEV: - if (virTypedParamsAddUInt(params, nparams, &maxpar, - VIR_DOMAIN_LAUNCH_SECURITY_SEV_POLICY, - info.data.sev.policy) < 0) - goto endjob; + virTypedParamListAddUInt(list, info.data.sev.policy, + VIR_DOMAIN_LAUNCH_SECURITY_SEV_POLICY); break; case QEMU_MONITOR_SEV_GUEST_TYPE_SEV_SNP: - if (virTypedParamsAddULLong(params, nparams, &maxpar, - VIR_DOMAIN_LAUNCH_SECURITY_SEV_SNP_POL= ICY, - info.data.sev_snp.snp_policy) < 0) - goto endjob; + virTypedParamListAddULLong(list, info.data.sev_snp.snp_policy, + VIR_DOMAIN_LAUNCH_SECURITY_SEV_SNP_POLI= CY); break; case QEMU_MONITOR_SEV_GUEST_TYPE_LAST: @@ -19031,6 +19013,7 @@ qemuDomainGetLaunchSecurityInfo(virDomainPtr domain, int *nparams, unsigned int flags) { + g_autoptr(virTypedParamList) list =3D virTypedParamListNew(); virDomainObj *vm; int ret =3D -1; @@ -19048,7 +19031,7 @@ qemuDomainGetLaunchSecurityInfo(virDomainPtr domain, switch (vm->def->sec->sectype) { case VIR_DOMAIN_LAUNCH_SECURITY_SEV: case VIR_DOMAIN_LAUNCH_SECURITY_SEV_SNP: - if (qemuDomainGetSEVInfo(vm, params, nparams, flags) < 0) + if (qemuDomainGetSEVInfo(vm, list, flags) < 0) goto cleanup; break; case VIR_DOMAIN_LAUNCH_SECURITY_PV: @@ -19059,6 +19042,9 @@ qemuDomainGetLaunchSecurityInfo(virDomainPtr domain, goto cleanup; } + if (virTypedParamListSteal(list, params, nparams) < 0) + goto cleanup; + ret =3D 0; cleanup: --=20 2.48.1 From nobody Wed Mar 12 13:49:26 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=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 1741694459175979.8216318500661; Tue, 11 Mar 2025 05:00:59 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 25E581C27; Tue, 11 Mar 2025 08:00:58 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id B12261CED; Tue, 11 Mar 2025 07:59:21 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 1898A1BE1; Tue, 11 Mar 2025 07:59:18 -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 308891C29 for ; Tue, 11 Mar 2025 07:59:13 -0400 (EDT) Received: from mx-prod-mc-02.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-418-QJ_7L3jjNle7_AWFu1OiCg-1; Tue, 11 Mar 2025 07:59:11 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5340E19560BE for ; Tue, 11 Mar 2025 11:59:10 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.2]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 7CEAE19560AB for ; Tue, 11 Mar 2025 11:59:09 +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=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,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; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741694352; 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=sFFF0se2sJXKyklbqxvbP5H2vvPqbutjB633ehI0S+Q=; b=X8V1sW6tNyfzzfsmtAyoW2oX9u6fPNaNqYlqjKQSvvmb2OTFwdZm6OkROqeHNbDp1lIP2V BlhfNT9+Q+uoZO7q5pNc1X8216aD3BiwutCvwDaSCN7mG9T7qChFK4atpJaW7owJ9+m9bd ioIDo3DClABkQwEZzbddS6pLEDLB/CY= X-MC-Unique: QJ_7L3jjNle7_AWFu1OiCg-1 X-Mimecast-MFC-AGG-ID: QJ_7L3jjNle7_AWFu1OiCg_1741694350 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 3/3] qemuNodeGetSEVInfo: Use virTypedParamList to construct return value Date: Tue, 11 Mar 2025 12:59:03 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: lvzYiTLWgwRIivLjvvzHEW34Ku_bbAwozJwYcgkyP-M_1741694350 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: EFBDFOIUT3IMIWCP2OFUIWCCDMNW3242 X-Message-ID-Hash: EFBDFOIUT3IMIWCP2OFUIWCCDMNW3242 X-MailFrom: pkrempa@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: 1741694461414019100 Content-Type: text/plain; charset="utf-8" Simplify the code by using the modern helpers. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- src/qemu/qemu_driver.c | 63 +++++++++++------------------------------- 1 file changed, 16 insertions(+), 47 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a40db1dd2e..2cabc7ee2f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -18859,58 +18859,22 @@ qemuDomainSetLifecycleAction(virDomainPtr dom, } -static int +static void qemuGetSEVInfoToParams(virQEMUCaps *qemuCaps, - virTypedParameterPtr *params, - int *nparams, - unsigned int flags) + virTypedParamList *list) { - int maxpar =3D 0; - int n =3D 0; virSEVCapability *sev =3D virQEMUCapsGetSEVCapabilities(qemuCaps); - virTypedParameterPtr sevParams =3D NULL; - - virCheckFlags(VIR_TYPED_PARAM_STRING_OKAY, -1); - - if (virTypedParamsAddString(&sevParams, &n, &maxpar, - VIR_NODE_SEV_PDH, sev->pdh) < 0) - return -1; - - if (virTypedParamsAddString(&sevParams, &n, &maxpar, - VIR_NODE_SEV_CERT_CHAIN, sev->cert_chain) = < 0) - goto cleanup; - - if ((sev->cpu0_id !=3D NULL) && - (virTypedParamsAddString(&sevParams, &n, &maxpar, - VIR_NODE_SEV_CPU0_ID, sev->cpu0_id) < 0)) - goto cleanup; - if (virTypedParamsAddUInt(&sevParams, &n, &maxpar, - VIR_NODE_SEV_CBITPOS, sev->cbitpos) < 0) - goto cleanup; - - if (virTypedParamsAddUInt(&sevParams, &n, &maxpar, - VIR_NODE_SEV_REDUCED_PHYS_BITS, - sev->reduced_phys_bits) < 0) - goto cleanup; - - if (virTypedParamsAddUInt(&sevParams, &n, &maxpar, - VIR_NODE_SEV_MAX_GUESTS, - sev->max_guests) < 0) - goto cleanup; - - if (virTypedParamsAddUInt(&sevParams, &n, &maxpar, - VIR_NODE_SEV_MAX_ES_GUESTS, - sev->max_es_guests) < 0) - goto cleanup; + virTypedParamListAddString(list, sev->pdh, VIR_NODE_SEV_PDH); + virTypedParamListAddString(list, sev->cert_chain, VIR_NODE_SEV_CERT_CH= AIN); - *params =3D g_steal_pointer(&sevParams); - *nparams =3D n; - return 0; + if (sev->cpu0_id !=3D NULL) + virTypedParamListAddString(list, sev->cpu0_id, VIR_NODE_SEV_CPU0_I= D); - cleanup: - virTypedParamsFree(sevParams, n); - return -1; + virTypedParamListAddUInt(list, sev->cbitpos, VIR_NODE_SEV_CBITPOS); + virTypedParamListAddUInt(list, sev->reduced_phys_bits, VIR_NODE_SEV_RE= DUCED_PHYS_BITS); + virTypedParamListAddUInt(list, sev->max_guests, VIR_NODE_SEV_MAX_GUEST= S); + virTypedParamListAddUInt(list, sev->max_es_guests, VIR_NODE_SEV_MAX_ES= _GUESTS); } @@ -18920,9 +18884,12 @@ qemuNodeGetSEVInfo(virConnectPtr conn, int *nparams, unsigned int flags) { + g_autoptr(virTypedParamList) list =3D virTypedParamListNew(); virQEMUDriver *driver =3D conn->privateData; g_autoptr(virQEMUCaps) qemucaps =3D NULL; + virCheckFlags(VIR_TYPED_PARAM_STRING_OKAY, -1); + if (virNodeGetSevInfoEnsureACL(conn) < 0) return -1; @@ -18939,7 +18906,9 @@ qemuNodeGetSEVInfo(virConnectPtr conn, return -1; } - if (qemuGetSEVInfoToParams(qemucaps, params, nparams, flags) < 0) + qemuGetSEVInfoToParams(qemucaps, list); + + if (virTypedParamListSteal(list, params, nparams) < 0) return -1; return 0; --=20 2.48.1