From nobody Sun Feb 8 13:39:49 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 15081520344391018.605465792628; Mon, 16 Oct 2017 04:07:14 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6BDF0C04AC62; Mon, 16 Oct 2017 11:07:13 +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 4647E5C8B4; Mon, 16 Oct 2017 11:07:13 +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 0CB0018355DD; Mon, 16 Oct 2017 11:07:13 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v9GB6XWu008667 for ; Mon, 16 Oct 2017 07:06:33 -0400 Received: by smtp.corp.redhat.com (Postfix) id 73EAF5D964; Mon, 16 Oct 2017 11:06:33 +0000 (UTC) Received: from antique-work.brq.redhat.com (unknown [10.43.2.152]) by smtp.corp.redhat.com (Postfix) with ESMTP id F08355D961 for ; Mon, 16 Oct 2017 11:06:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 6BDF0C04AC62 Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=libvir-list-bounces@redhat.com From: Pavel Hrdina To: libvir-list@redhat.com Date: Mon, 16 Oct 2017 13:06:15 +0200 Message-Id: <00865e3a8f35b8026eccaed7df45c6595f6f8eb9.1508151956.git.phrdina@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 02/14] conf: rename virDomainLifecycleAction enum functions 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Mon, 16 Oct 2017 11:07:13 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina --- src/conf/domain_conf.c | 10 +++++----- src/conf/domain_conf.h | 2 +- src/libvirt_private.syms | 4 ++-- src/xenconfig/xen_common.c | 8 ++++---- src/xenconfig/xen_sxpr.c | 8 ++++---- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index fe2c3a29b6..39a4c4d80f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -208,7 +208,7 @@ VIR_ENUM_IMPL(virDomainCapsFeature, VIR_DOMAIN_CAPS_FEA= TURE_LAST, "syslog", "wake_alarm") =20 -VIR_ENUM_IMPL(virDomainLifecycle, VIR_DOMAIN_LIFECYCLE_ACTION_LAST, +VIR_ENUM_IMPL(virDomainLifecycleAction, VIR_DOMAIN_LIFECYCLE_ACTION_LAST, "destroy", "restart", "rename-restart", @@ -18584,14 +18584,14 @@ virDomainDefParseXML(xmlDocPtr xml, "string(./on_reboot[1])", &def->onReboot, VIR_DOMAIN_LIFECYCLE_ACTION_RESTART, - virDomainLifecycleTypeFromString) < 0) + virDomainLifecycleActionTypeFromStrin= g) < 0) goto error; =20 if (virDomainEventActionParseXML(ctxt, "on_poweroff", "string(./on_poweroff[1])", &def->onPoweroff, VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY, - virDomainLifecycleTypeFromString) < 0) + virDomainLifecycleActionTypeFromStrin= g) < 0) goto error; =20 if (virDomainEventActionParseXML(ctxt, "on_crash", @@ -25862,11 +25862,11 @@ virDomainDefFormatInternal(virDomainDefPtr def, =20 if (virDomainEventActionDefFormat(buf, def->onPoweroff, "on_poweroff", - virDomainLifecycleTypeToString) < 0) + virDomainLifecycleActionTypeToString= ) < 0) goto error; if (virDomainEventActionDefFormat(buf, def->onReboot, "on_reboot", - virDomainLifecycleTypeToString) < 0) + virDomainLifecycleActionTypeToString= ) < 0) goto error; if (virDomainEventActionDefFormat(buf, def->onCrash, "on_crash", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 4a821fb0f2..a284a40f80 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3211,7 +3211,7 @@ VIR_ENUM_DECL(virDomainBoot) VIR_ENUM_DECL(virDomainFeature) VIR_ENUM_DECL(virDomainCapabilitiesPolicy) VIR_ENUM_DECL(virDomainCapsFeature) -VIR_ENUM_DECL(virDomainLifecycle) +VIR_ENUM_DECL(virDomainLifecycleAction) VIR_ENUM_DECL(virDomainLifecycleCrash) VIR_ENUM_DECL(virDomainDevice) VIR_ENUM_DECL(virDomainDeviceAddress) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 4c56f17e29..1fef62a0cb 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -400,10 +400,10 @@ virDomainLeaseInsertPreAlloc; virDomainLeaseInsertPreAlloced; virDomainLeaseRemove; virDomainLeaseRemoveAt; +virDomainLifecycleActionTypeFromString; +virDomainLifecycleActionTypeToString; virDomainLifecycleCrashTypeFromString; virDomainLifecycleCrashTypeToString; -virDomainLifecycleTypeFromString; -virDomainLifecycleTypeToString; virDomainLoaderDefFree; virDomainLoaderTypeFromString; virDomainLoaderTypeToString; diff --git a/src/xenconfig/xen_common.c b/src/xenconfig/xen_common.c index 6d7dc2cde4..a3b82c178e 100644 --- a/src/xenconfig/xen_common.c +++ b/src/xenconfig/xen_common.c @@ -361,7 +361,7 @@ xenParseEventsActions(virConfPtr conf, virDomainDefPtr = def) if (xenConfigGetString(conf, "on_poweroff", &str, "destroy") < 0) return -1; =20 - if ((def->onPoweroff =3D virDomainLifecycleTypeFromString(str)) < 0) { + if ((def->onPoweroff =3D virDomainLifecycleActionTypeFromString(str)) = < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("unexpected value %s for on_poweroff"), str); return -1; @@ -370,7 +370,7 @@ xenParseEventsActions(virConfPtr conf, virDomainDefPtr = def) if (xenConfigGetString(conf, "on_reboot", &str, "restart") < 0) return -1; =20 - if ((def->onReboot =3D virDomainLifecycleTypeFromString(str)) < 0) { + if ((def->onReboot =3D virDomainLifecycleActionTypeFromString(str)) < = 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("unexpected value %s for on_reboot"), str); return -1; @@ -1449,7 +1449,7 @@ xenFormatEventActions(virConfPtr conf, virDomainDefPt= r def) { const char *lifecycle =3D NULL; =20 - if (!(lifecycle =3D virDomainLifecycleTypeToString(def->onPoweroff))) { + if (!(lifecycle =3D virDomainLifecycleActionTypeToString(def->onPowero= ff))) { virReportError(VIR_ERR_INTERNAL_ERROR, _("unexpected lifecycle action %d"), def->onPowerof= f); return -1; @@ -1458,7 +1458,7 @@ xenFormatEventActions(virConfPtr conf, virDomainDefPt= r def) return -1; =20 =20 - if (!(lifecycle =3D virDomainLifecycleTypeToString(def->onReboot))) { + if (!(lifecycle =3D virDomainLifecycleActionTypeToString(def->onReboot= ))) { virReportError(VIR_ERR_INTERNAL_ERROR, _("unexpected lifecycle action %d"), def->onReboot); return -1; diff --git a/src/xenconfig/xen_sxpr.c b/src/xenconfig/xen_sxpr.c index cf62215e54..d26026fed2 100644 --- a/src/xenconfig/xen_sxpr.c +++ b/src/xenconfig/xen_sxpr.c @@ -1245,7 +1245,7 @@ xenParseSxpr(const struct sexpr *root, =20 tmp =3D sexpr_node(root, "domain/on_poweroff"); if (tmp !=3D NULL) { - if ((def->onPoweroff =3D virDomainLifecycleTypeFromString(tmp)) < = 0) { + if ((def->onPoweroff =3D virDomainLifecycleActionTypeFromString(tm= p)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("unknown lifecycle type %s"), tmp); goto error; @@ -1256,7 +1256,7 @@ xenParseSxpr(const struct sexpr *root, =20 tmp =3D sexpr_node(root, "domain/on_reboot"); if (tmp !=3D NULL) { - if ((def->onReboot =3D virDomainLifecycleTypeFromString(tmp)) < 0)= { + if ((def->onReboot =3D virDomainLifecycleActionTypeFromString(tmp)= ) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("unknown lifecycle type %s"), tmp); goto error; @@ -2214,14 +2214,14 @@ xenFormatSxpr(virConnectPtr conn, virDomainDefPtr d= ef) virBufferEscapeSexpr(&buf, "(bootloader_args '%s')", def->os.b= ootloaderArgs); } =20 - if (!(tmp =3D virDomainLifecycleTypeToString(def->onPoweroff))) { + if (!(tmp =3D virDomainLifecycleActionTypeToString(def->onPoweroff))) { virReportError(VIR_ERR_INTERNAL_ERROR, _("unexpected lifecycle value %d"), def->onPoweroff= ); goto error; } virBufferAsprintf(&buf, "(on_poweroff '%s')", tmp); =20 - if (!(tmp =3D virDomainLifecycleTypeToString(def->onReboot))) { + if (!(tmp =3D virDomainLifecycleActionTypeToString(def->onReboot))) { virReportError(VIR_ERR_INTERNAL_ERROR, _("unexpected lifecycle value %d"), def->onReboot); goto error; --=20 2.13.6 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list