From nobody Mon Feb 9 12:25:40 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=1643018957; cv=none; d=zohomail.com; s=zohoarc; b=cF+xQgfrXgQbtNzw+ZZ6axdOfOPpS5Tj7I6lJRm3j8aRq60loI8jI/YggXrJrMe6taulOzGkLq55YHL4slPnQiB8qlCxpWQZUkiFJvdjUFRI7aMcx+Xkmt8+6X6RUo+101RzpsQZXuIutaOH0AY7omgHfXF1JoXcOjTKsidFRhs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1643018957; 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=rWuZUEyww6H35x8o74eMJntwbv3SAYfJ8hHg1th05FI=; b=Csm1AQIHw/oCUSlQ/ZuEaSuMwnhivQkVKMO3jz0ecAwWNOEjuKSOUUap3yQcJNgctWgcQs0pLtHRdwnEcxCnwT2S3be4jSbLqnnrPprMSc/vltxPsMOJ6yyjy2G51oo8NQBGCH2bF8/agC+zwyW/FE1TZGwxt0Y00cCjt+xrU/c= 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 1643018957554738.5148190144793; Mon, 24 Jan 2022 02:09:17 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-300-49kCG9wENQSoEAwaqeWg2w-1; Mon, 24 Jan 2022 05:09:15 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 807681091DAD; Mon, 24 Jan 2022 10:09:10 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6076660C4F; Mon, 24 Jan 2022 10:09:10 +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 318E94A7C9; Mon, 24 Jan 2022 10:09:10 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 20OA8Bxa021125 for ; Mon, 24 Jan 2022 05:08:11 -0500 Received: by smtp.corp.redhat.com (Postfix) id C5D1C6F12B; Mon, 24 Jan 2022 10:08:11 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.195.147]) by smtp.corp.redhat.com (Postfix) with ESMTP id 390416F125 for ; Mon, 24 Jan 2022 10:07:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1643018956; 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=rWuZUEyww6H35x8o74eMJntwbv3SAYfJ8hHg1th05FI=; b=SXOGhI8oBkgooo9E8zL/EqlK+kgdhon5tVnRJxdl930Bs5K9moG+oBucSIkymJi0zilo1E PNUANG7ouLqCHFuhLixKH7yUlzsIHH13ctA3nWSGLJu/HGkXVOTfYrrqza9LiD+AqLUK5M nGEk6DdFH2rwwGZy0js5UtDsuyRhTJc= X-MC-Unique: 49kCG9wENQSoEAwaqeWg2w-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 06/11] conf: Fix @tickpolicy member of _virDomainTimerDef struct Date: Mon, 24 Jan 2022 11:07:28 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com 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.14 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: 1643018959532100003 Content-Type: text/plain; charset="utf-8" The @tickpolicy member of the _virDomainTimerDef struct stores values of the virDomainTimerTickpolicyType enum, or -1 for the default value (when user provided no value in XML). This is needlessly complicated. Introduce new value to the enum which reflects the default state. Signed-off-by: Michal Privoznik --- src/conf/domain_conf.c | 19 ++++++------------- src/conf/domain_conf.h | 5 +++-- src/libxl/xen_common.c | 4 ++-- src/qemu/qemu_command.c | 6 +++--- src/qemu/qemu_validate.c | 6 +++--- 5 files changed, 17 insertions(+), 23 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index fbe21c4fd2..ec12c6d8dd 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1196,6 +1196,7 @@ VIR_ENUM_IMPL(virDomainTimerTrack, =20 VIR_ENUM_IMPL(virDomainTimerTickpolicy, VIR_DOMAIN_TIMER_TICKPOLICY_LAST, + "none", "delay", "catchup", "merge", @@ -4970,7 +4971,7 @@ virDomainDefPostParseTimer(virDomainDef *def) =20 if (timer->name =3D=3D VIR_DOMAIN_TIMER_NAME_KVMCLOCK || timer->name =3D=3D VIR_DOMAIN_TIMER_NAME_HYPERVCLOCK) { - if (timer->tickpolicy !=3D -1) { + if (timer->tickpolicy) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("timer %s doesn't support setting of " "timer tickpolicy"), @@ -12023,10 +12024,9 @@ virDomainTimerDefParseXML(xmlNodePtr node, &def->present) < 0) goto error; =20 - def->tickpolicy =3D -1; tickpolicy =3D virXMLPropString(node, "tickpolicy"); if (tickpolicy !=3D NULL) { - if ((def->tickpolicy =3D virDomainTimerTickpolicyTypeFromString(ti= ckpolicy)) < 0) { + if ((def->tickpolicy =3D virDomainTimerTickpolicyTypeFromString(ti= ckpolicy)) <=3D 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown timer tickpolicy '%s'"), tickpolicy); goto error; @@ -26118,16 +26118,9 @@ virDomainTimerDefFormat(virBuffer *buf, virTristateBoolTypeToString(def->present)); } =20 - if (def->tickpolicy !=3D -1) { - const char *tickpolicy - =3D virDomainTimerTickpolicyTypeToString(def->tickpolicy); - if (!tickpolicy) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected timer tickpolicy %d"), - def->tickpolicy); - return -1; - } - virBufferAsprintf(buf, " tickpolicy=3D'%s'", tickpolicy); + if (def->tickpolicy) { + virBufferAsprintf(buf, " tickpolicy=3D'%s'", + virDomainTimerTickpolicyTypeToString(def->tickpo= licy)); } =20 if ((def->name =3D=3D VIR_DOMAIN_TIMER_NAME_PLATFORM) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index f995cbc045..1ccc63706a 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2371,7 +2371,8 @@ typedef enum { } virDomainTimerTrackType; =20 typedef enum { - VIR_DOMAIN_TIMER_TICKPOLICY_DELAY =3D 0, + VIR_DOMAIN_TIMER_TICKPOLICY_NONE =3D 0, + VIR_DOMAIN_TIMER_TICKPOLICY_DELAY, VIR_DOMAIN_TIMER_TICKPOLICY_CATCHUP, VIR_DOMAIN_TIMER_TICKPOLICY_MERGE, VIR_DOMAIN_TIMER_TICKPOLICY_DISCARD, @@ -2410,7 +2411,7 @@ struct _virDomainTimerCatchupDef { struct _virDomainTimerDef { int name; virTristateBool present; - int tickpolicy; /* none|catchup|merge|discard */ + int tickpolicy; /* enum virDomainTimerTickpolicyType */ =20 virDomainTimerCatchupDef catchup; =20 diff --git a/src/libxl/xen_common.c b/src/libxl/xen_common.c index 0679f441cc..4c8bf39ddc 100644 --- a/src/libxl/xen_common.c +++ b/src/libxl/xen_common.c @@ -554,7 +554,7 @@ xenParseHypervisorFeatures(virConf *conf, virDomainDef = *def) timer =3D g_new0(virDomainTimerDef, 1); timer->name =3D VIR_DOMAIN_TIMER_NAME_TSC; timer->present =3D VIR_TRISTATE_BOOL_YES; - timer->tickpolicy =3D -1; + timer->tickpolicy =3D VIR_DOMAIN_TIMER_TICKPOLICY_NONE; timer->mode =3D VIR_DOMAIN_TIMER_MODE_AUTO; timer->track =3D -1; if (STREQ_NULLABLE(tscmode, "always_emulate")) @@ -630,7 +630,7 @@ xenParseHypervisorFeatures(virConf *conf, virDomainDef = *def) } else { timer->present =3D VIR_TRISTATE_BOOL_NO; } - timer->tickpolicy =3D -1; + timer->tickpolicy =3D VIR_DOMAIN_TIMER_TICKPOLICY_NONE; timer->mode =3D -1; timer->track =3D -1; =20 diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index a62d3f36ae..f0429532f8 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6206,7 +6206,7 @@ qemuBuildClockArgStr(virDomainClockDef *def) } =20 switch (def->timers[i]->tickpolicy) { - case -1: + case VIR_DOMAIN_TIMER_TICKPOLICY_NONE: case VIR_DOMAIN_TIMER_TICKPOLICY_DELAY: /* This is the default - missed ticks delivered when next scheduled, at normal rate */ @@ -6269,7 +6269,7 @@ qemuBuildClockCommandLine(virCommand *cmd, =20 case VIR_DOMAIN_TIMER_NAME_PIT: switch (def->clock.timers[i]->tickpolicy) { - case -1: + case VIR_DOMAIN_TIMER_TICKPOLICY_NONE: case VIR_DOMAIN_TIMER_TICKPOLICY_DELAY: /* delay is the default if we don't have kernel (kvm-pit), otherwise, the default is catchup. */ @@ -6659,7 +6659,7 @@ qemuBuildCpuCommandLine(virCommand *cmd, case VIR_DOMAIN_TIMER_TICKPOLICY_DISCARD: virBufferAddLit(&buf, ",kvm-no-adjvtime=3Don"); break; - case -1: + case VIR_DOMAIN_TIMER_TICKPOLICY_NONE: case VIR_DOMAIN_TIMER_TICKPOLICY_CATCHUP: case VIR_DOMAIN_TIMER_TICKPOLICY_MERGE: break; diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index b62e49a5bc..f52217497a 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -441,7 +441,7 @@ qemuValidateDomainDefClockTimers(const virDomainDef *de= f, } =20 switch (timer->tickpolicy) { - case -1: + case VIR_DOMAIN_TIMER_TICKPOLICY_NONE: case VIR_DOMAIN_TIMER_TICKPOLICY_DELAY: /* This is the default - missed ticks delivered when next scheduled, at normal rate */ @@ -461,7 +461,7 @@ qemuValidateDomainDefClockTimers(const virDomainDef *de= f, =20 case VIR_DOMAIN_TIMER_NAME_PIT: switch (timer->tickpolicy) { - case -1: + case VIR_DOMAIN_TIMER_TICKPOLICY_NONE: case VIR_DOMAIN_TIMER_TICKPOLICY_DELAY: case VIR_DOMAIN_TIMER_TICKPOLICY_DISCARD: break; @@ -523,7 +523,7 @@ qemuValidateDomainDefClockTimers(const virDomainDef *de= f, } =20 switch (timer->tickpolicy) { - case -1: + case VIR_DOMAIN_TIMER_TICKPOLICY_NONE: case VIR_DOMAIN_TIMER_TICKPOLICY_DELAY: case VIR_DOMAIN_TIMER_TICKPOLICY_DISCARD: break; --=20 2.34.1