Re: [PATCH 35/40] libxl: convert libxlMigrationDstArgs to GObject

On Wed, May 13, 2020 at 01:57:19PM +0200, Rafael Fonseca wrote: This doesn't seem to have even been compile tested. Since we're using GitLab now, if you just fork the libvirt repo and push a branch to your gitlab fork, it will run CI which will check for these mistakes. diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index 678d850cf6..3e07f477c6 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -73,23 +73,23 @@ typedef struct _libxlMigrationDstArgs { size_t nsocks; } libxlMigrationDstArgs; -G_DEFINE_TYPE(libxlMigrationDstArgs, libxl_migration_dst_args, G_TYPE_OBJECT); #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); +G_DEFINE_TYPE(libxlMigrationDstArgs, libxl_migration_dst_args, G_TYPE_OBJECT); static void libxlMigrationDstArgsFinalize(GObject *obj); static void -libxl_migration_dst_args_init(lixlMigrationDstArgs *args G_GNUC_UNUSED) +libxl_migration_dst_args_init(libxlMigrationDstArgs *args G_GNUC_UNUSED) { } static void -libxl_migration_dst_args_class_init(lixlMigrationDstArgsClass *klass) +libxl_migration_dst_args_class_init(libxlMigrationDstArgsClass *klass) { GObjectClass *obj = G_OBJECT_CLASS(klass); @@ -608,9 +608,6 @@ libxlDomainMigrationDstPrepareTunnel3(virConnectPtr dconn, goto endjob; dataFD[1] = -1; /* 'st' owns the FD now & will close it */ - if (libxlMigrationDstArgsInitialize() < 0) - goto endjob; - args = LIBXL_MIGRATION_DST_ARGS( g_object_new(LIBXL_TYPE_MIGRATION_DST_ARGS, NULL)); @@ -772,9 +769,6 @@ libxlDomainMigrationDstPrepare(virConnectPtr dconn, goto endjob; } - if (libxlMigrationDstArgsInitialize() < 0) - goto endjob; - args = LIBXL_MIGRATION_DST_ARGS( g_object_new(LIBXL_TYPE_MIGRATION_DST_ARGS, NULL)); Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|