From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4AEF3C3DA6E for ; Mon, 8 Jan 2024 14:58:10 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rMr4l-0004A0-4s; Mon, 08 Jan 2024 09:58:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rMr4h-00049U-No for qemu-devel@nongnu.org; Mon, 08 Jan 2024 09:58:00 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rMr4e-0001dX-MY for qemu-devel@nongnu.org; Mon, 08 Jan 2024 09:57:59 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1704725872; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references; bh=tvpbv+48j/JNcUyHmQitIhxOLbE9t4ArOJA24vbxkXM=; b=dDVRoGnsMRGyefcONThgrIVIVM5bxUGH/0/OP8Uhld0apgS2/Axslv2MiYJwvjdb7m/PL+ RSMs1zDFNb1OXdbz2o9wWRQoALtK4fEx57ccf7yVG+31CMz8ejX2T1bEfGaDagq+KeELhz D7zeZXp8HdO/+bol1inkj2gzBtE6Yvo= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-352-ZZOAH3CtMUu4jCr0eCJrPA-1; Mon, 08 Jan 2024 09:57:49 -0500 X-MC-Unique: ZZOAH3CtMUu4jCr0eCJrPA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 268A8185A782; Mon, 8 Jan 2024 14:57:49 +0000 (UTC) Received: from redhat.com (unknown [10.42.28.90]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6D89E2026D66; Mon, 8 Jan 2024 14:57:47 +0000 (UTC) Date: Mon, 8 Jan 2024 14:57:45 +0000 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: Fabiano Rosas Cc: qemu-devel@nongnu.org, Peter Xu , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Thomas Huth , Laurent Vivier , Paolo Bonzini Subject: Re: [PATCH v3 2/4] tests/qtest/migration: Add infrastructure to skip tests on older QEMUs Message-ID: References: <20240105180449.11562-1-farosas@suse.de> <20240105180449.11562-3-farosas@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20240105180449.11562-3-farosas@suse.de> User-Agent: Mutt/2.2.10 (2023-03-25) X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 Received-SPF: pass client-ip=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.243, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: , Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On Fri, Jan 05, 2024 at 03:04:47PM -0300, Fabiano Rosas wrote: > We can run the migration tests with two different QEMU binaries to > test migration compatibility between QEMU versions. This means we'll > be running the tests with an older QEMU in either source or > destination. > > We need to avoid trying to test functionality that is unknown to the > older QEMU. This could mean new features, bug fixes, error message > changes, QEMU command line changes, migration API changes, etc. > > Add a 'since' argument to the tests that inform when the functionality > that is being test has been added to QEMU so we can skip the test on > older versions. > > Also add a version comparison function so we can adapt test code > depending on the QEMU binary version being used. > > Signed-off-by: Fabiano Rosas > --- > tests/qtest/migration-helpers.h | 1 + > tests/qtest/migration-helpers.c | 48 +++++++++++++++++++++++++++++++++ > tests/qtest/migration-test.c | 29 ++++++++++++++++++++ > 3 files changed, 78 insertions(+) > > diff --git a/tests/qtest/migration-helpers.h b/tests/qtest/migration-helpers.h > index e31dc85cc7..7b4f8e851e 100644 > --- a/tests/qtest/migration-helpers.h > +++ b/tests/qtest/migration-helpers.h > @@ -47,4 +47,5 @@ char *find_common_machine_version(const char *mtype, const char *var1, > const char *var2); > char *resolve_machine_version(const char *alias, const char *var1, > const char *var2); > +int migration_vercmp(QTestState *who, const char *tgt_version); > #endif /* MIGRATION_HELPERS_H */ > diff --git a/tests/qtest/migration-helpers.c b/tests/qtest/migration-helpers.c > index 24fb7b3525..bc4fd93e8c 100644 > --- a/tests/qtest/migration-helpers.c > +++ b/tests/qtest/migration-helpers.c > @@ -292,3 +292,51 @@ char *resolve_machine_version(const char *alias, const char *var1, > > return find_common_machine_version(machine_name, var1, var2); > } If we provide a macro to encode the version to a single integer: #define VERSION_NUMBER(maj, min, mic) ((maj * 1000000) + (min * 1000) + mic) > + > +int migration_vercmp(QTestState *who, const char *tgt_version) This could be an "int tgt_version" > +{ > + g_autofree char *version = g_strdup(tgt_version); > + int major = 0, minor = 0, micro = 0; > + int tgt_major = 0, tgt_minor = 0, tgt_micro = 0; > + const char *delim = "."; > + char *tok; > + > + qtest_query_version(who, &major, &minor, µ); This could be nothing more than return (tgt_version >= VERSION_NUMBER(major, minor, micro)); > + > + tok = strtok(version, delim); > + assert(tok); > + tgt_major = atoi(tok); > + assert(tgt_major); > + > + if (major > tgt_major) { > + return -1; > + } > + if (major < tgt_major) { > + return 1; > + } > + > + tok = strtok(NULL, delim); > + assert(tok); > + tgt_minor = atoi(tok); > + > + if (minor > tgt_minor) { > + return -1; > + } > + if (minor < tgt_minor) { > + return 1; > + } > + > + tok = strtok(NULL, delim); > + if (tok) { > + tgt_micro = atoi(tok); > + } > + > + if (micro > tgt_micro) { > + return -1; > + } > + if (micro < tgt_micro) { > + return 1; > + } > + > + return 0; > +} > diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c > index d520c587f7..001470238b 100644 > --- a/tests/qtest/migration-test.c > +++ b/tests/qtest/migration-test.c > @@ -637,6 +637,12 @@ typedef struct { > bool use_dirty_ring; > const char *opts_source; > const char *opts_target; > + /* > + * If a test checks against new functionality that might not be > + * present in older QEMUs this needs to be set so we can skip > + * running it when doing compatibility testing. > + */ > + const char *since; > } MigrateStart; This could be an 'int' too. > > /* > @@ -850,6 +856,17 @@ static int test_migrate_start(QTestState **from, QTestState **to, > qtest_qmp_set_event_callback(*from, > migrate_watch_for_stop, > &got_src_stop); > + > + if (args->since && migration_vercmp(*from, args->since) < 0) { > + g_autofree char *msg = NULL; > + > + msg = g_strdup_printf("Test requires at least QEMU version %s", > + args->since); > + g_test_skip(msg); > + qtest_quit(*from); Hmm, the g_test_skip stuff is repeated in several places, which we could avoid if we put it into a helper in libqtest.h "qtest_require_version(QTestState *test, int version)" > + > + return -1; > + } > } > > cmd_target = g_strdup_printf("-accel kvm%s -accel tcg " > @@ -872,6 +889,18 @@ static int test_migrate_start(QTestState **from, QTestState **to, > migrate_watch_for_resume, > &got_dst_resume); > > + if (args->since && migration_vercmp(*to, args->since) < 0) { > + g_autofree char *msg = NULL; > + > + msg = g_strdup_printf("Test requires at least QEMU version %s", > + args->since); > + g_test_skip(msg); > + qtest_quit(*to); > + qtest_quit(*from); > + > + return -1; > + } > + > /* > * Remove shmem file immediately to avoid memory leak in test failed case. > * It's valid because QEMU has already opened this file > -- > 2.35.3 > With 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 :|