From nobody Thu May 2 19:33:20 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 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=1571750199; cv=none; d=zoho.com; s=zohoarc; b=kQPn8OyEnvhK/+0gAM1WiAp9vlFLiVwYjT7xl5m6ARR5/g7KemJh7NQOlAeHPTt6MNWnw3CPrhC1nUJ2dGDq7TsgFH/HOwtoptBFtG8NkdnqaLO8MYQacjdiP560qQ0ODHkJ97G8xt0VyiGZtgHvjxMRvhiLq8KjVokTVd3SDsM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571750199; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=u+6iAbe45DQ952eJqSidzsRdrdh43+uYojdwGz1F7VY=; b=Z3Vw8Xd+0quPClvQME+XirbaPdcKxGkA6ZZ+eSLUyxURKcKiJ0K5cstkwbIT9bBeg7s+nLBANRclK7KfMLEOyy0CqpmXQ4HluHdfgEq8oQ1GkCF00lM9losx0deqC+lkYnZnt0AgY1vjljH4CGzbj+7xC2+y/8pia/ko1FrDa3A= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 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-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1571750199714454.24587456537677; Tue, 22 Oct 2019 06:16:39 -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-106-yhMA6IzSMgeNWtPcy54Hcg-1; Tue, 22 Oct 2019 09:16:37 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7527347B; Tue, 22 Oct 2019 13:16:31 +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 01FAE5C222; Tue, 22 Oct 2019 13:16:30 +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 3C03A4E589; Tue, 22 Oct 2019 13:16:27 +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 x9MDGPA1031776 for ; Tue, 22 Oct 2019 09:16:25 -0400 Received: by smtp.corp.redhat.com (Postfix) id C40FA5D6A5; Tue, 22 Oct 2019 13:16:25 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4CD695D6A9 for ; Tue, 22 Oct 2019 13:16:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571750198; 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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=u+6iAbe45DQ952eJqSidzsRdrdh43+uYojdwGz1F7VY=; b=IC72OmPfgACPlRjTleAoshSEA0000LsIAbaTPUDyd6mqemZ0z8a1ZHsHlcwOygchXbXQH4 fwkmA0AIGePxU9PZZo/xlvj5IWA+v04SO94eM8gCCdX3kQONBM+EC3FLsVkpA0hZbqvUBN UWbY6y2t/YP7KO4ZlH/Jveglqu0wxOs= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:16:20 +0200 Message-Id: <4f25094a769bcf851c3e6135ed59a0fee106d418.1571750173.git.mprivozn@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] libxl_domain: Use g_autoptr for libxlDriverConfig 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.16 X-MC-Unique: yhMA6IzSMgeNWtPcy54Hcg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" This simplifies some functions, but mostly libxlDomainManagedSavePath() which is going to be modified in future commits. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko --- src/libxl/libxl_domain.c | 34 ++++++++++------------------------ 1 file changed, 10 insertions(+), 24 deletions(-) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 25228af7a6..d79c3c1ed7 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -475,10 +475,9 @@ libxlDomainShutdownThread(void *opaque) libxlDriverPrivatePtr driver =3D shutdown_info->driver; virObjectEventPtr dom_event =3D NULL; libxl_shutdown_reason xl_reason =3D ev->u.domain_shutdown.shutdown_rea= son; - libxlDriverConfigPtr cfg; + g_autoptr(libxlDriverConfig) cfg =3D libxlDriverConfigGet(driver); libxl_domain_config d_config; =20 - cfg =3D libxlDriverConfigGet(driver); libxl_domain_config_init(&d_config); =20 vm =3D virDomainObjListFindByID(driver->domains, ev->domid); @@ -600,7 +599,6 @@ libxlDomainShutdownThread(void *opaque) libxl_event_free(cfg->ctx, ev); VIR_FREE(shutdown_info); libxl_domain_config_dispose(&d_config); - virObjectUnref(cfg); } =20 static void @@ -611,11 +609,9 @@ libxlDomainDeathThread(void *opaque) libxl_event *ev =3D shutdown_info->event; libxlDriverPrivatePtr driver =3D shutdown_info->driver; virObjectEventPtr dom_event =3D NULL; - libxlDriverConfigPtr cfg; + g_autoptr(libxlDriverConfig) cfg =3D libxlDriverConfigGet(driver); libxlDomainObjPrivatePtr priv; =20 - cfg =3D libxlDriverConfigGet(driver); - vm =3D virDomainObjListFindByID(driver->domains, ev->domid); if (!vm) { /* vm->def->id already cleared, means the death was handled by the @@ -647,7 +643,6 @@ libxlDomainDeathThread(void *opaque) virObjectEventStateQueue(driver->domainEventState, dom_event); libxl_event_free(cfg->ctx, ev); VIR_FREE(shutdown_info); - virObjectUnref(cfg); } =20 =20 @@ -661,7 +656,7 @@ libxlDomainEventHandler(void *data, VIR_LIBXL_EVENT_CON= ST libxl_event *event) libxl_shutdown_reason xl_reason =3D event->u.domain_shutdown.shutdown_= reason; struct libxlShutdownThreadInfo *shutdown_info =3D NULL; virThread thread; - libxlDriverConfigPtr cfg; + g_autoptr(libxlDriverConfig) cfg =3D NULL; int ret =3D -1; =20 if (event->type !=3D LIBXL_EVENT_TYPE_DOMAIN_SHUTDOWN && @@ -710,7 +705,6 @@ libxlDomainEventHandler(void *data, VIR_LIBXL_EVENT_CON= ST libxl_event *event) cfg =3D libxlDriverConfigGet(driver); /* Cast away any const */ libxl_event_free(cfg->ctx, (libxl_event *)event); - virObjectUnref(cfg); VIR_FREE(shutdown_info); } =20 @@ -718,10 +712,9 @@ char * libxlDomainManagedSavePath(libxlDriverPrivatePtr driver, virDomainObjPtr v= m) { char *ret; - libxlDriverConfigPtr cfg =3D libxlDriverConfigGet(driver); + g_autoptr(libxlDriverConfig) cfg =3D libxlDriverConfigGet(driver); =20 ignore_value(virAsprintf(&ret, "%s/%s.save", cfg->saveDir, vm->def->na= me)); - virObjectUnref(cfg); return ret; } =20 @@ -808,7 +801,7 @@ int libxlDomainDestroyInternal(libxlDriverPrivatePtr driver, virDomainObjPtr vm) { - libxlDriverConfigPtr cfg =3D libxlDriverConfigGet(driver); + g_autoptr(libxlDriverConfig) cfg =3D libxlDriverConfigGet(driver); libxlDomainObjPrivatePtr priv =3D vm->privateData; int ret =3D -1; =20 @@ -825,7 +818,6 @@ libxlDomainDestroyInternal(libxlDriverPrivatePtr driver, if (ret) priv->ignoreDeathEvent =3D false; =20 - virObjectUnref(cfg); return ret; } =20 @@ -839,7 +831,7 @@ libxlDomainCleanup(libxlDriverPrivatePtr driver, virDomainObjPtr vm) { libxlDomainObjPrivatePtr priv =3D vm->privateData; - libxlDriverConfigPtr cfg =3D libxlDriverConfigGet(driver); + g_autoptr(libxlDriverConfig) cfg =3D libxlDriverConfigGet(driver); int vnc_port; char *file; virHostdevManagerPtr hostdev_mgr =3D driver->hostdevMgr; @@ -931,7 +923,6 @@ libxlDomainCleanup(libxlDriverPrivatePtr driver, } =20 virDomainObjRemoveTransientDef(vm); - virObjectUnref(cfg); virObjectUnref(conn); } =20 @@ -944,7 +935,7 @@ int libxlDomainAutoCoreDump(libxlDriverPrivatePtr driver, virDomainObjPtr vm) { - libxlDriverConfigPtr cfg =3D libxlDriverConfigGet(driver); + g_autoptr(libxlDriverConfig) cfg =3D libxlDriverConfigGet(driver); time_t curtime =3D time(NULL); char timestr[100]; struct tm time_info; @@ -969,7 +960,6 @@ libxlDomainAutoCoreDump(libxlDriverPrivatePtr driver, =20 cleanup: VIR_FREE(dumpfile); - virObjectUnref(cfg); =20 return ret; } @@ -977,7 +967,7 @@ libxlDomainAutoCoreDump(libxlDriverPrivatePtr driver, int libxlDomainSetVcpuAffinities(libxlDriverPrivatePtr driver, virDomainObjPtr= vm) { - libxlDriverConfigPtr cfg =3D libxlDriverConfigGet(driver); + g_autoptr(libxlDriverConfig) cfg =3D libxlDriverConfigGet(driver); virDomainVcpuDefPtr vcpu; libxl_bitmap map; virBitmapPtr cpumask =3D NULL; @@ -1014,7 +1004,6 @@ libxlDomainSetVcpuAffinities(libxlDriverPrivatePtr dr= iver, virDomainObjPtr vm) =20 cleanup: libxl_bitmap_dispose(&map); - virObjectUnref(cfg); return ret; } =20 @@ -1275,7 +1264,7 @@ libxlDomainStart(libxlDriverPrivatePtr driver, char *managed_save_path =3D NULL; int managed_save_fd =3D -1; libxlDomainObjPrivatePtr priv =3D vm->privateData; - libxlDriverConfigPtr cfg; + g_autoptr(libxlDriverConfig) cfg =3D libxlDriverConfigGet(driver); virHostdevManagerPtr hostdev_mgr =3D driver->hostdevMgr; libxl_asyncprogress_how aop_console_how; libxl_domain_restore_params params; @@ -1288,7 +1277,6 @@ libxlDomainStart(libxlDriverPrivatePtr driver, =20 libxl_domain_config_init(&d_config); =20 - cfg =3D libxlDriverConfigGet(driver); /* If there is a managed saved state restore it instead of starting * from scratch. The old state is removed once the restoring succeeded= . */ if (restore_fd < 0) { @@ -1528,7 +1516,6 @@ libxlDomainStart(libxlDriverPrivatePtr driver, VIR_FREE(managed_save_path); virDomainDefFree(def); VIR_FORCE_CLOSE(managed_save_fd); - virObjectUnref(cfg); return ret; } =20 @@ -1558,7 +1545,7 @@ libxlDomainDefCheckABIStability(libxlDriverPrivatePtr= driver, { virDomainDefPtr migratableDefSrc =3D NULL; virDomainDefPtr migratableDefDst =3D NULL; - libxlDriverConfigPtr cfg =3D libxlDriverConfigGet(driver); + g_autoptr(libxlDriverConfig) cfg =3D libxlDriverConfigGet(driver); bool ret =3D false; =20 if (!(migratableDefSrc =3D virDomainDefCopy(src, cfg->caps, driver->xm= lopt, NULL, true)) || @@ -1572,6 +1559,5 @@ libxlDomainDefCheckABIStability(libxlDriverPrivatePtr= driver, cleanup: virDomainDefFree(migratableDefSrc); virDomainDefFree(migratableDefDst); - virObjectUnref(cfg); return ret; } --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list