From nobody Mon Feb 9 03:14:29 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1680183665; cv=none; d=zohomail.com; s=zohoarc; b=TdbY7W9IH2iN5NKpE5DZN3pNC/xH08atEo7fEq2vf40C9rnDtA6gLMQbTloR64cII2xTCZqKGAl3AkUxb5hZUJrg8nNGav8ZfCfB/jkxILui4DLxmmYM+hvVCDu0+uxUqQkcFOeJaeFYMOufEGbzrqToSiUCKrHwR0ennwCzQRE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680183665; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=lyYzPtrCDT1LbqOPa8IMLWiWKCwcr95XKeEVmJUPghk=; b=J7blZjf9KbAQXfe9GcF2kLT9eRORRDAdmHKGrLfkDyXBO6R9Ocb50XddEBqk5ZaU3L6MX1cZcSINP9WUy8PtdaNUf65H0NCZ722kE4WNscUUBB4Ap9mZfCbaOXWCPeHmI96j7i5xN6t1dctaASitwRS0XOePCtcHlzX9ye4cISo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1680183665246434.4906132789755; Thu, 30 Mar 2023 06:41:05 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-634-2RWCuL7pP2eNiNHmF1zarQ-1; Thu, 30 Mar 2023 09:41:01 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5B48A1C075B9; Thu, 30 Mar 2023 13:40:58 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4540B2027040; Thu, 30 Mar 2023 13:40:58 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 595F9194A42F; Thu, 30 Mar 2023 13:39:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 2836619465B5 for ; Thu, 30 Mar 2023 13:38:55 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id F39302166B37; Thu, 30 Mar 2023 13:38:54 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7A68D2166B33 for ; Thu, 30 Mar 2023 13:38:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680183664; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=lyYzPtrCDT1LbqOPa8IMLWiWKCwcr95XKeEVmJUPghk=; b=JLFPs9IR8BMlY+v9YDFMHBR6im/ioKSXV3o+xluBkpIu9JkWruULMkmqzyUQpM9aJoz6xM oMSW3WCr49wr+ChRaYnD8svBnHx1/fHRDdmqfPHNOPVs68VxpSw4MCnp62b8A9im8VW5Gs PmA9M2v4N3tvFNVLhTtBqpxODrPkhLg= X-MC-Unique: 2RWCuL7pP2eNiNHmF1zarQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 29/31] qemuValidateDomainDefPSeriesFeature: Simplify feature validation Date: Thu, 30 Mar 2023 15:38:23 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1680183907077100001 Content-Type: text/plain; charset="utf-8" Unify validation of VIR_DOMAIN_FEATURE_HTM, VIR_DOMAIN_FEATURE_NESTED_HV, VIR_DOMAIN_FEATURE_CCF_ASSIST and remove temporary string. Signed-off-by: Peter Krempa --- src/qemu/qemu_validate.c | 33 ++++++--------------------------- 1 file changed, 6 insertions(+), 27 deletions(-) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 793990c4ca..83f2502e6a 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -39,8 +39,6 @@ static int qemuValidateDomainDefPSeriesFeature(const virDomainDef *def, int feature) { - const char *str; - if (def->features[feature] =3D=3D VIR_TRISTATE_SWITCH_ABSENT) return 0; @@ -59,8 +57,7 @@ qemuValidateDomainDefPSeriesFeature(const virDomainDef *d= ef, break; if (def->hpt_resizing !=3D VIR_DOMAIN_HPT_RESIZING_NONE) { - str =3D virDomainHPTResizingTypeToString(def->hpt_resizing); - if (!str) { + if (!virDomainHPTResizingTypeToString(def->hpt_resizing)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Invalid setting for HPT resizing")); return -1; @@ -69,33 +66,15 @@ qemuValidateDomainDefPSeriesFeature(const virDomainDef = *def, break; case VIR_DOMAIN_FEATURE_HTM: - str =3D virTristateSwitchTypeToString(def->features[feature]); - if (!str) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Invalid setting for HTM state")); - return -1; - } - - break; - case VIR_DOMAIN_FEATURE_NESTED_HV: - str =3D virTristateSwitchTypeToString(def->features[feature]); - if (!str) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Invalid setting for nested HV state")); - return -1; - } - - break; - case VIR_DOMAIN_FEATURE_CCF_ASSIST: - str =3D virTristateSwitchTypeToString(def->features[feature]); - if (!str) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Invalid setting for ccf-assist state")); + if (!virTristateSwitchTypeToString(def->features[feature])) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Invalid setting for pseries feature '%s'"), + virDomainFeatureTypeToString(feature)); + return -1; } - break; case VIR_DOMAIN_FEATURE_CFPC: --=20 2.39.2