From nobody Fri Dec 19 20:15:51 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1587477086; cv=none; d=zohomail.com; s=zohoarc; b=gkwufvnsdD+eekpytFceWuUm6F+sm7e7BmAOoR6x6CwGdMKh+TTHzxxe/3gccYfPt5PcgErzKqigssIxn66RwR528JFmwtQW3rxEF9xZvjVykC0kB1UyeSBh9iOO5hAuiCNJ69b9JdhB69uhp6OK5/Izv/hTuZyjc2Usah0hMmI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587477086; 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=yT9OnhHbvus6v4A/1g9vNb+ttCN2r+a3QnGOXMfO824=; b=D/28a3zX1SGD1Ex8X0I089io3QmOD8J2OQGfBYSboUt31jyUHawns2HuHzxxOiuLAV/4eCo2ewr+fk2OofImhXkBJv3eG54NKGoUI5DPdr7xW4Rt0CuINYN9dxhqRR/6F28eENBJZx1x4NJf3W857XLAviQZS3tAiIwOWGYPKzY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 158747708663853.204923359583404; Tue, 21 Apr 2020 06:51: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-203--fE-4Vo-NB6ehVCjZchyGg-1; Tue, 21 Apr 2020 09:51:21 -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 C67A980257B; Tue, 21 Apr 2020 13:51:13 +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 9AD385C290; Tue, 21 Apr 2020 13:51: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 3864E941C7; Tue, 21 Apr 2020 13:51:13 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 03LDotkF003619 for ; Tue, 21 Apr 2020 09:50:55 -0400 Received: by smtp.corp.redhat.com (Postfix) id 50A2C2093CE5; Tue, 21 Apr 2020 13:50:55 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4C1FD20292BF for ; Tue, 21 Apr 2020 13:50:54 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7522C185A793 for ; Tue, 21 Apr 2020 13:50:54 +0000 (UTC) Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-14-zrcxEMpYPGa1pgWEYK0SNA-1; Tue, 21 Apr 2020 09:50:52 -0400 Received: by mail-wr1-f50.google.com with SMTP id u13so16563304wrp.3 for ; Tue, 21 Apr 2020 06:50:51 -0700 (PDT) Received: from localhost.localdomain (public-gprs377075.centertel.pl. [37.47.104.52]) by smtp.gmail.com with ESMTPSA id q10sm3981826wrv.95.2020.04.21.06.50.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Apr 2020 06:50:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587477085; 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=yT9OnhHbvus6v4A/1g9vNb+ttCN2r+a3QnGOXMfO824=; b=MhhThMbvIJtipy+MlOb66Ze44kmSb2p3DZJh9xPpRJVDnZ6p44yRpJKAkjNgIxZt3UcL7E lUMlVwf5igt6RlLyMJmlmqKKEzyzZnZuDNy1uT06JEbpo5Z78XpAnLG/dWMv/Oz0dr71r2 lNqdvWdSj72iktyVFFTBLdMJXs/Wyg0= X-MC-Unique: -fE-4Vo-NB6ehVCjZchyGg-1 X-MC-Unique: zrcxEMpYPGa1pgWEYK0SNA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FFLZGQGiU3p9EodqYMlquh+6IYBS6GL8K90GAdQokaY=; b=CzJKEAZW/VCRGWI5mPkYj/wIkddASPxNLoqw4x2NljDfcNrB7ZpEOfetnBuIRBv07H 8E0BiJHb4mKtc2QqX4NEfvNP6aOOhwHZ6aS/4NcqztBpJJVibOlBbZQcCv4xoKPFLtNh pGghECdNeUtMRphzySUOguD4hQUcnHo81BBpo5hQqx3/o9G4yUqsN5s66WIudOP3gI2z wpnOpKPfdhV283Xvx8u6HDmFpl2NXA9Hj5zKlDtgUuVLfZ6/mAt9mzisU6jSkv4715H0 7jh9Gwi0Vb5Mu5jCjllvi3fnzgu+1TcPkNhM3fnjUculSX9Z4tVW6m5vOs1aERnKZKku cpdQ== X-Gm-Message-State: AGi0Pua2/ImreJIPFSjasH6PGMh1tqLLaBy4WkqtYExM4EFShLt8tFM2 ggrr0E5fvMoNssbk6NbDF23YDhwSTmA= X-Google-Smtp-Source: APiQypJaIxW2oq+ZV9ZXoqu5mwIgvfEWWGaLkypbb/5ZebVlucPh+ygySfkQ57C61act88cJ7VszYQ== X-Received: by 2002:a5d:658e:: with SMTP id q14mr25269877wru.92.1587477050514; Tue, 21 Apr 2020 06:50:50 -0700 (PDT) From: Rafael Fonseca To: libvir-list@redhat.com Subject: [PATCH v2 35/40] libxl: convert libxlMigrationDstArgs to GObject Date: Tue, 21 Apr 2020 15:49:16 +0200 Message-Id: <20200421134921.3717019-36-r4f4rfs@gmail.com> In-Reply-To: <20200421134921.3717019-1-r4f4rfs@gmail.com> References: <20200421134921.3717019-1-r4f4rfs@gmail.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 03LDotkF003619 X-loop: libvir-list@redhat.com Cc: Rafael Fonseca 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-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: Rafael Fonseca --- src/libxl/libxl_migration.c | 76 ++++++++++++++++++++++++------------- 1 file changed, 49 insertions(+), 27 deletions(-) diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index 50225855ae..8530b172ec 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -60,7 +60,7 @@ struct _libxlMigrationCookie { }; =20 typedef struct _libxlMigrationDstArgs { - virObject parent; + GObject parent; =20 int recvfd; virConnectPtr conn; @@ -73,7 +73,30 @@ typedef struct _libxlMigrationDstArgs { size_t nsocks; } libxlMigrationDstArgs; =20 -static virClassPtr libxlMigrationDstArgsClass; +G_DEFINE_TYPE(libxlMigrationDstArgs, libxl_migration_dst_args, G_TYPE_OBJE= CT); +#define LIBXL_TYPE_MIGRATION_DST_ARGS libxl_migration_dst_args_get_type() +G_DECLARE_FINAL_TYPE(libxlMigrationDstArgs, + libxl_migration_dst_args, + LIBXL, + MIGRATION_DST_ARGS, + GObject); + +static void libxlMigrationDstArgsDispose(GObject *obj); +static void libxlMigrationDstArgsFinalize(GObject *obj); + +static void +libxl_migration_dst_args_init(lixlMigrationDstArgs *args G_GNUC_UNUSED) +{ +} + +static void +libxl_migration_dst_args_class_init(lixlMigrationDstArgsClass *klass) +{ + GObjectClass *obj =3D G_OBJECT_CLASS(klass); + + obj->dispose =3D libxlMigrationDstArgsDispose; + obj->finalize =3D libxlMigrationDstArgsFinalize; +} =20 =20 static void @@ -226,31 +249,34 @@ libxlMigrationEatCookie(const char *cookiein, } =20 static void -libxlMigrationDstArgsDispose(void *obj) +libxlMigrationDstArgsDispose(GObject *obj) { - libxlMigrationDstArgs *args =3D obj; + libxlMigrationDstArgs *args =3D LIBXL_MIGRATION_DST_ARGS(obj); =20 - libxlMigrationCookieFree(args->migcookie); - VIR_FREE(args->socks); virObjectUnref(args->conn); + args->conn =3D NULL; virObjectUnref(args->vm); + args->vm =3D NULL; + + G_OBJECT_CLASS(libxl_migration_dst_args_parent_class)->dispose(obj); } =20 -static int -libxlMigrationDstArgsOnceInit(void) +static void +libxlMigrationDstArgsFinalize(GObject *obj) { - if (!VIR_CLASS_NEW(libxlMigrationDstArgs, virClassForObject())) - return -1; + libxlMigrationDstArgs *args =3D LIBXL_MIGRATION_DST_ARGS(obj); =20 - return 0; + libxlMigrationCookieFree(args->migcookie); + VIR_FREE(args->socks); + + G_OBJECT_CLASS(libxl_migration_dst_args_parent_class)->finalize(obj); } =20 -VIR_ONCE_GLOBAL_INIT(libxlMigrationDstArgs); =20 static void libxlDoMigrateDstReceive(void *opaque) { - libxlMigrationDstArgs *args =3D opaque; + g_autoptr(libxlMigrationDstArgs) args =3D LIBXL_MIGRATION_DST_ARGS(opa= que); virDomainObjPtr vm =3D args->vm; virNetSocketPtr *socks =3D args->socks; size_t nsocks =3D args->nsocks; @@ -277,7 +303,6 @@ libxlDoMigrateDstReceive(void *opaque) } args->nsocks =3D 0; VIR_FORCE_CLOSE(recvfd); - virObjectUnref(args); virDomainObjEndAPI(&vm); } =20 @@ -287,7 +312,7 @@ libxlMigrateDstReceive(virNetSocketPtr sock, int events G_GNUC_UNUSED, void *opaque) { - libxlMigrationDstArgs *args =3D opaque; + g_autoptr(libxlMigrationDstArgs) args =3D LIBXL_MIGRATION_DST_ARGS(opa= que); virNetSocketPtr *socks =3D args->socks; size_t nsocks =3D args->nsocks; libxlDomainObjPrivatePtr priv =3D args->vm->privateData; @@ -321,7 +346,7 @@ libxlMigrateDstReceive(virNetSocketPtr sock, libxlDoMigrateDstReceive, name, false, - args) < 0) { + g_object_ref(args)) < 0) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Failed to create thread for receiving migration = data")); goto fail; @@ -339,7 +364,6 @@ libxlMigrateDstReceive(virNetSocketPtr sock, } args->nsocks =3D 0; VIR_FORCE_CLOSE(recvfd); - virObjectUnref(args); } =20 static int @@ -551,7 +575,7 @@ libxlDomainMigrationDstPrepareTunnel3(virConnectPtr dco= nn, libxlMigrationCookiePtr mig =3D NULL; libxlDriverPrivatePtr driver =3D dconn->privateData; virDomainObjPtr vm =3D NULL; - libxlMigrationDstArgs *args =3D NULL; + g_autoptr(libxlMigrationDstArgs) args =3D NULL; bool taint_hook =3D false; libxlDomainObjPrivatePtr priv =3D NULL; char *xmlout =3D NULL; @@ -600,8 +624,8 @@ libxlDomainMigrationDstPrepareTunnel3(virConnectPtr dco= nn, if (libxlMigrationDstArgsInitialize() < 0) goto endjob; =20 - if (!(args =3D virObjectNew(libxlMigrationDstArgsClass))) - goto endjob; + args =3D LIBXL_MIGRATION_DST_ARGS( + g_object_new(LIBXL_TYPE_MIGRATION_DST_ARGS, NULL)); =20 args->conn =3D virObjectRef(dconn); args->vm =3D virObjectRef(vm); @@ -618,7 +642,7 @@ libxlDomainMigrationDstPrepareTunnel3(virConnectPtr dco= nn, name =3D g_strdup_printf("mig-%s", args->vm->def->name); if (virThreadCreateFull(priv->migrationDstReceiveThr, true, libxlDoMigrateDstReceive, - name, false, args) < 0) { + name, false, g_object_ref(args)) < 0) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Failed to create thread for receiving migration = data")); goto endjob; @@ -634,7 +658,6 @@ libxlDomainMigrationDstPrepareTunnel3(virConnectPtr dco= nn, libxlMigrationCookieFree(mig); VIR_FORCE_CLOSE(dataFD[1]); VIR_FORCE_CLOSE(dataFD[0]); - virObjectUnref(args); /* Remove virDomainObj from domain list */ if (vm) virDomainObjListRemove(driver->domains, vm); @@ -665,7 +688,7 @@ libxlDomainMigrationDstPrepare(virConnectPtr dconn, virNetSocketPtr *socks =3D NULL; size_t nsocks =3D 0; int nsocks_listen =3D 0; - libxlMigrationDstArgs *args =3D NULL; + g_autoptr(libxlMigrationDstArgs) args =3D NULL; bool taint_hook =3D false; libxlDomainObjPrivatePtr priv =3D NULL; size_t i; @@ -765,8 +788,8 @@ libxlDomainMigrationDstPrepare(virConnectPtr dconn, if (libxlMigrationDstArgsInitialize() < 0) goto endjob; =20 - if (!(args =3D virObjectNew(libxlMigrationDstArgsClass))) - goto endjob; + args =3D LIBXL_MIGRATION_DST_ARGS( + g_object_new(LIBXL_TYPE_MIGRATION_DST_ARGS, NULL)); =20 args->conn =3D virObjectRef(dconn); args->vm =3D virObjectRef(vm); @@ -786,7 +809,7 @@ libxlDomainMigrationDstPrepare(virConnectPtr dconn, if (virNetSocketAddIOCallback(socks[i], VIR_EVENT_HANDLE_READABLE, libxlMigrateDstReceive, - virObjectRef(args), + g_object_ref(args), NULL) < 0) continue; =20 @@ -823,7 +846,6 @@ libxlDomainMigrationDstPrepare(virConnectPtr dconn, VIR_FREE(hostname); else virURIFree(uri); - virObjectUnref(args); virDomainObjEndAPI(&vm); return ret; } --=20 2.25.3