From nobody Tue Feb 10 01:15:23 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1649405529; cv=none; d=zohomail.com; s=zohoarc; b=RnJuADmZh7rRExaZMWHNzM52NMRrteXK7u9I5UIZ3s942uDN/hnUSNNwi2D26B0CIAtFbbF8cIh7uSmjw2GnSRP9w1UZ6SVT44Thu6ycD89Qub6neiHoAGbizvNfWIWztfYSclHsQhIq2whbfih4IP6xmIxceqrVXySudvT095M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1649405529; 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=y8RSt7iYauscycAGWfpajIOYGLCinC7ul6XtEcI0fO0=; b=QCUZgQtip9ktWQ+XcEnURMawS7a3SWuvUGFfut8Al5qCtRNHSgrE15noTJR67H9E0Ywjn0i7kyT9X5JGVCSw404d2yCp9VQnXCjrn9oiYyk1LsCnxvcDdcADnZNquhwzkIVYeGTP3+1jsBzoAUxSBxfvCljywcINTk59ePGYXz0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1649405529309527.0397917436164; Fri, 8 Apr 2022 01:12:09 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-88-AoXD_4d-N-KqMJgl-dm_Wg-1; Fri, 08 Apr 2022 04:11:02 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B77251014A86; Fri, 8 Apr 2022 08:10:57 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9C2344066C9F; Fri, 8 Apr 2022 08:10:57 +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 3A51C1940354; Fri, 8 Apr 2022 08:10:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id D28DE1940341 for ; Fri, 8 Apr 2022 08:10:55 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id B6FEB54ACBF; Fri, 8 Apr 2022 08:10:55 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.180]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5EADB54ACB0 for ; Fri, 8 Apr 2022 08:10:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1649405528; 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=y8RSt7iYauscycAGWfpajIOYGLCinC7ul6XtEcI0fO0=; b=Z+7eXx0t4txR4TUnS99eIiF0dp50A1aN8eFIJvFohFSKjy8vLh8Ex6RAAq7qbPZ5SAdLus rldLTrG6hm7T9O6pIVK20D4zBHOs28PdYuEc95mmfJ0Tz72vCSaJNrJXS7nvH8bHLyV/2z ldLPV8i33OFPoe4SpGFJNLPVMgV04SI= X-MC-Unique: AoXD_4d-N-KqMJgl-dm_Wg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 14/17] virDomainPanicDefParseXML: Switch to virXMLPropEnumDefault() Date: Fri, 8 Apr 2022 10:08:53 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 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 2.84 on 10.11.54.1 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com 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: 1649405530790100003 Content-Type: text/plain; charset="utf-8"; x-default="true" The virDomainPanicDefParseXML() function uses old style of parsing XML (virXMLPropString + str2enum conversion). Use virXMLPropEnumDefault() which encapsulates those steps. Signed-off-by: Michal Privoznik --- src/conf/domain_conf.c | 11 ++++------- src/conf/domain_conf.h | 2 +- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_validate.c | 2 +- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 1f18bab332..678b9265c7 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11755,7 +11755,6 @@ virDomainPanicDefParseXML(virDomainXMLOption *xmlop= t, unsigned int flags) { virDomainPanicDef *panic; - g_autofree char *model =3D NULL; =20 panic =3D g_new0(virDomainPanicDef, 1); =20 @@ -11763,13 +11762,11 @@ virDomainPanicDefParseXML(virDomainXMLOption *xml= opt, &panic->info, flags) < 0) goto error; =20 - model =3D virXMLPropString(node, "model"); - if (model !=3D NULL && - (panic->model =3D virDomainPanicModelTypeFromString(model)) < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown panic model '%s'"), model); + if (virXMLPropEnum(node, "model", + virDomainPanicModelTypeFromString, + VIR_XML_PROP_NONE, + &panic->model) < 0) goto error; - } =20 return panic; =20 diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 9891a5e276..9a0b962ec8 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2596,7 +2596,7 @@ typedef enum { } virDomainPanicModel; =20 struct _virDomainPanicDef { - int model; /* virDomainPanicModel */ + virDomainPanicModel model; virDomainDeviceInfo info; }; =20 diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 4dd803642a..72bca45dc4 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9976,7 +9976,7 @@ qemuBuildPanicCommandLine(virCommand *cmd, size_t i; =20 for (i =3D 0; i < def->npanics; i++) { - switch ((virDomainPanicModel) def->panics[i]->model) { + switch (def->panics[i]->model) { case VIR_DOMAIN_PANIC_MODEL_ISA: { g_autoptr(virJSONValue) props =3D NULL; =20 diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index d30ffeb3ea..d4f0ea03e8 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -935,7 +935,7 @@ qemuValidateDomainDefPanic(const virDomainDef *def, size_t i; =20 for (i =3D 0; i < def->npanics; i++) { - switch ((virDomainPanicModel) def->panics[i]->model) { + switch (def->panics[i]->model) { case VIR_DOMAIN_PANIC_MODEL_S390: /* For s390 guests, the hardware provides the same * functionality as the pvpanic device. The address --=20 2.35.1