From nobody Tue Feb 10 17:08:33 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1616169506; cv=none; d=zohomail.com; s=zohoarc; b=JObiyvVTwN0TGYlh3aLHV/xrpY/6+sHFzxfkcaTkSaSbAgc4DMznJPazRgs0imRtpi2gKV3YMCwpZim5VTum4+Q1PZBIOmWUfjqMIYk2KD3CAI80wriDbLRoyi2ZhyQCsnEtMCEolv3mMZC67JU1eKbFMtqzh0zSzDvMOl5RRL0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169506; h=Content-Type:Content-Transfer-Encoding:Cc: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=gUlO/ajlS6YK1A3eErN1ZrDnRrYJlvGphojLC48QiP8=; b=BKTyc5xkWBX+K1avZB0uETVnI/BjrkB2TE6zkTWef6x9ff9/hMR0Yb+Do1MjrbiGLxVUAT04jrfjdwW8jOHfSFoSbcjs/BzBU2iiSZ6chEylADuo6AmbgMhR/bnD1Um0dZES9sgF2hsvItwGA5mWLj4l0c2SAkRsraIbbAh6bE4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1616169506630155.02998140132354; Fri, 19 Mar 2021 08:58:26 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-47-pZSUk2l7OxacKm6WMYs8IQ-1; Fri, 19 Mar 2021 11:58:23 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E01C483DD32; Fri, 19 Mar 2021 15:58:15 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BB4E450EDE; Fri, 19 Mar 2021 15:58:15 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 76EDE1802138; Fri, 19 Mar 2021 15:58:15 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JFvv2X006240 for ; Fri, 19 Mar 2021 11:57:57 -0400 Received: by smtp.corp.redhat.com (Postfix) id D8C8416E3A; Fri, 19 Mar 2021 15:57:57 +0000 (UTC) Received: from work.redhat.com (ovpn-112-175.ams2.redhat.com [10.36.112.175]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2868218E4B; Fri, 19 Mar 2021 15:57:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169505; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=gUlO/ajlS6YK1A3eErN1ZrDnRrYJlvGphojLC48QiP8=; b=DaAuavIDK24d9N4q2cHn4KdEqoVqDmdM4kmjnLSj+DfTsZ4XvJbCK8c/NxN27FKMQtbO2w EnmmahU8kY3F+fseQpNFKf9tqOsxAdjRjiGrsruPIReg/zpXFM54mYBIYnARESdipTECv2 53EXp4N52jZPDECDtVJbRZiDn4+9Mcg= X-MC-Unique: pZSUk2l7OxacKm6WMYs8IQ-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 04/51] conf: Use virTristateXXX in virDomainDiskDef Date: Fri, 19 Mar 2021 16:57:01 +0100 Message-Id: <20210319155748.680146-5-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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) Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake --- src/conf/domain_conf.c | 39 ++++++++++++++++++++++++--------------- src/conf/domain_conf.h | 6 +++--- 2 files changed, 27 insertions(+), 18 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 43789fa2c7..014f318dcd 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9196,27 +9196,36 @@ virDomainDiskDefDriverParseXML(virDomainDiskDefPtr = def, } VIR_FREE(tmp); =20 - if ((tmp =3D virXMLPropString(cur, "ioeventfd")) && - (def->ioeventfd =3D virTristateSwitchTypeFromString(tmp)) <=3D 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown disk ioeventfd mode '%s'"), tmp); - return -1; + if ((tmp =3D virXMLPropString(cur, "ioeventfd"))) { + int value; + if ((value =3D virTristateSwitchTypeFromString(tmp)) <=3D 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown disk ioeventfd mode '%s'"), tmp); + return -1; + } + def->ioeventfd =3D value; } VIR_FREE(tmp); =20 - if ((tmp =3D virXMLPropString(cur, "event_idx")) && - (def->event_idx =3D virTristateSwitchTypeFromString(tmp)) <=3D 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown disk event_idx mode '%s'"), tmp); - return -1; + if ((tmp =3D virXMLPropString(cur, "event_idx"))) { + int value; + if ((value =3D virTristateSwitchTypeFromString(tmp)) <=3D 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown disk event_idx mode '%s'"), tmp); + return -1; + } + def->event_idx =3D value; } VIR_FREE(tmp); =20 - if ((tmp =3D virXMLPropString(cur, "copy_on_read")) && - (def->copy_on_read =3D virTristateSwitchTypeFromString(tmp)) <=3D = 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown disk copy_on_read mode '%s'"), tmp); - return -1; + if ((tmp =3D virXMLPropString(cur, "copy_on_read"))) { + int value; + if ((value =3D virTristateSwitchTypeFromString(tmp)) <=3D 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown disk copy_on_read mode '%s'"), tmp); + return -1; + } + def->copy_on_read =3D value; } VIR_FREE(tmp); =20 diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 87bc7e8625..853cab96b5 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -568,9 +568,9 @@ struct _virDomainDiskDef { int error_policy; /* enum virDomainDiskErrorPolicy */ int rerror_policy; /* enum virDomainDiskErrorPolicy */ int iomode; /* enum virDomainDiskIo */ - int ioeventfd; /* enum virTristateSwitch */ - int event_idx; /* enum virTristateSwitch */ - int copy_on_read; /* enum virTristateSwitch */ + virTristateSwitch ioeventfd; + virTristateSwitch event_idx; + virTristateSwitch copy_on_read; int snapshot; /* virDomainSnapshotLocation, snapshot_conf.h */ int startupPolicy; /* enum virDomainStartupPolicy */ bool transient; --=20 2.26.2