From nobody Mon Feb 9 05:22:22 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1585927053; cv=none; d=zohomail.com; s=zohoarc; b=RD0iQKegG92jwbA8apXioBndr1UnhF4rsFYZ9ABTKx9Ut4U6mYzK3obuCU+2BVVya+yKtBAcUwaCDJnUpvo2HQ/Mfex5LWlzoH8cvD9vjIXY1BNrnhaARTKc0mjdZDJTLH4UB1pXmwPA04hC3Bi3qZr1wK3c+Mo97vuDuyKhJHo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585927053; 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=G7TgHMsPnOf52Bwnj5JjI719EuXJOek9v+w2Sm7Lk/A=; b=f3mU22Ml4HX8ExRzqAes6bwR3gagZrifh0rrVdm1sccQ2F0gsQncEmIZWLdtWjwd5zjMadF0sd8yZkqMjP1gjqpxYVNS8mWelKVYgQLzMTeig731zFHHn60Pq1ZBQEVQ4raQ6C45I+a9kzpowfuqBqXLGxBgDW5GufpO+/jVpNg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1585927053283948.0412418425441; Fri, 3 Apr 2020 08:17:33 -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-274-atcsFKfRM7yXvoq6MegE3Q-1; Fri, 03 Apr 2020 11:17:28 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DD785802684; Fri, 3 Apr 2020 15:17:18 +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 B587A8EA1A; Fri, 3 Apr 2020 15:17:18 +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 71B4B18033AD; Fri, 3 Apr 2020 15:17:18 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 033FH6qL028418 for ; Fri, 3 Apr 2020 11:17:06 -0400 Received: by smtp.corp.redhat.com (Postfix) id A32532166B2E; Fri, 3 Apr 2020 15:17:06 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9F5A52166B2C for ; Fri, 3 Apr 2020 15:17:06 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (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 7CF111017E42 for ; Fri, 3 Apr 2020 15:17:06 +0000 (UTC) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-297-zzQ6eGK9OqalAZ4kfDAWxQ-1; Fri, 03 Apr 2020 11:17:03 -0400 Received: by mail-wr1-f65.google.com with SMTP id 31so8966103wrs.3 for ; Fri, 03 Apr 2020 08:17:03 -0700 (PDT) Received: from localhost.localdomain (public-gprs375156.centertel.pl. [37.47.96.181]) by smtp.gmail.com with ESMTPSA id p13sm12331045wru.3.2020.04.03.08.17.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Apr 2020 08:17:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585927052; 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=G7TgHMsPnOf52Bwnj5JjI719EuXJOek9v+w2Sm7Lk/A=; b=Re2dRvH/Lb6FonPpbewXnHr0KXf2n7s4DvhzJ94ttz/aev7Ym0m7alO+TqbuBRDrOxNsim o/zbS2oKsOgwq851Upa5U4JyMf1/L0gjP+4OKkiPJim3otuSxPTbE7i6uTCLU6NKMx5Th8 Vy/eqCRd3WZHQNXU+iTU7XdJCHpnv4o= X-MC-Unique: atcsFKfRM7yXvoq6MegE3Q-1 X-MC-Unique: zzQ6eGK9OqalAZ4kfDAWxQ-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=dBkI0DKfElfA/K0g7sUu6/VbzTx4Vofj5jbJGSSFYU4=; b=HVhTdJpVH2xfySez1EQKBzMlLTUmwI802KyanHdk3S+6w6NSpb0tWdaMZH5Ejro86i SOsuVO2swFh+Mj4rOttgoGaFeYrgKh6aFOPgOewV8tn40RZ3zolvsW27yusb4jb4EVkN +MhaNcLIPtinSS8uKdW/GHjp2TFdWI3UaN1+97gIH4f6Zlu1jQORXX6QYiuVCVZd48Cg hfQrHE9nje1qlN+BxrAMReqPnbDqTX6rGfFe/gKs34CeCrxf7U17M3p0XY2DRMZD1XqZ ijy8a4zuT4X9fHDtR8LnAqyRxLiVrLpYd/37oDn/CopHvzjhLBI0k+YAVju9cmOrsSbA 9Ykw== X-Gm-Message-State: AGi0PuaawjpQLYdkQGYd1Z4lIV5KTE4WUV6ptO3l1Zbpg1NrqiZKxbjt /yqeMdxwMbuKbhtXe2JGiw2QxPDr0rU= X-Google-Smtp-Source: APiQypJTwDs1tHt+SKFPSQx5s351N7CZJaROeAOk/CsLJjn/0JtQjnRSGZtYA08Lh2RydBImJsCh5g== X-Received: by 2002:adf:afc3:: with SMTP id y3mr8284857wrd.144.1585927022387; Fri, 03 Apr 2020 08:17:02 -0700 (PDT) From: Rafael Fonseca To: libvir-list@redhat.com Subject: [PATCH 31/36] libxl: convert libxlMigrationDstArgs to GObject Date: Fri, 3 Apr 2020 17:15:59 +0200 Message-Id: <20200403151604.106616-32-r4f4rfs@gmail.com> In-Reply-To: <20200403151604.106616-1-r4f4rfs@gmail.com> References: <20200403151604.106616-1-r4f4rfs@gmail.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 033FH6qL028418 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.13 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 | 57 +++++++++++++++++++++++-------------- 1 file changed, 36 insertions(+), 21 deletions(-) diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index a105a03b47..15724bb262 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,28 @@ 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 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->finalize =3D libxlMigrationDstArgsFinalize; +} =20 =20 static void @@ -226,26 +247,18 @@ libxlMigrationEatCookie(const char *cookiein, } =20 static void -libxlMigrationDstArgsDispose(void *obj) +libxlMigrationDstArgsFinalize(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); virObjectUnref(args->vm); -} =20 -static int -libxlMigrationDstArgsOnceInit(void) -{ - if (!VIR_CLASS_NEW(libxlMigrationDstArgs, virClassForObject())) - return -1; - - return 0; + G_OBJECT_CLASS(libxl_migration_dst_args_parent_class)->finalize(obj); } =20 -VIR_ONCE_GLOBAL_INIT(libxlMigrationDstArgs); =20 static void libxlDoMigrateDstReceive(void *opaque) @@ -277,7 +290,7 @@ libxlDoMigrateDstReceive(void *opaque) } args->nsocks =3D 0; VIR_FORCE_CLOSE(recvfd); - virObjectUnref(args); + g_object_unref(args); virDomainObjEndAPI(&vm); } =20 @@ -339,7 +352,7 @@ libxlMigrateDstReceive(virNetSocketPtr sock, } args->nsocks =3D 0; VIR_FORCE_CLOSE(recvfd); - virObjectUnref(args); + g_object_unref(args); } =20 static int @@ -600,8 +613,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); @@ -634,7 +647,8 @@ libxlDomainMigrationDstPrepareTunnel3(virConnectPtr dco= nn, libxlMigrationCookieFree(mig); VIR_FORCE_CLOSE(dataFD[1]); VIR_FORCE_CLOSE(dataFD[0]); - virObjectUnref(args); + if (args) + g_object_unref(args); /* Remove virDomainObj from domain list */ if (vm) virDomainObjListRemove(driver->domains, vm); @@ -765,8 +779,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); @@ -823,7 +837,8 @@ libxlDomainMigrationDstPrepare(virConnectPtr dconn, VIR_FREE(hostname); else virURIFree(uri); - virObjectUnref(args); + if (args) + g_object_unref(args); virDomainObjEndAPI(&vm); return ret; } --=20 2.25.1