From nobody Sat Feb 7 07:25:47 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; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1537296543100835.1250602449958; Tue, 18 Sep 2018 11:49:03 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 130FC8762B; Tue, 18 Sep 2018 18:49:01 +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 D21291001F5B; Tue, 18 Sep 2018 18:49:00 +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 7A48F181A13B; Tue, 18 Sep 2018 18:49:00 +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 w8IImcO5003591 for ; Tue, 18 Sep 2018 14:48:38 -0400 Received: by smtp.corp.redhat.com (Postfix) id C1A507A430; Tue, 18 Sep 2018 18:48:38 +0000 (UTC) Received: from dahmer.redhat.com (ovpn-204-17.brq.redhat.com [10.40.204.17]) by smtp.corp.redhat.com (Postfix) with ESMTP id DAACD17581; Tue, 18 Sep 2018 18:48:37 +0000 (UTC) From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= To: libvir-list@redhat.com Date: Tue, 18 Sep 2018 20:48:10 +0200 Message-Id: <20180918184818.17546-8-fidencio@redhat.com> In-Reply-To: <20180918184818.17546-1-fidencio@redhat.com> References: <20180918184818.17546-1-fidencio@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Subject: [libvirt] [libvirt PATCH v6 07/15] xen_common: Adapt xenParseEventsActions due to changes in xenConfigGetString 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: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Tue, 18 Sep 2018 18:49:01 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 xenConfigGetString returns a newly-allocated pointer and it has to be freed by the caller. Signed-off-by: Fabiano Fid=C3=AAncio --- src/xenconfig/xen_common.c | 41 ++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/src/xenconfig/xen_common.c b/src/xenconfig/xen_common.c index c044cb9672..ab4bb7ff3f 100644 --- a/src/xenconfig/xen_common.c +++ b/src/xenconfig/xen_common.c @@ -342,36 +342,43 @@ xenParseTimeOffset(virConfPtr conf, virDomainDefPtr d= ef) static int xenParseEventsActions(virConfPtr conf, virDomainDefPtr def) { - const char *str =3D NULL; + const char *on_poweroff =3D NULL, *on_reboot =3D NULL, *on_crash =3D N= ULL; + int ret =3D -1; =20 - if (xenConfigGetString(conf, "on_poweroff", &str, "destroy") < 0) - return -1; + if (xenConfigGetString(conf, "on_poweroff", &on_poweroff, "destroy") <= 0) + goto cleanup; =20 - if ((def->onPoweroff =3D virDomainLifecycleActionTypeFromString(str)) = < 0) { + if ((def->onPoweroff =3D virDomainLifecycleActionTypeFromString(on_pow= eroff)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected value %s for on_poweroff"), str); - return -1; + _("unexpected value %s for on_poweroff"), on_powero= ff); + goto cleanup; } =20 - if (xenConfigGetString(conf, "on_reboot", &str, "restart") < 0) - return -1; + if (xenConfigGetString(conf, "on_reboot", &on_reboot, "restart") < 0) + goto cleanup; =20 - if ((def->onReboot =3D virDomainLifecycleActionTypeFromString(str)) < = 0) { + if ((def->onReboot =3D virDomainLifecycleActionTypeFromString(on_reboo= t)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected value %s for on_reboot"), str); - return -1; + _("unexpected value %s for on_reboot"), on_reboot); + goto cleanup; } =20 - if (xenConfigGetString(conf, "on_crash", &str, "restart") < 0) - return -1; + if (xenConfigGetString(conf, "on_crash", &on_crash, "restart") < 0) + goto cleanup; =20 - if ((def->onCrash =3D virDomainLifecycleActionTypeFromString(str)) < 0= ) { + if ((def->onCrash =3D virDomainLifecycleActionTypeFromString(on_crash)= ) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected value %s for on_crash"), str); - return -1; + _("unexpected value %s for on_crash"), on_crash); + goto cleanup; } =20 - return 0; + ret =3D 0; + + cleanup: + VIR_FREE(on_poweroff); + VIR_FREE(on_reboot); + VIR_FREE(on_crash); + return ret; } =20 =20 --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list