From nobody Mon Feb 9 12:43:06 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1650566843; cv=none; d=zohomail.com; s=zohoarc; b=YqhfQRv+rP89LKkgMTeYXiMgkRtGe5ba4C5SA3cRHvF+YpZSA5Bq9Ku0dom3pr3Kxu7nCr4aK3nR3Htic7k/VumsGgq2BUsiIEx38Du/CgQZrzIrdddVJTYEzS3WcwtnWSxSXYr78CYtVoomOHa467C+eum5dTlCyStmjO9mjag= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1650566843; 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=oYjefRdsFi98UxVnXiGM7Xgzv42kxDHTqh2VH2uPv6I=; b=JHxJVtPT7rbPPL+2N8hLmbQoDKO/5ud11QD6lBPpWRvENZRY8cLKeq8lAcsZaDRamCYwc0CBH4FiqD0jIyOwODepZ5pmxaDPgJbks6EybRe8fFXHnYa0JVl9ZsfXjLsSGEBg0P1uBdF+RPfBAT6RFiYceljRvfTH4MqGKxy7yjg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1650566843894116.28072687185215; Thu, 21 Apr 2022 11:47:23 -0700 (PDT) Received: from localhost ([::1]:45984 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhbpq-0002DL-QZ for importer@patchew.org; Thu, 21 Apr 2022 14:47:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34616) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhbjo-0001cL-Cl for qemu-devel@nongnu.org; Thu, 21 Apr 2022 14:41:11 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:33751) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhbjm-0005yT-Dy for qemu-devel@nongnu.org; Thu, 21 Apr 2022 14:41:08 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-390-bIXv1qvHNdCZdiFJ6K9U4w-1; Thu, 21 Apr 2022 14:41:04 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6607D811E81 for ; Thu, 21 Apr 2022 18:41:04 +0000 (UTC) Received: from dgilbert-t580.localhost (unknown [10.39.195.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9EEB940D1B9A; Thu, 21 Apr 2022 18:41:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1650566465; h=from:from: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; bh=oYjefRdsFi98UxVnXiGM7Xgzv42kxDHTqh2VH2uPv6I=; b=UhADh/5IChDA+V2Kywy770OFP9kXl92rooUAGteRVAM1TZiFKC4HT5nUpRttWp+vvS5XfY fijNPgdN05YigtBSRHmfY4DQLvAf79WddgNOEMUtky0KrQelNEylXWGe7GmFtPYw9rtMGR GPILDxwJyZXpLhH4Wwbv5V4TEeWLXxI= X-MC-Unique: bIXv1qvHNdCZdiFJ6K9U4w-1 From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, peterx@redhat.com, berrange@redhat.com Subject: [PULL 05/18] tests: switch MigrateStart struct to be stack allocated Date: Thu, 21 Apr 2022 19:40:39 +0100 Message-Id: <20220421184052.306581-6-dgilbert@redhat.com> In-Reply-To: <20220421184052.306581-1-dgilbert@redhat.com> References: <20220421184052.306581-1-dgilbert@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=dgilbert@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: quintela@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1650566845328100003 From: Daniel P. Berrang=C3=A9 There's no compelling reason why the MigrateStart struct needs to be heap allocated. Using stack allocation and static initializers is simpler. Signed-off-by: Daniel P. Berrang=C3=A9 Message-Id: <20220310171821.3724080-8-berrange@redhat.com> Reviewed-by: Peter Xu Signed-off-by: Dr. David Alan Gilbert --- tests/qtest/migration-test.c | 134 +++++++++++++++-------------------- 1 file changed, 56 insertions(+), 78 deletions(-) diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index 0870656d82..36e5408702 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -474,28 +474,12 @@ typedef struct { bool only_target; /* Use dirty ring if true; dirty logging otherwise */ bool use_dirty_ring; - char *opts_source; - char *opts_target; + const char *opts_source; + const char *opts_target; } MigrateStart; =20 -static MigrateStart *migrate_start_new(void) -{ - MigrateStart *args =3D g_new0(MigrateStart, 1); - - args->opts_source =3D g_strdup(""); - args->opts_target =3D g_strdup(""); - return args; -} - -static void migrate_start_destroy(MigrateStart *args) -{ - g_free(args->opts_source); - g_free(args->opts_target); - g_free(args); -} - static int test_migrate_start(QTestState **from, QTestState **to, - const char *uri, MigrateStart **pargs) + const char *uri, MigrateStart *args) { g_autofree gchar *arch_source =3D NULL; g_autofree gchar *arch_target =3D NULL; @@ -507,15 +491,12 @@ static int test_migrate_start(QTestState **from, QTes= tState **to, g_autofree char *shmem_path =3D NULL; const char *arch =3D qtest_get_arch(); const char *machine_opts =3D NULL; - MigrateStart *args =3D *pargs; const char *memory_size; - int ret =3D 0; =20 if (args->use_shmem) { if (!g_file_test("/dev/shm", G_FILE_TEST_IS_DIR)) { g_test_skip("/dev/shm is not supported"); - ret =3D -1; - goto out; + return -1; } } =20 @@ -591,7 +572,8 @@ static int test_migrate_start(QTestState **from, QTestS= tate **to, machine_opts ? " -machine " : "", machine_opts ? machine_opts : "", memory_size, tmpfs, - arch_source, shmem_opts, args->opts_sourc= e, + arch_source, shmem_opts, + args->opts_source ? args->opts_source : "= ", ignore_stderr); if (!args->only_target) { *from =3D qtest_init(cmd_source); @@ -609,7 +591,8 @@ static int test_migrate_start(QTestState **from, QTestS= tate **to, machine_opts ? machine_opts : "", memory_size, tmpfs, uri, arch_target, shmem_opts, - args->opts_target, ignore_stderr); + args->opts_target ? args->opts_target : "= ", + ignore_stderr); *to =3D qtest_init(cmd_target); =20 /* @@ -620,11 +603,7 @@ static int test_migrate_start(QTestState **from, QTest= State **to, unlink(shmem_path); } =20 -out: - migrate_start_destroy(args); - /* This tells the caller that this structure is gone */ - *pargs =3D NULL; - return ret; + return 0; } =20 static void test_migrate_end(QTestState *from, QTestState *to, bool test_d= est) @@ -668,7 +647,7 @@ static int migrate_postcopy_prepare(QTestState **from_p= tr, g_autofree char *uri =3D g_strdup_printf("unix:%s/migsocket", tmpfs); QTestState *from, *to; =20 - if (test_migrate_start(&from, &to, uri, &args)) { + if (test_migrate_start(&from, &to, uri, args)) { return -1; } =20 @@ -712,10 +691,10 @@ static void migrate_postcopy_complete(QTestState *fro= m, QTestState *to) =20 static void test_postcopy(void) { - MigrateStart *args =3D migrate_start_new(); + MigrateStart args =3D {}; QTestState *from, *to; =20 - if (migrate_postcopy_prepare(&from, &to, args)) { + if (migrate_postcopy_prepare(&from, &to, &args)) { return; } migrate_postcopy_start(from, to); @@ -724,13 +703,13 @@ static void test_postcopy(void) =20 static void test_postcopy_recovery(void) { - MigrateStart *args =3D migrate_start_new(); + MigrateStart args =3D { + .hide_stderr =3D true, + }; QTestState *from, *to; g_autofree char *uri =3D NULL; =20 - args->hide_stderr =3D true; - - if (migrate_postcopy_prepare(&from, &to, args)) { + if (migrate_postcopy_prepare(&from, &to, &args)) { return; } =20 @@ -786,11 +765,11 @@ static void test_postcopy_recovery(void) =20 static void test_baddest(void) { - MigrateStart *args =3D migrate_start_new(); + MigrateStart args =3D { + .hide_stderr =3D true + }; QTestState *from, *to; =20 - args->hide_stderr =3D true; - if (test_migrate_start(&from, &to, "tcp:127.0.0.1:0", &args)) { return; } @@ -802,11 +781,11 @@ static void test_baddest(void) static void test_precopy_unix_common(bool dirty_ring) { g_autofree char *uri =3D g_strdup_printf("unix:%s/migsocket", tmpfs); - MigrateStart *args =3D migrate_start_new(); + MigrateStart args =3D { + .use_dirty_ring =3D dirty_ring, + }; QTestState *from, *to; =20 - args->use_dirty_ring =3D dirty_ring; - if (test_migrate_start(&from, &to, uri, &args)) { return; } @@ -892,7 +871,7 @@ static void test_ignore_shared(void) =20 static void test_xbzrle(const char *uri) { - MigrateStart *args =3D migrate_start_new(); + MigrateStart args =3D {}; QTestState *from, *to; =20 if (test_migrate_start(&from, &to, uri, &args)) { @@ -945,7 +924,7 @@ static void test_xbzrle_unix(void) =20 static void test_precopy_tcp(void) { - MigrateStart *args =3D migrate_start_new(); + MigrateStart args =3D {}; g_autofree char *uri =3D NULL; QTestState *from, *to; =20 @@ -987,7 +966,7 @@ static void test_precopy_tcp(void) =20 static void test_migrate_fd_proto(void) { - MigrateStart *args =3D migrate_start_new(); + MigrateStart args =3D {}; QTestState *from, *to; int ret; int pair[2]; @@ -1074,7 +1053,7 @@ static void do_test_validate_uuid(MigrateStart *args,= bool should_fail) g_autofree char *uri =3D g_strdup_printf("unix:%s/migsocket", tmpfs); QTestState *from, *to; =20 - if (test_migrate_start(&from, &to, uri, &args)) { + if (test_migrate_start(&from, &to, uri, args)) { return; } =20 @@ -1103,51 +1082,49 @@ static void do_test_validate_uuid(MigrateStart *arg= s, bool should_fail) =20 static void test_validate_uuid(void) { - MigrateStart *args =3D migrate_start_new(); + MigrateStart args =3D { + .opts_source =3D "-uuid 11111111-1111-1111-1111-111111111111", + .opts_target =3D "-uuid 11111111-1111-1111-1111-111111111111", + }; =20 - g_free(args->opts_source); - g_free(args->opts_target); - args->opts_source =3D g_strdup("-uuid 11111111-1111-1111-1111-11111111= 1111"); - args->opts_target =3D g_strdup("-uuid 11111111-1111-1111-1111-11111111= 1111"); - do_test_validate_uuid(args, false); + do_test_validate_uuid(&args, false); } =20 static void test_validate_uuid_error(void) { - MigrateStart *args =3D migrate_start_new(); - - g_free(args->opts_source); - g_free(args->opts_target); - args->opts_source =3D g_strdup("-uuid 11111111-1111-1111-1111-11111111= 1111"); - args->opts_target =3D g_strdup("-uuid 22222222-2222-2222-2222-22222222= 2222"); - args->hide_stderr =3D true; - do_test_validate_uuid(args, true); + MigrateStart args =3D { + .opts_source =3D "-uuid 11111111-1111-1111-1111-111111111111", + .opts_target =3D "-uuid 22222222-2222-2222-2222-222222222222", + .hide_stderr =3D true, + }; + + do_test_validate_uuid(&args, true); } =20 static void test_validate_uuid_src_not_set(void) { - MigrateStart *args =3D migrate_start_new(); + MigrateStart args =3D { + .opts_target =3D "-uuid 22222222-2222-2222-2222-222222222222", + .hide_stderr =3D true, + }; =20 - g_free(args->opts_target); - args->opts_target =3D g_strdup("-uuid 22222222-2222-2222-2222-22222222= 2222"); - args->hide_stderr =3D true; - do_test_validate_uuid(args, false); + do_test_validate_uuid(&args, false); } =20 static void test_validate_uuid_dst_not_set(void) { - MigrateStart *args =3D migrate_start_new(); + MigrateStart args =3D { + .opts_source =3D "-uuid 11111111-1111-1111-1111-111111111111", + .hide_stderr =3D true, + }; =20 - g_free(args->opts_source); - args->opts_source =3D g_strdup("-uuid 11111111-1111-1111-1111-11111111= 1111"); - args->hide_stderr =3D true; - do_test_validate_uuid(args, false); + do_test_validate_uuid(&args, false); } =20 static void test_migrate_auto_converge(void) { g_autofree char *uri =3D g_strdup_printf("unix:%s/migsocket", tmpfs); - MigrateStart *args =3D migrate_start_new(); + MigrateStart args =3D {}; QTestState *from, *to; int64_t remaining, percentage; =20 @@ -1230,7 +1207,7 @@ static void test_migrate_auto_converge(void) =20 static void test_multifd_tcp(const char *method) { - MigrateStart *args =3D migrate_start_new(); + MigrateStart args =3D {}; QTestState *from, *to; QDict *rsp; g_autofree char *uri =3D NULL; @@ -1314,13 +1291,13 @@ static void test_multifd_tcp_zstd(void) */ static void test_multifd_tcp_cancel(void) { - MigrateStart *args =3D migrate_start_new(); + MigrateStart args =3D { + .hide_stderr =3D true, + }; QTestState *from, *to, *to2; QDict *rsp; g_autofree char *uri =3D NULL; =20 - args->hide_stderr =3D true; - if (test_migrate_start(&from, &to, "defer", &args)) { return; } @@ -1357,8 +1334,9 @@ static void test_multifd_tcp_cancel(void) =20 migrate_cancel(from); =20 - args =3D migrate_start_new(); - args->only_target =3D true; + args =3D (MigrateStart){ + .only_target =3D true, + }; =20 if (test_migrate_start(&from, &to2, "defer", &args)) { return; --=20 2.35.1