From nobody Sat May 30 18:34:15 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1779268770; cv=none; d=zohomail.com; s=zohoarc; b=WL9PeaqcSJBZnHS0YuqxeUN5HIeQYaf3vJrn7DGXgGW6cbJ8r0TODRgdMT/Rwf1CmVp0E/Cx20K7L57/oYVd/s4/9E7QimZwqFYz1rE3QsE0u6EFaqMH1cfWrJtLDuvnX1dxGle9AWpGZfKMq+tWP5rymh4vK9IOVNhzMesSTyg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779268770; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=j6ycJyS58u8wV36TEg6I3IuF42L1x613e3hNw/t4uT4=; b=fN5bhDmPklT4UmPootlK4zyQ3LXJ9dAHDfUKycZwsMgsIA5xH0bQZcJqdZWF7U+iBB+zWQNxspXNeaNj6fZyrO7F2yQBI2sFSZM2V1pqmlk9YjztBw2IIrM2yuXsrh3lXz2ZaPfvaYTGJmiJsvjtrKk0nRCHOgiu61caAh7yHQw= 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=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779268770806161.07442051571297; Wed, 20 May 2026 02:19:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPd0W-0004h7-FM; Wed, 20 May 2026 05:14:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPd0I-0004fB-Kk for qemu-devel@nongnu.org; Wed, 20 May 2026 05:14:16 -0400 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 1wPd0E-0005dj-Lg for qemu-devel@nongnu.org; Wed, 20 May 2026 05:14:11 -0400 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-252-ZA4g8b9nPDy1BVIK8IzYFg-1; Wed, 20 May 2026 05:14:05 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 40B90180034E; Wed, 20 May 2026 09:14:04 +0000 (UTC) Received: from berrange.com (unknown [10.44.49.211]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id ADAFB18004A3; Wed, 20 May 2026 09:13:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779268449; 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=j6ycJyS58u8wV36TEg6I3IuF42L1x613e3hNw/t4uT4=; b=aJQcI0oRoQgsRCUN8KqzXOB5S+OymhLIvzl855HjaAeNXn8q4xpsRkZ/GTHISTCF8ecTmb 6lK80qI6a+HbloEyx5MkCfrMkNBQjEC0WBLol+kp1DAJQbXsvk2YMhKNnoq+FyepV0263E 81kUDcya9ntqgDPc5bSbpc4m+hMjJF8= X-MC-Unique: ZA4g8b9nPDy1BVIK8IzYFg-1 X-Mimecast-MFC-AGG-ID: ZA4g8b9nPDy1BVIK8IzYFg_1779268444 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thanos Makatos , qemu-block@nongnu.org, Hanna Reitz , Kevin Wolf , Pierrick Bouvier , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , John Snow , John Levon , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa , Peter Xu , Tejus GK Subject: [PULL 01/29] io: invert the return semantics of qio_channel_flush Date: Wed, 20 May 2026 10:13:23 +0100 Message-ID: <20260520091351.1160442-2-berrange@redhat.com> In-Reply-To: <20260520091351.1160442-1-berrange@redhat.com> References: <20260520091351.1160442-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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=lists1p.gnu.org; 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: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1779268772959154101 From: Tejus GK With the kernel's zerocopy notification mechanism, the caller can determine whether * All syscalls successfully used zero copy * At least one syscall failed to use zero copy But, as of now QEMU's IO channel flush function semantics are like * 1 =3D> all syscalls failed to use zero copy * 0 =3D> at least one syscall successfully used zero copy This is not aligned with what the kernel reports, and ends up reporting false negatives for cases like when there's just a single successful zerocopy amongst a collection of deferred zero-copies during a flush. Fix this by inverting the return semantics of the IO flush function. Suggested-by: Peter Xu Suggested-by: Daniel P. Berrang=C3=A9 Signed-off-by: Tejus GK Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Daniel P. Berrang=C3=A9 --- include/io/channel-socket.h | 6 +----- include/io/channel.h | 4 ++-- io/channel-socket.c | 16 ++++++++-------- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/include/io/channel-socket.h b/include/io/channel-socket.h index a1ef3136ea..b07cd61477 100644 --- a/include/io/channel-socket.h +++ b/include/io/channel-socket.h @@ -50,11 +50,7 @@ struct QIOChannelSocket { ssize_t zero_copy_queued; ssize_t zero_copy_sent; bool blocking; - /** - * This flag indicates whether any new data was successfully sent with - * zerocopy since the last qio_channel_socket_flush() call. - */ - bool new_zero_copy_sent_success; + bool zero_copy_fallback; }; =20 =20 diff --git a/include/io/channel.h b/include/io/channel.h index 287d10cd6f..98485c9280 100644 --- a/include/io/channel.h +++ b/include/io/channel.h @@ -1147,8 +1147,8 @@ int coroutine_mixed_fn qio_channel_writev_full_all(QI= OChannel *ioc, * If not implemented, acts as a no-op, and returns 0. * * Returns -1 if any error is found, - * 1 if every send failed to use zero copy. - * 0 otherwise. + * 1 if at least one send failed to use zero copy. + * 0 if every send successfully used zero copy. */ =20 int qio_channel_flush(QIOChannel *ioc, diff --git a/io/channel-socket.c b/io/channel-socket.c index 3053b35ad8..ea2ec84108 100644 --- a/io/channel-socket.c +++ b/io/channel-socket.c @@ -72,7 +72,7 @@ qio_channel_socket_new(void) sioc->zero_copy_queued =3D 0; sioc->zero_copy_sent =3D 0; sioc->blocking =3D false; - sioc->new_zero_copy_sent_success =3D false; + sioc->zero_copy_fallback =3D false; =20 ioc =3D QIO_CHANNEL(sioc); qio_channel_set_feature(ioc, QIO_CHANNEL_FEATURE_SHUTDOWN); @@ -880,9 +880,9 @@ static int qio_channel_socket_flush_internal(QIOChannel= *ioc, /* No errors, count successfully finished sendmsg()*/ sioc->zero_copy_sent +=3D serr->ee_data - serr->ee_info + 1; =20 - /* If any sendmsg() succeeded using zero copy, mark zerocopy succe= ss */ - if (serr->ee_code !=3D SO_EE_CODE_ZEROCOPY_COPIED) { - sioc->new_zero_copy_sent_success =3D true; + if (serr->ee_code =3D=3D SO_EE_CODE_ZEROCOPY_COPIED) { + /* If any sendmsg() fell back to a copy, mark fallback as true= */ + sioc->zero_copy_fallback =3D true; } } =20 @@ -900,12 +900,12 @@ static int qio_channel_socket_flush(QIOChannel *ioc, return ret; } =20 - if (sioc->new_zero_copy_sent_success) { - sioc->new_zero_copy_sent_success =3D false; - return 0; + if (sioc->zero_copy_fallback) { + sioc->zero_copy_fallback =3D false; + return 1; } =20 - return 1; + return 0; } =20 #endif /* QEMU_MSG_ZEROCOPY */ --=20 2.54.0 From nobody Sat May 30 18:34:15 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1779268760; cv=none; d=zohomail.com; s=zohoarc; b=Sgbxdq9XxfP1z17BR2tHJMabst02rtbmuwm7buaWsq6KQxkv/WFcXBeRRErFq/21uD5QM2Zx+HzrtZM3Vqbv80ZBdmCAr5P211le3FiM7Z+T9YNy+rst4LMAC1WqOyrbRXXqjiwu+hBM4dEvoLRnxQv2MJwjVvOPv0uCcTKIIos= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779268760; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=bDPJ/rA4TRt7vjgNzC7L2s8kaU1MKdXtrs0Sj3PEP7k=; b=GHtwgZqZQHOKPylb4db16RBNB4tHrql8x8/eF2Fu7x8PR3GJShZw1zw2rrFt1tIa0gTZnbaqovMDZUbQIN893RUZMwua0W7N68DPOneKssTBDOtctaW4oIuWBbvMeSbRchFEwclnipUIBB4pVlaAUpR8+lr6xbunNKCUJdXz2fk= 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=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779268760770822.1918897654674; Wed, 20 May 2026 02:19:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPd0W-0004gz-6h; Wed, 20 May 2026 05:14:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPd0R-0004gG-T8 for qemu-devel@nongnu.org; Wed, 20 May 2026 05:14:25 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPd0K-0005eL-Js for qemu-devel@nongnu.org; Wed, 20 May 2026 05:14:23 -0400 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-635-JTv4NIHEO--gY3jlGInGqg-1; Wed, 20 May 2026 05:14:11 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A8D4619560A6; Wed, 20 May 2026 09:14:09 +0000 (UTC) Received: from berrange.com (unknown [10.44.49.211]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B19071800673; Wed, 20 May 2026 09:14:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779268455; 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=bDPJ/rA4TRt7vjgNzC7L2s8kaU1MKdXtrs0Sj3PEP7k=; b=CAnA16ZjjFP/lpHDd56vDVZmZMkR8ssL5tMM1HpKGXpKfsh1Z3U9KfHokUI5iAW+vMq7HZ YWm56e6XXrO5PMpbU35Vryp+LJ/9ySVhKp4lNbenACiyEGP+lhbEHPGGzczCWkJszQW9rl +Pc1KlAXw9ZE+GmHlxANwDzDMAyaMsY= X-MC-Unique: JTv4NIHEO--gY3jlGInGqg-1 X-Mimecast-MFC-AGG-ID: JTv4NIHEO--gY3jlGInGqg_1779268450 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thanos Makatos , qemu-block@nongnu.org, Hanna Reitz , Kevin Wolf , Pierrick Bouvier , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , John Snow , John Levon , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa , "Maciej S. Szmigiero" Subject: [PULL 02/29] crypto: fix client side anonymous TLS credentials Date: Wed, 20 May 2026 10:13:24 +0100 Message-ID: <20260520091351.1160442-3-berrange@redhat.com> In-Reply-To: <20260520091351.1160442-1-berrange@redhat.com> References: <20260520091351.1160442-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1779268763198158500 The previous refactoring of credential creation failed to allocate storage fo the anonymous TLS credentials on the client endpoint. Fixes: 70f9fd8dbf7233bee497055a9b7825e3729ce853 Reported-by: Maciej S. Szmigiero Signed-off-by: Daniel P. Berrang=C3=A9 --- crypto/tlscredsanon.c | 2 + tests/unit/test-crypto-tlssession.c | 120 +++++++++++++++++++++++++++- 2 files changed, 121 insertions(+), 1 deletion(-) diff --git a/crypto/tlscredsanon.c b/crypto/tlscredsanon.c index 1551382e1f..190c9833a7 100644 --- a/crypto/tlscredsanon.c +++ b/crypto/tlscredsanon.c @@ -73,6 +73,8 @@ qcrypto_tls_creds_anon_load(QCryptoTLSCredsAnon *creds, box->dh_params); } } else { + box =3D qcrypto_tls_creds_box_new_client(GNUTLS_CRD_ANON); + ret =3D gnutls_anon_allocate_client_credentials(&box->data.anoncli= ent); if (ret < 0) { error_setg(errp, "Cannot allocate credentials: %s", diff --git a/tests/unit/test-crypto-tlssession.c b/tests/unit/test-crypto-t= lssession.c index 0d06a6892e..dc7a01bb06 100644 --- a/tests/unit/test-crypto-tlssession.c +++ b/tests/unit/test-crypto-tlssession.c @@ -24,6 +24,7 @@ #include "crypto-tls-psk-helpers.h" #include "crypto/tlscredsx509.h" #include "crypto/tlscredspsk.h" +#include "crypto/tlscredsanon.h" #include "crypto/tlssession.h" #include "qom/object_interfaces.h" #include "qapi/error.h" @@ -190,6 +191,121 @@ static void test_crypto_tls_session_psk(void) } =20 =20 +static QCryptoTLSCreds *test_tls_creds_anon_create( + QCryptoTLSCredsEndpoint endpoint) +{ + Object *parent =3D object_get_objects_root(); + Object *creds =3D object_new_with_props( + TYPE_QCRYPTO_TLS_CREDS_ANON, + parent, + (endpoint =3D=3D QCRYPTO_TLS_CREDS_ENDPOINT_SERVER ? + "testtlscredsserver" : "testtlscredsclient"), + &error_abort, + "endpoint", (endpoint =3D=3D QCRYPTO_TLS_CREDS_ENDPOINT_SERVER ? + "server" : "client"), + "priority", "NORMAL", + NULL + ); + return QCRYPTO_TLS_CREDS(creds); +} + + +static void test_crypto_tls_session_anon(void) +{ + QCryptoTLSCreds *clientCreds; + QCryptoTLSCreds *serverCreds; + QCryptoTLSSession *clientSess =3D NULL; + QCryptoTLSSession *serverSess =3D NULL; + int channel[2]; + bool clientShake =3D false; + bool serverShake =3D false; + int ret; + + /* We'll use this for our fake client-server connection */ + ret =3D qemu_socketpair(AF_UNIX, SOCK_STREAM, 0, channel); + g_assert(ret =3D=3D 0); + + /* + * We have an evil loop to do the handshake in a single + * thread, so we need these non-blocking to avoid deadlock + * of ourselves + */ + qemu_set_blocking(channel[0], false, &error_abort); + qemu_set_blocking(channel[1], false, &error_abort); + + clientCreds =3D test_tls_creds_anon_create( + QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT); + g_assert(clientCreds !=3D NULL); + + serverCreds =3D test_tls_creds_anon_create( + QCRYPTO_TLS_CREDS_ENDPOINT_SERVER); + g_assert(serverCreds !=3D NULL); + + /* Now the real part of the test, setup the sessions */ + clientSess =3D qcrypto_tls_session_new( + clientCreds, NULL, NULL, + QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT, &error_abort); + g_assert(clientSess !=3D NULL); + + serverSess =3D qcrypto_tls_session_new( + serverCreds, NULL, NULL, + QCRYPTO_TLS_CREDS_ENDPOINT_SERVER, &error_abort); + g_assert(serverSess !=3D NULL); + + /* For handshake to work, we need to set the I/O callbacks + * to read/write over the socketpair + */ + qcrypto_tls_session_set_callbacks(serverSess, + testWrite, testRead, + &channel[0]); + qcrypto_tls_session_set_callbacks(clientSess, + testWrite, testRead, + &channel[1]); + + /* + * Finally we loop around & around doing handshake on each + * session until we get an error, or the handshake completes. + * This relies on the socketpair being nonblocking to avoid + * deadlocking ourselves upon handshake + */ + do { + int rv; + if (!serverShake) { + rv =3D qcrypto_tls_session_handshake(serverSess, + &error_abort); + g_assert(rv >=3D 0); + if (rv =3D=3D QCRYPTO_TLS_HANDSHAKE_COMPLETE) { + serverShake =3D true; + } + } + if (!clientShake) { + rv =3D qcrypto_tls_session_handshake(clientSess, + &error_abort); + g_assert(rv >=3D 0); + if (rv =3D=3D QCRYPTO_TLS_HANDSHAKE_COMPLETE) { + clientShake =3D true; + } + } + } while (!clientShake || !serverShake); + + + /* Finally make sure the server & client validation is successful. */ + g_assert(qcrypto_tls_session_check_credentials(serverSess, + &error_abort) =3D=3D 0); + g_assert(qcrypto_tls_session_check_credentials(clientSess, + &error_abort) =3D=3D 0); + + object_unparent(OBJECT(serverCreds)); + object_unparent(OBJECT(clientCreds)); + + qcrypto_tls_session_free(serverSess); + qcrypto_tls_session_free(clientSess); + + close(channel[0]); + close(channel[1]); +} + + struct QCryptoTLSSessionTestData { const char *servercacrt; const char *clientcacrt; @@ -421,9 +537,11 @@ int main(int argc, char **argv) test_tls_init(KEYFILE); test_tls_psk_init(PSKFILE); =20 - /* Simple initial test using Pre-Shared Keys. */ + /* Simple initial tests using Pre-Shared Keys & anon creds */ g_test_add_func("/qcrypto/tlssession/psk", test_crypto_tls_session_psk); + g_test_add_func("/qcrypto/tlssession/anon", + test_crypto_tls_session_anon); =20 /* More complex tests using X.509 certificates. */ # define TEST_SESS_REG(name, caCrt, \ --=20 2.54.0 From nobody Sat May 30 18:34:15 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1779268744; cv=none; d=zohomail.com; s=zohoarc; b=PoVUrim7ZtY331LHX1xK4EsHtsTOt8NqDaiKwNNVgICMisvPtkNwoHRI9vl50QQ9lo8C23Mu2pI/WmLcv9V5JI23v85E54MVuIQadKkB64TTJxFJbHI8+VaXW4bMHmwkh1lW6niVv+BJipIPkc0pahMHIFk+QlpFAc0tDEHEWW4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779268744; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=dsKkHwuODY+JPUVxkGiOJ3BUkUv5DrPEH9gjMlZE86A=; b=kJ5wdK7ZlkTnrHXCxUEbyrMPfhEH/anhmsJ9jjCI5g0cFeT6Z+HkRT+j0tilVG4MVA/bdTvWJZL4/RP08myT/nA+CWrHAUTbBGk1dh//z/0th1AscMKqt7i5s781jAnLPYguzDtLvLQLc9lEk5/mrGwLmzANT28fUaVW6t8VPr0= 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=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779268744264426.1575351725745; Wed, 20 May 2026 02:19:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPd0e-0004jM-Uu; Wed, 20 May 2026 05:14:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPd0Y-0004hg-1U for qemu-devel@nongnu.org; Wed, 20 May 2026 05:14:30 -0400 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 1wPd0R-0005fK-H1 for qemu-devel@nongnu.org; Wed, 20 May 2026 05:14:29 -0400 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-20-B4WcwuyBOmWFZtg_QWe58g-1; Wed, 20 May 2026 05:14:16 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8D8A31956096; Wed, 20 May 2026 09:14:15 +0000 (UTC) Received: from berrange.com (unknown [10.44.49.211]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 4467218004A3; Wed, 20 May 2026 09:14:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779268461; 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=dsKkHwuODY+JPUVxkGiOJ3BUkUv5DrPEH9gjMlZE86A=; b=A/l+63f8+EP0Ri2xfO1ZJF8LTQ8pnMB/xcixeIYDVeOcFSlO2PX3znXJBPaXz7W2OiM/y0 TVlkBoTmjyEDb/c1I5A8meaxRX1tNwqRwDLbIbgqtj+RFc4QOE8/CN7sPcTCk0u1BxnTyr fLJ8l4XT4p0byVo5T7tlhMzA3B1F7WQ= X-MC-Unique: B4WcwuyBOmWFZtg_QWe58g-1 X-Mimecast-MFC-AGG-ID: B4WcwuyBOmWFZtg_QWe58g_1779268455 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thanos Makatos , qemu-block@nongnu.org, Hanna Reitz , Kevin Wolf , Pierrick Bouvier , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , John Snow , John Levon , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa Subject: [PULL 03/29] python: bump qemu.qmp to v0.0.6 Date: Wed, 20 May 2026 10:13:25 +0100 Message-ID: <20260520091351.1160442-4-berrange@redhat.com> In-Reply-To: <20260520091351.1160442-1-berrange@redhat.com> References: <20260520091351.1160442-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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=lists1p.gnu.org; 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: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, LOTS_OF_MONEY=0.001, MONEY_NOHTML=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1779268746634154100 From: John Snow This release removes some deprecated warnings for our use of the old sendmsg API on older python versions. Acked-by: Kevin Wolf Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Pierrick Bouvier Signed-off-by: John Snow Signed-off-by: Daniel P. Berrang=C3=A9 --- python/scripts/vendor.py | 4 ++-- ...ny.whl =3D> qemu_qmp-0.0.6-py3-none-any.whl} | Bin 72263 -> 72379 bytes pythondeps.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename python/wheels/{qemu_qmp-0.0.5-py3-none-any.whl =3D> qemu_qmp-0.0.6-= py3-none-any.whl} (64%) diff --git a/python/scripts/vendor.py b/python/scripts/vendor.py index 7c61afd37b..1bb59d863a 100755 --- a/python/scripts/vendor.py +++ b/python/scripts/vendor.py @@ -43,8 +43,8 @@ def main() -> int: packages =3D { "meson=3D=3D1.11.1": "9b3a023657e393dbc5335b95c561337d49b7a458f5541e47ec44f2cc566e0d80", - "qemu.qmp=3D=3D0.0.5": - "e05782d6df5844b34e0d2f7c68693525da074deef7b641c1401dda6e4e3d6303", + "qemu.qmp=3D=3D0.0.6": + "5d7c5af0e9de427696e3bf72e333965c3a697929f77f6b7ddc30c989fc7b539b", "pycotap=3D=3D1.3.1": "1c3a25b3ff89e48f4e00f1f71dbbc1642b4f65c65d416524d07e73492fff25ea", } diff --git a/python/wheels/qemu_qmp-0.0.5-py3-none-any.whl b/python/wheels/= qemu_qmp-0.0.6-py3-none-any.whl similarity index 64% rename from python/wheels/qemu_qmp-0.0.5-py3-none-any.whl rename to python/wheels/qemu_qmp-0.0.6-py3-none-any.whl index 6372b7544ffb015a5c77d9686e921b65c848d433..5754130b408e2f13081b368a550= 6101a6ac490f2 100644 GIT binary patch delta 22133 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

Tv~!-sX~@YhrW ziBm&$5@z(p>SP4v2S&M9+weW9eSnvWtMk*P;|pL@YZ&DRGNQm900uvsUh>8 z4NXIMK6gW7fOx2-NLKNx%Aa(jqE9uZ{r{%BOwS1Rt5?mFYPhA?sNaF$e~Rvh@CZ|Q z3~Em=3D+U%o(X_B|;{7sA1wytsOulJM!@b4X-b>67MH{{yU4Qa>#KA6*lvC(#8nJ93J zmL=3DoC=3D^tSLNb6%29a(?(*Ida>UEu>wEkdF<9`O;xMz_kJMG6^msE&eN8ee#WjAXwE z2-F4Z2v^N4;*gjvwMg4{Z*1H`!?&INX&Tbia^}5Md)wVp9Pae=3DJ7VEbivWeuY+dLP-qp1IQE)h>Cs$5Y&AO$_t>(j-K(A%0Du^ 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 b{D%Sn02)H+NdMI=3D0.5", installed = =3D "1.2.2" } # only include dependencies that can be guaranteed via configure from # system packages, or python packages we vendor. [tooling] -"qemu.qmp" =3D { accepted =3D ">=3D0.0.5", installed =3D "0.0.5" } +"qemu.qmp" =3D { accepted =3D ">=3D0.0.5", installed =3D "0.0.6" } "qemu" =3D { path =3D "python/" } # NB: The following dependencies should be a little bit more modern than # the versions listed here, but we are still using Debian 11 for several --=20 2.54.0 From nobody Sat May 30 18:34:15 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1779268566; cv=none; d=zohomail.com; s=zohoarc; b=dUl4OrZJa3uCpvCzcSK7RPX+pToz0GK/j+vUfDkTeQ2tBRFLCubQJcyxzKrR+KsNzwTInewzYh2y/CWDo06jXhHab0fm52pnneRfSGP49+Qy5MQGEaR7vYwyCdtOQ6MUuGmghYlnoZ/LHm8s8/XELnP+JUX0vyFIr0yYo0ijc9U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779268566; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=f6PI8Ub5T3wU1cK0+j/pGNMdjp2DJFpAxaYaEg36Xf4=; b=SCAIvWDwD6yK2Li8JJWpR6uX6iFOxPK77ABtvdU/bN2zbdGWBdlqDWSybVY+gO8GvoBdJFjVhSDmtqRjszwJEP2bcdJmzLMmXgOffGc0P43PJlu8XUp0c+okeUjA0NErHwHbaFP+REYf+nix518XA5x6wN9UJfqd2ni5sPhnrH4= 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=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779268566048928.8085723017927; Wed, 20 May 2026 02:16:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPd0b-0004iV-4B; Wed, 20 May 2026 05:14:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPd0V-0004gx-40 for qemu-devel@nongnu.org; Wed, 20 May 2026 05:14:28 -0400 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 1wPd0R-0005fp-Q6 for qemu-devel@nongnu.org; Wed, 20 May 2026 05:14:26 -0400 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-516-syw7D7hbMEW8n31zfVkgZw-1; Wed, 20 May 2026 05:14:21 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 3B0E219560A1; Wed, 20 May 2026 09:14:20 +0000 (UTC) Received: from berrange.com (unknown [10.44.49.211]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 03A1218001EF; Wed, 20 May 2026 09:14:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779268463; 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=f6PI8Ub5T3wU1cK0+j/pGNMdjp2DJFpAxaYaEg36Xf4=; b=B0p/MwoEjVmmENc3RaSUlMCK5BTLgJWrArfIcCioB4AXjBZvSxEXyCzZFk0yAV4MpwY3uO +rKQO+Op1W58oqjex0JR4TmpulwYRsVFrm5ssydubrEFEC+ao1MaEPPdlLYaLGNxbvPoEV P4vMjQPXQ+0L4mG5ihi5HG4UUHKNxhk= X-MC-Unique: syw7D7hbMEW8n31zfVkgZw-1 X-Mimecast-MFC-AGG-ID: syw7D7hbMEW8n31zfVkgZw_1779268460 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thanos Makatos , qemu-block@nongnu.org, Hanna Reitz , Kevin Wolf , Pierrick Bouvier , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , John Snow , John Levon , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa Subject: [PULL 04/29] gitlab: ensure all meson jobs capture build/meson-logs by default Date: Wed, 20 May 2026 10:13:26 +0100 Message-ID: <20260520091351.1160442-5-berrange@redhat.com> In-Reply-To: <20260520091351.1160442-1-berrange@redhat.com> References: <20260520091351.1160442-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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=lists1p.gnu.org; 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: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1779268567383158500 The build-without-defaults and build-tci jobs do not capture any artifacts, despite running 'make check'. This has proved a repeated bug with CI jobs, so introduce a new '.meson_job_template' rule which always captures 'build/meson-logs'. Jobs can still provide their own 'artifacts:' config which will override this default behaviour. Acked-by: Kevin Wolf Reviewed-by: Pierrick Bouvier Signed-off-by: Daniel P. Berrang=C3=A9 --- .gitlab-ci.d/buildtest-template.yml | 30 ++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/.gitlab-ci.d/buildtest-template.yml b/.gitlab-ci.d/buildtest-t= emplate.yml index d866cb12bb..005058625e 100644 --- a/.gitlab-ci.d/buildtest-template.yml +++ b/.gitlab-ci.d/buildtest-template.yml @@ -1,5 +1,20 @@ -.native_build_job_template: + +# Any job running meson should capture meson logs +# by default. Some jobs might override the artifacts +# to capture further files +.meson_job_template: extends: .base_job_template + artifacts: + name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG" + when: always + expire_in: 7 days + paths: + - build/meson-logs + reports: + junit: build/meson-logs/*.junit.xml + +.native_build_job_template: + extends: .meson_job_template stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:$QEMU_CI_CONTAINER_TAG cache: @@ -60,7 +75,7 @@ - build/**/*.c.o.d =20 .common_test_job_template: - extends: .base_job_template + extends: .meson_job_template stage: test image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:$QEMU_CI_CONTAINER_TAG script: @@ -87,14 +102,7 @@ # Prevent logs from the build job that run earlier # from being duplicated in the test job artifacts - rm -f build/meson-logs/* - artifacts: - name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG" - when: always - expire_in: 7 days - paths: - - build/meson-logs - reports: - junit: build/meson-logs/*.junit.xml + =20 .functional_test_job_template: extends: .common_test_job_template @@ -125,7 +133,7 @@ QEMU_JOB_FUNCTIONAL: 1 =20 .wasm_build_job_template: - extends: .base_job_template + extends: .meson_job_template stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:$QEMU_CI_CONTAINER_TAG before_script: --=20 2.54.0 From nobody Sat May 30 18:34:15 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1779268500; cv=none; d=zohomail.com; s=zohoarc; b=jKGsXHuXqcPdZuLs+CJ9YV9vBS+hGGh2DBI/V/Ahes5oBEPfAgxMYCyAdHWEG2vnLvuNROhrOva3UQ3i/h2vNzCgKWnqUcNPP4LIqTHIPVJE9XDAO3IToS9t6dMn0f/MF54DEJr8GXgixzYXYQZIbvdvhqBeOdOKdA8kPwykQSA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779268500; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Llt01sfV1uMijeO9+B9YU6bVdoSwllDNDiw/k0nL1mE=; b=FuHWE9WOW9/i2NrWYoaswjvAOwIptEi+SmBrarl53NH/BfuLWBJVRGCdAzvANYYXMs1MA5hTOHMPqSshPCcPI8U4FHGO2vS8sk9sHy+HhU4YJ+QUjJ3FlGl1HlwAgFYVSrZGuhcmEgnd7EaA65fhsut3HKrB7yQ//kB/HSErA3w= 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=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779268500923481.6478467057816; Wed, 20 May 2026 02:15:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPd0i-0004ji-8U; Wed, 20 May 2026 05:14:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPd0b-0004iX-3d for qemu-devel@nongnu.org; Wed, 20 May 2026 05:14:33 -0400 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 1wPd0Y-0005hv-Mc for qemu-devel@nongnu.org; Wed, 20 May 2026 05:14:31 -0400 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-584-9Tv9c86qNo2MLyKunwEP3A-1; Wed, 20 May 2026 05:14:26 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 70EC11956089; Wed, 20 May 2026 09:14:25 +0000 (UTC) Received: from berrange.com (unknown [10.44.49.211]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E32A01800347; Wed, 20 May 2026 09:14:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779268470; 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=Llt01sfV1uMijeO9+B9YU6bVdoSwllDNDiw/k0nL1mE=; b=B/1OHImiFVUIjhTqeY6Nka8oS/0PFwvW2JsHG+iVBNWMfKs7fLOHXc6zsTx6nAj4bDBzA9 mi6hVHF33wFEG1meIvDnrN3AL2ngj43+5r1rWHW4nW0Kwd5RNXqE9/zyggvXBFLK8bn2f/ zKcK6SQGyVDBh6Gr2IroorB+IGDi6ok= X-MC-Unique: 9Tv9c86qNo2MLyKunwEP3A-1 X-Mimecast-MFC-AGG-ID: 9Tv9c86qNo2MLyKunwEP3A_1779268465 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thanos Makatos , qemu-block@nongnu.org, Hanna Reitz , Kevin Wolf , Pierrick Bouvier , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , John Snow , John Levon , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa , Thomas Huth Subject: [PULL 05/29] iotests: print reason when I/O test is skipped in TAP mode Date: Wed, 20 May 2026 10:13:27 +0100 Message-ID: <20260520091351.1160442-6-berrange@redhat.com> In-Reply-To: <20260520091351.1160442-1-berrange@redhat.com> References: <20260520091351.1160442-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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=lists1p.gnu.org; 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: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1779268503480158500 The TAP output on a skipped test: ok raw 181 # SKIP is not informative. The test program included a reason, and that should be displayed in TAP mode (it is already shown in non-TAP mode): ok raw 181 # SKIP Postcopy is not supported Reviewed-by: Kevin Wolf Reviewed-by: Thomas Huth Reviewed-by: Pierrick Bouvier Signed-off-by: Daniel P. Berrang=C3=A9 --- tests/qemu-iotests/testrunner.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qemu-iotests/testrunner.py b/tests/qemu-iotests/testrunn= er.py index e2a3658994..dbe2dddc32 100644 --- a/tests/qemu-iotests/testrunner.py +++ b/tests/qemu-iotests/testrunner.py @@ -174,7 +174,7 @@ def test_print_one_line(self, test: str, elif status =3D=3D 'fail': print(f'not ok {self.env.imgfmt} {test}') elif status =3D=3D 'not run': - print(f'ok {self.env.imgfmt} {test} # SKIP') + print(f'ok {self.env.imgfmt} {test} # SKIP {description}') return =20 if lasttime: --=20 2.54.0 From nobody Sat May 30 18:34:15 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1779268579; cv=none; d=zohomail.com; s=zohoarc; b=kQmDMK7/uq+R6J9nDWK9HnyjkUb9a8kEKFvmHKUAa5egya87wMMQVRfcGDBV7XnlQQrK1InCAKttEnnZWSuaZUt51tkmzLwh3SoMOQETjo6WikLbR5qvpIjhFLwLtyvgdVzcdBtVJP5xELhVTtCpKkoE3CUxSTDW51wrKpxW+yc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779268579; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=2cMy89RUByGmpyRSjhTNYIbKdplVLNzNWvqU2dmcLSk=; b=hFw+LlItOan4A7xvX5ulSnA0ls5sWiB6SockXZ8c5J3JZQMgIlJl0tBcb1b8nhwTL9+95pgFBxSOhxNzPkJnTaM591H5AgzA/WB6TLg6GIaBaWPmBl6oOvm5Ym5MYnnc6E0Cjowh8eEi0cVy3HeBV7a8S1+vhIFcmEPk0WdY6aQ= 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=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779268579575705.4029659328052; Wed, 20 May 2026 02:16:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPd0s-0004nT-7p; Wed, 20 May 2026 05:14:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPd0i-0004k3-0r for qemu-devel@nongnu.org; Wed, 20 May 2026 05:14:40 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPd0f-0005j9-MY for qemu-devel@nongnu.org; Wed, 20 May 2026 05:14:38 -0400 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-329-NK_1xZVBO7OoKqUkYsQ-4g-1; Wed, 20 May 2026 05:14:33 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A7A68195608F; Wed, 20 May 2026 09:14:30 +0000 (UTC) Received: from berrange.com (unknown [10.44.49.211]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 04F82180075F; Wed, 20 May 2026 09:14:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779268476; 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=2cMy89RUByGmpyRSjhTNYIbKdplVLNzNWvqU2dmcLSk=; b=TvkPY+pK50QMWtEfYX/j9RBsnhuVxq/Y9vXGNhbK0g+HB6kynTBzPD1oK1NEGNimyq5xq1 HM7ElGR9HPpfTBMwVigFNxdfRQtyRsTprefH036lLknLH2Em1k8wf1h+nt/snlv80m7i4N Ed/oP91V9CzmK1g3+EQjEkauqiNGqN8= X-MC-Unique: NK_1xZVBO7OoKqUkYsQ-4g-1 X-Mimecast-MFC-AGG-ID: NK_1xZVBO7OoKqUkYsQ-4g_1779268470 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thanos Makatos , qemu-block@nongnu.org, Hanna Reitz , Kevin Wolf , Pierrick Bouvier , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , John Snow , John Levon , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa , Thomas Huth Subject: [PULL 06/29] iotests: remove redundant meson suite for iotests Date: Wed, 20 May 2026 10:13:28 +0100 Message-ID: <20260520091351.1160442-7-berrange@redhat.com> In-Reply-To: <20260520091351.1160442-1-berrange@redhat.com> References: <20260520091351.1160442-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1779268581451158501 If a test is in the 'block-slow' or 'block-thorough' suite, there is no need to also add it to the 'slow' or 'thorough' suites. Acked-by: Kevin Wolf Tested-by: Thomas Huth Reviewed-by: Pierrick Bouvier Signed-off-by: Daniel P. Berrang=C3=A9 --- tests/qemu-iotests/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qemu-iotests/meson.build b/tests/qemu-iotests/meson.build index d7bae71ced..bf588cc2c9 100644 --- a/tests/qemu-iotests/meson.build +++ b/tests/qemu-iotests/meson.build @@ -33,7 +33,7 @@ foreach format, speed: qemu_iotests_formats if speed =3D=3D 'quick' suites =3D 'block' else - suites =3D ['block-' + speed, speed] + suites =3D ['block-' + speed] endif =20 args =3D ['-tap', '-' + format] --=20 2.54.0 From nobody Sat May 30 18:34:15 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1779268499; cv=none; d=zohomail.com; s=zohoarc; b=k1Y61uHEndpZmY/sjCC1+/uWDFWcLzH154oQLYUodfI766fRvaQYeot4m3lJlKTEpC6PmuOwgbL4givfJCgkWliN5KChAJ5AWsU5y0+IRBO+danc/sUrnUXrtxbL93wkhSltCVMj1G3OpzRWWuSJ1eXCaylQ4Q8X6iTkE9qwLXs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779268499; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=B7c5l9KxYlqTVQavHSDIGnpaQmuIRpDFa29K67QxinQ=; b=WZYoHtfRSPBvof8Sw13Y1xcVPlyTLEK+n7K2wreIzQEAC3c3N7H68tnug10Qg8ZKXig7SdJtia22pjwJSI2qrbAkUPlmZval0qd/2Ue2Eeq0TAFe5BFNaOwJVpOBTGnCT05Iqs8oFlqudj0vVTjxG0+CJ4PtZPWJNIu0lzBdijY= 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=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 177926849905979.33170822327429; Wed, 20 May 2026 02:14:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPd0s-0004nd-9b; Wed, 20 May 2026 05:14:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPd0k-0004ka-KD for qemu-devel@nongnu.org; Wed, 20 May 2026 05:14:45 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPd0i-0005jh-Rb for qemu-devel@nongnu.org; Wed, 20 May 2026 05:14:42 -0400 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-81-T_HDf5xgO7Kt4wmNfKhcJg-1; Wed, 20 May 2026 05:14:36 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 92E9618002D0; Wed, 20 May 2026 09:14:35 +0000 (UTC) Received: from berrange.com (unknown [10.44.49.211]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 32BA918004A3; Wed, 20 May 2026 09:14:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779268480; 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=B7c5l9KxYlqTVQavHSDIGnpaQmuIRpDFa29K67QxinQ=; b=KIqDJArrT0XCTbkKxsuYw/78GQgpyoExd08JvRGmZu7/9hPhEkX1OQWBNCERHO+31lTgr0 sQUfnDnJSiRqhjYVPxoFMRoTHC3raUsZDIHny5Pw9Dg/7icu7+vD5wihStJvJNAT5zej6S KTr9E+t8/q07uGADoy8yG5awXs/T5tU= X-MC-Unique: T_HDf5xgO7Kt4wmNfKhcJg-1 X-Mimecast-MFC-AGG-ID: T_HDf5xgO7Kt4wmNfKhcJg_1779268475 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thanos Makatos , qemu-block@nongnu.org, Hanna Reitz , Kevin Wolf , Pierrick Bouvier , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , John Snow , John Levon , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa , Thomas Huth Subject: [PULL 07/29] iotests: ensure all qcow2 I/O tests are able to be run via make Date: Wed, 20 May 2026 10:13:29 +0100 Message-ID: <20260520091351.1160442-8-berrange@redhat.com> In-Reply-To: <20260520091351.1160442-1-berrange@redhat.com> References: <20260520091351.1160442-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1779268500329154100 For block formats marked as 'quick', only tests in the 'auto' group are added to the meson test suite. The result of this is that qcow2 tests not in the 'auto' group cannot be run at all, even if passing SPEED=3Dslow or SPEED=3Dthorough. To fix this we need todo two passes over the I/O test list. First add all tests from 'auto' group into the 'block' suite, so they are run by default. Then on the second pass add any tests which were not in 'auto' into the 'block-slow' suite, so they get run when SPEED=3Dslow or SPEED=3Dthorough. Reviewed-by: Kevin Wolf Reviewed-by: Thomas Huth Reviewed-by: Pierrick Bouvier Signed-off-by: Daniel P. Berrang=C3=A9 --- tests/qemu-iotests/meson.build | 48 ++++++++++++++++++++++++++++++---- 1 file changed, 43 insertions(+), 5 deletions(-) diff --git a/tests/qemu-iotests/meson.build b/tests/qemu-iotests/meson.build index bf588cc2c9..1a24d801a3 100644 --- a/tests/qemu-iotests/meson.build +++ b/tests/qemu-iotests/meson.build @@ -30,16 +30,48 @@ endforeach qemu_iotests_check_cmd =3D files('check') =20 foreach format, speed: qemu_iotests_formats + # Formats tagged 'quick' get the subset of tests in the 'auto' + # group, run by default with 'make check' / 'make check-block' + seen =3D [] if speed =3D=3D 'quick' - suites =3D 'block' + args =3D ['-tap', '-' + format, '-g', 'auto'] + suites =3D ['block'] + + rc =3D run_command( + [python, qemu_iotests_check_cmd] + args + ['-n'], + check: true, + ) + + foreach item: rc.stdout().strip().split() + seen +=3D item + args =3D [qemu_iotests_check_cmd, + '-tap', '-' + format, item, + '--source-dir', meson.current_source_dir(), + '--build-dir', meson.current_build_dir()] + # Some individual tests take as long as 45 seconds + # Bump the timeout to 3 minutes for some headroom + # on slow machines to minimize spurious failures + test('io-' + format + '-' + item, + python, + args: args, + depends: qemu_iotests_binaries, + env: qemu_iotests_env, + protocol: 'tap', + timeout: 180, + suite: suites) + endforeach + endif + + suites =3D [] + # Any format tagged quick or slow also gets added to slow + # otherwise its tagged thorough + if speed !=3D 'thorough' + suites +=3D ['block-slow'] else - suites =3D ['block-' + speed] + suites +=3D ['block-thorough'] endif =20 args =3D ['-tap', '-' + format] - if speed =3D=3D 'quick' - args +=3D ['-g', 'auto'] - endif =20 rc =3D run_command( [python, qemu_iotests_check_cmd] + args + ['-n'], @@ -47,6 +79,12 @@ foreach format, speed: qemu_iotests_formats ) =20 foreach item: rc.stdout().strip().split() + # Skip any tests already added from the 'auto' group + # as they're run in the 'quick' suite already + if item in seen + continue + endif + args =3D [qemu_iotests_check_cmd, '-tap', '-' + format, item, '--source-dir', meson.current_source_dir(), --=20 2.54.0 From nobody Sat May 30 18:34:15 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1779268636; cv=none; d=zohomail.com; s=zohoarc; b=AOo83EFSnJ8YqGXrycKqHUOwaRhiuauvpmsAyFmk33SZITxpLu6I3dPIPogrbXCN5q1shL063KU5QsunReU6ZPyjI7IT/8dUgwpJobwUB4C4+wkQ8R7X0zazmJ7OLGUBqxlsET6UeZGkbaiwRz8EDss9zsnHzRkEgaXiw3so6cg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779268636; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=GPWPFWZBUfCl06aIYsOJIuqe4Yrra14lHq3PxtyVKIo=; b=cPd6OuHQw4qkD41QGtn/OuoEciEH0qK9GjAiXfWFa3rMQEDgpiyl+mlAossuicy2uihoJKkdNic4UwHcMdd/KcNjAwqIXYdb6V/jLJ1kEllRi6VYkeZPyGHoVTtkbLBMB59nSAsxZrK6LbRXrLFaXWKW11VciZOJR8sccEH71fc= 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=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779268636923183.37280355198504; Wed, 20 May 2026 02:17:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPd0w-0004sI-C7; Wed, 20 May 2026 05:14:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPd0q-0004nF-EY for qemu-devel@nongnu.org; Wed, 20 May 2026 05:14:48 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPd0o-0005ka-Vi for qemu-devel@nongnu.org; Wed, 20 May 2026 05:14:48 -0400 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-539-IwYMXQFFOQeFXARwIFX9PQ-1; Wed, 20 May 2026 05:14:42 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 103EF19560BB; Wed, 20 May 2026 09:14:41 +0000 (UTC) Received: from berrange.com (unknown [10.44.49.211]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 957601800347; Wed, 20 May 2026 09:14:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779268486; 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=GPWPFWZBUfCl06aIYsOJIuqe4Yrra14lHq3PxtyVKIo=; b=bwpr8iSLLHOGBng1akzOrxX2wqaBoHuu4D1zAn3k6fYIrsfdGiC0Wusn8BuhEdrNm9EE9r wBxXQzsAElg15ADx8Ys1L4vsbxCSfb4+m8ibMu4r28x+N4cOLdow8JeWDriggC5LEWPkK7 Cjx8haAcMWAGAllgymxvs2FbrF153WI= X-MC-Unique: IwYMXQFFOQeFXARwIFX9PQ-1 X-Mimecast-MFC-AGG-ID: IwYMXQFFOQeFXARwIFX9PQ_1779268481 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thanos Makatos , qemu-block@nongnu.org, Hanna Reitz , Kevin Wolf , Pierrick Bouvier , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , John Snow , John Levon , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa , Thomas Huth Subject: [PULL 08/29] scripts/mtest2make: ensure output has stable sorting Date: Wed, 20 May 2026 10:13:30 +0100 Message-ID: <20260520091351.1160442-9-berrange@redhat.com> In-Reply-To: <20260520091351.1160442-1-berrange@redhat.com> References: <20260520091351.1160442-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1779268638566154100 When debugging mtest2make.py changes it is important to be able to compare the old and new output. This requires that any lists in the output have stable sort ordering. Acked-by: Kevin Wolf Reviewed-by: Thomas Huth Reviewed-by: Pierrick Bouvier Signed-off-by: Daniel P. Berrang=C3=A9 --- scripts/mtest2make.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/mtest2make.py b/scripts/mtest2make.py index 4b252defc3..915f02d600 100644 --- a/scripts/mtest2make.py +++ b/scripts/mtest2make.py @@ -67,8 +67,10 @@ def process_tests(test, targets, suites): suites[s].speeds.add('thorough') =20 def emit_prolog(suites, prefix): - all_targets =3D ' '.join((f'{prefix}-{k}' for k in suites.keys())) - all_xml =3D ' '.join((f'{prefix}-report-{k}.junit.xml' for k in suites= .keys())) + all_targets =3D ' '.join((f'{prefix}-{k}' + for k in sorted(suites.keys()))) + all_xml =3D ' '.join((f'{prefix}-report-{k}.junit.xml' + for k in sorted(suites.keys()))) print() print(f'all-{prefix}-targets =3D {all_targets}') print(f'all-{prefix}-xml =3D {all_xml}') @@ -81,12 +83,12 @@ def emit_prolog(suites, prefix): print(f'\t$(MAKE) {prefix}$* MTESTARGS=3D"$(MTESTARGS) --logbase {pref= ix}-report$*" && ln -f meson-logs/$@ .') =20 def emit_suite(name, suite, prefix): - deps =3D ' '.join(suite.deps) + deps =3D ' '.join(sorted(suite.deps)) print() print(f'.{prefix}-{name}.deps =3D {deps}') print(f'.ninja-goals.check-build +=3D $(.{prefix}-{name}.deps)') =20 - names =3D ' '.join(suite.names(name)) + names =3D ' '.join(sorted(suite.names(name))) targets =3D f'{prefix}-{name} {prefix}-report-{name}.junit.xml' if not name.endswith('-slow') and not name.endswith('-thorough'): targets +=3D f' {prefix} {prefix}-report.junit.xml' --=20 2.54.0 From nobody Sat May 30 18:34:15 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1779268556; cv=none; d=zohomail.com; s=zohoarc; b=hf4Spwij3+Ub/DDiaMHWYZTDpm7ak0LPK5SPd48qvbwUX0BTuw3ywcAWfBAKt2mZiAFArV+yD7My56tangd6CqRuoTHCTroiW3JJbU6gHFLlDaTIJhBrgW0dkJaD1FWIrpx+whxz9mFOaodgSToasm29KNhihqHEPJ20qY6hKlA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779268556; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Hc2Tp08f8byxhDOq5HgFnpy1NP/YS++i+tAQt8iu9DM=; b=XZJXGULJGCCssXfxAuKd2zGy73JtLfzSuMwEEGNBiLBl6v4T1+A563LxN1cf6gn2MUGmXgZFr+/BcHGnJV9NzodIXWpj/joFv32tUNw8uSCiXg5ayIFwvR+O7Vfn2MEgEPt/rceSz3573ecFOpSs4w10TZaThFetANEPWG0Fooc= 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=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779268556047221.93832115803184; Wed, 20 May 2026 02:15:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPd0w-0004s1-74; Wed, 20 May 2026 05:14:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPd0u-0004pa-N3 for qemu-devel@nongnu.org; Wed, 20 May 2026 05:14:52 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPd0r-0005lE-4w for qemu-devel@nongnu.org; Wed, 20 May 2026 05:14:51 -0400 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-361-qOIrC0VYNHO4VyesrBxgRw-1; Wed, 20 May 2026 05:14:47 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id BA3CD19560B8; Wed, 20 May 2026 09:14:45 +0000 (UTC) Received: from berrange.com (unknown [10.44.49.211]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 9679018004A3; Wed, 20 May 2026 09:14:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779268488; 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=Hc2Tp08f8byxhDOq5HgFnpy1NP/YS++i+tAQt8iu9DM=; b=iovqp+r5WPgJC6opgQqndepkFCoyqoO0YvyJVAYPt6syuHIK5/wiTfu4VILqxU0boacwEx G8FeJ1ecrJlnXbnXhEnH6ZlHSmy8vTLety3jaEh1yompi/WLqzVboU8kZZ7ub+/HtpMOoS ih77eGs0jkEVFkuUX6Bg70Wcz+SUAdk= X-MC-Unique: qOIrC0VYNHO4VyesrBxgRw-1 X-Mimecast-MFC-AGG-ID: qOIrC0VYNHO4VyesrBxgRw_1779268485 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thanos Makatos , qemu-block@nongnu.org, Hanna Reitz , Kevin Wolf , Pierrick Bouvier , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , John Snow , John Levon , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa Subject: [PULL 09/29] scripts/mtest2make: support optional tests grouping Date: Wed, 20 May 2026 10:13:31 +0100 Message-ID: <20260520091351.1160442-10-berrange@redhat.com> In-Reply-To: <20260520091351.1160442-1-berrange@redhat.com> References: <20260520091351.1160442-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1779268559389154101 Currently tests can be classified into three speed groups depending on whether the meson suite name ends in '-slow' or '-thorough' or neither. This gets turned into make targets that match the name of the meson suite, with the speed suffix stripped. e.g. * suite=3Dblock -> 'make check-block' * suite=3Dblock-slow -> 'make check-block SPEED=3Dslow' * suite=3Dblock-thorough -> 'make check-block SPEED=3Dthorough' The set of tests under the "thorough" speed, however, can get rather large and it would be useful to have a way to expose further make targets for directly running a particular subset of tests. This needs a way to run a target without requiring the SPEED variable, while also not having them enabled by default as if they were 'quick' tests. This modifies mtest2make.py to support this idea by allowing for a new suffix '-optional' on a suite. When this is present, a correspondingly named make target will be created without the '-optional' suffix which will never be run automatically. This is intended to be combined with use of other suites. For example, a single NBD test might be added to two suites, 'block-thorough' and 'block-nbd-optional'. This would allow running it as part of all the block tests with 'make check-block SPEED=3Dthorough', and as part of a standalone target 'make check-block-nbd'. Acked-by: Kevin Wolf Reviewed-by: Pierrick Bouvier Signed-off-by: Daniel P. Berrang=C3=A9 --- scripts/mtest2make.py | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/scripts/mtest2make.py b/scripts/mtest2make.py index 915f02d600..383ea68b16 100644 --- a/scripts/mtest2make.py +++ b/scripts/mtest2make.py @@ -22,7 +22,7 @@ def names(self, base): print(r''' SPEED =3D quick =20 -.speed.quick =3D $(sort $(filter-out %-slow %-thorough, $1)) +.speed.quick =3D $(sort $(filter-out %-slow %-thorough %-optional, $1)) .speed.slow =3D $(sort $(filter-out %-thorough, $1)) .speed.thorough =3D $(sort $1) =20 @@ -66,10 +66,15 @@ def process_tests(test, targets, suites): s =3D s[:-9] suites[s].speeds.add('thorough') =20 +def target_name(suite): + if suite.endswith('-optional'): + return suite[0:-9] + return suite + def emit_prolog(suites, prefix): - all_targets =3D ' '.join((f'{prefix}-{k}' + all_targets =3D ' '.join((f'{prefix}-{target_name(k)}' for k in sorted(suites.keys()))) - all_xml =3D ' '.join((f'{prefix}-report-{k}.junit.xml' + all_xml =3D ' '.join((f'{prefix}-report-{target_name(k)}.junit.xml' for k in sorted(suites.keys()))) print() print(f'all-{prefix}-targets =3D {all_targets}') @@ -83,14 +88,17 @@ def emit_prolog(suites, prefix): print(f'\t$(MAKE) {prefix}$* MTESTARGS=3D"$(MTESTARGS) --logbase {pref= ix}-report$*" && ln -f meson-logs/$@ .') =20 def emit_suite(name, suite, prefix): + tgtname =3D target_name(name) deps =3D ' '.join(sorted(suite.deps)) print() - print(f'.{prefix}-{name}.deps =3D {deps}') - print(f'.ninja-goals.check-build +=3D $(.{prefix}-{name}.deps)') + print(f'.{prefix}-{tgtname}.deps =3D {deps}') + print(f'.ninja-goals.check-build +=3D $(.{prefix}-{tgtname}.deps)') =20 names =3D ' '.join(sorted(suite.names(name))) - targets =3D f'{prefix}-{name} {prefix}-report-{name}.junit.xml' - if not name.endswith('-slow') and not name.endswith('-thorough'): + targets =3D f'{prefix}-{tgtname} {prefix}-report-{tgtname}.junit.xml' + if not name.endswith('-slow') and \ + not name.endswith('-thorough') and \ + not name.endswith('-optional'): targets +=3D f' {prefix} {prefix}-report.junit.xml' print(f'ifneq ($(filter {targets}, $(MAKECMDGOALS)),)') # for the "base" suite possibly add FOO-slow and FOO-thorough --=20 2.54.0 From nobody Sat May 30 18:34:15 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1779268752; cv=none; d=zohomail.com; s=zohoarc; b=TsTOAKAnN6D5sSrGVgsj5MT0nWQWoZPLE1u53wsTUwKjeyH2FblxGVs6sGaqCZwe/K5Ug4eZVUM+3g/Fqzw/PL2ZUfpisqHZfs9rOFLnpiTjXe9R0KB4qSBzgvXfT/tTbvHLSPV6zXHg+GO6BKZm094AYqurLG44ZBDWGRCTElI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779268752; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=g0mdRxEs7jIc/mN/FPdqHSCe8wZeMa+T1SuzpES74iw=; b=leb22mgMkenjp6GSPcB4uPwt6ACcC1xDkhLAjdZJjXTgSQk0bjDtdz8m44R3JC1VQxWgSu5S3y5/zuCGc3ByhdO3CVCThlQOkJibWxU43j0ZX313tHds/VlKTy7CaBnrJVMXaVHN2wFupF+T6xw5kHAcEfaZ4LRY85Tl4gvtU54= 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=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779268752401722.0353674496982; Wed, 20 May 2026 02:19:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPd11-00055O-83; Wed, 20 May 2026 05:14:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPd0z-000502-Qp for qemu-devel@nongnu.org; Wed, 20 May 2026 05:14:57 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPd0y-0005mJ-2p for qemu-devel@nongnu.org; Wed, 20 May 2026 05:14:57 -0400 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-609-KXGUWQXIP3aCD7nmOJoCNQ-1; Wed, 20 May 2026 05:14:51 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6B2AD195605B; Wed, 20 May 2026 09:14:50 +0000 (UTC) Received: from berrange.com (unknown [10.44.49.211]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 4FDF318004A3; Wed, 20 May 2026 09:14:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779268495; 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=g0mdRxEs7jIc/mN/FPdqHSCe8wZeMa+T1SuzpES74iw=; b=cDfmQ9WwcnyyRAFSX+zTN+RTTHrdCO8HtwHHu+APtIetlK0vJnDa52hTsyYFQEw0fHc1re yKQwSlj+Nw2t6x44/6yl4ltzNz6hnf8eaRBedY5SMJYmgUy7mShLv+zfx1Gd9QULE9vHy5 8Aw6fK070gHZfjPzWP4mAcgaMrRkgsI= X-MC-Unique: KXGUWQXIP3aCD7nmOJoCNQ-1 X-Mimecast-MFC-AGG-ID: KXGUWQXIP3aCD7nmOJoCNQ_1779268490 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thanos Makatos , qemu-block@nongnu.org, Hanna Reitz , Kevin Wolf , Pierrick Bouvier , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , John Snow , John Levon , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa Subject: [PULL 10/29] iotests: add a meson suite / make target per block I/O tests format Date: Wed, 20 May 2026 10:13:32 +0100 Message-ID: <20260520091351.1160442-11-berrange@redhat.com> In-Reply-To: <20260520091351.1160442-1-berrange@redhat.com> References: <20260520091351.1160442-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1779268752774158500 Currently each block format is classified as either 'quick', 'slow' or 'thorough' and this controls whether its I/O tests are added to the meson suites 'block-quick', 'block-slow' or 'block-thorough'. This suites are exposed the 'check-block' make target, accepting the optional SPEED variable. As we add more formats to the 'thorough' group, however, it becomes increasingly large and time consuming to run. What is needed is a make target that can exercise all tests for an individual format, regardless of speed classification. This makes use of the previous enhancement to mtest2make.py to introduce new meson suites 'block-$FORMAT-optional', which translate to new top level make targets 'check-block-$FORMAT'. These new targets always run all tests and as such do not need the SPEED variable to be set, but are not triggered by 'make check' or 'make check-block'. Reviewed-by: Kevin Wolf Reviewed-by: Pierrick Bouvier Signed-off-by: Daniel P. Berrang=C3=A9 --- tests/Makefile.include | 3 ++- tests/qemu-iotests/meson.build | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index f257288194..a820980bbe 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -14,7 +14,8 @@ check-help: @echo " $(MAKE) check-unit Run qobject tests" @echo " $(MAKE) check-qapi-schema Run QAPI schema tests" @echo " $(MAKE) check-tracetool Run tracetool generator tes= ts" - @echo " $(MAKE) check-block Run block tests" + @echo " $(MAKE) check-block Run block tests (all format= s)" + @echo " $(MAKE) check-block-FORMAT Run block tests (only for F= ORMAT)" ifneq ($(filter $(all-check-targets), check-softfloat),) @echo " $(MAKE) check-softfloat Run FPU emulation tests" @echo " $(MAKE) check-tcg Run TCG tests" diff --git a/tests/qemu-iotests/meson.build b/tests/qemu-iotests/meson.build index 1a24d801a3..16a5e39476 100644 --- a/tests/qemu-iotests/meson.build +++ b/tests/qemu-iotests/meson.build @@ -62,7 +62,8 @@ foreach format, speed: qemu_iotests_formats endforeach endif =20 - suites =3D [] + # Every format gets put in the format specific suite + suites =3D ['block-' + format + '-optional'] # Any format tagged quick or slow also gets added to slow # otherwise its tagged thorough if speed !=3D 'thorough' --=20 2.54.0 From nobody Sat May 30 18:34:15 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1779268645; cv=none; d=zohomail.com; s=zohoarc; b=KTTKPKmmxrxpc6p5hW+tLp0lQvsqTj+dEOTxZNLfMMQMNZpGYeDYFex7SwS52RvvKwQ93msQXwSwvxvk8Ajdt6XiZKkLEmNML+XN1Ayl86TigazbGIrV8/6u7Xtiyosv8Tyh9WDGBIPlKnf/LdWyS6NV4zf/RqZc8YVWQPo+U1Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779268645; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=81Xya2hYVglF9oHeEzHTGoXGBXch/bRuppaX98og99s=; b=llv3RX6q7UlcKBOQ+ZZITQC8owzhlkNoesHJD9NgGBvYtlLJlmq4Rpb/rG+xfas3zZN6WgD+BH5oDpwwrLp7Ei2Ei7uCB1gUMM/eXMos6McJInNJliGgkkSMyFUzkrWoi2OyRB0EML1BmXBp0alcX2iYgXHH6zH0d23hj0MfNJk= 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=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779268645621266.6832005637973; Wed, 20 May 2026 02:17:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPd17-0005O9-2v; Wed, 20 May 2026 05:15:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPd14-0005Gr-KB for qemu-devel@nongnu.org; Wed, 20 May 2026 05:15:02 -0400 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 1wPd13-0005nd-05 for qemu-devel@nongnu.org; Wed, 20 May 2026 05:15:02 -0400 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-68-dbT_bdjhNqu4EO77yE1IFg-1; Wed, 20 May 2026 05:14:57 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id BC5531956046; Wed, 20 May 2026 09:14:55 +0000 (UTC) Received: from berrange.com (unknown [10.44.49.211]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 08EE8180075B; Wed, 20 May 2026 09:14:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779268500; 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=81Xya2hYVglF9oHeEzHTGoXGBXch/bRuppaX98og99s=; b=M/W2tz/DnO7IRJ/eNsTxONQA78b1Mdpe3FO3UIl29Q6rsKi/Z1H5gYIKf8mYVIb96rlqAI klYaghHFvzVzjz+KaIpK5hNJwdPb8uieYcYh+Zdy5P8a4mVX229CL1a2G/Tx26pjsj6xVO +Qc0+5UI/hwqqorNbQjit525jR3+Neg= X-MC-Unique: dbT_bdjhNqu4EO77yE1IFg-1 X-Mimecast-MFC-AGG-ID: dbT_bdjhNqu4EO77yE1IFg_1779268495 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thanos Makatos , qemu-block@nongnu.org, Hanna Reitz , Kevin Wolf , Pierrick Bouvier , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , John Snow , John Levon , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa , Thomas Huth Subject: [PULL 11/29] docs/devel/testing: expand documentation for 'make check-block' Date: Wed, 20 May 2026 10:13:33 +0100 Message-ID: <20260520091351.1160442-12-berrange@redhat.com> In-Reply-To: <20260520091351.1160442-1-berrange@redhat.com> References: <20260520091351.1160442-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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=lists1p.gnu.org; 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: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1779268645882158500 Explain in greater detail what 'check-block' will run for each format, and also document the new format specific targets. Reviewed-by: Kevin Wolf Reviewed-by: Thomas Huth Reviewed-by: Pierrick Bouvier Signed-off-by: Daniel P. Berrang=C3=A9 --- docs/devel/testing/main.rst | 25 ++++++++++++++++++++++--- tests/qemu-iotests/meson.build | 2 ++ 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/docs/devel/testing/main.rst b/docs/devel/testing/main.rst index b01a374865..f691c624c1 100644 --- a/docs/devel/testing/main.rst +++ b/docs/devel/testing/main.rst @@ -236,9 +236,28 @@ same commit that alters the generator code. check-block ~~~~~~~~~~~ =20 -``make check-block`` runs a subset of the block layer iotests (the tests t= hat -are in the "auto" group). -See the "QEMU iotests" section below for more information. +There are a variety of ways to exercise the block layer I/O tests +via make targets. + +A default ``make check`` or ``make check-block`` command will exercise +the ``qcow2`` format, using the tests tagged into the ``auto`` group +only. + +These targets accept the ``SPEED`` variable to augment the set of tests +to run. A slightly more comprehensive test plan can be run by defining +``SPEED=3Dslow``, which enables all tests for the ``qcow2`` and ``raw`` +formats. The most comprehensive test plan can be run by defining +``SPEED=3Dthorough``, which enables all available tests for the formats +``parallels``, ``qcow2``, ``qed``, ``raw``, ``vdi``, ``vhdx``, +``vmdk``, and ``vpc``. + +Each of formats also has its own dedicated make target, named +``make check-block-$FORMAT`` which will run all available tests for +the designated format and does not require the ``SPEED`` variable +to be set. + +See the "QEMU iotests" section below for more information on the +block I/O test framework that is leveraged by these ``make`` targets. =20 .. _qemu-iotests: =20 diff --git a/tests/qemu-iotests/meson.build b/tests/qemu-iotests/meson.build index 16a5e39476..66b09d6b97 100644 --- a/tests/qemu-iotests/meson.build +++ b/tests/qemu-iotests/meson.build @@ -10,6 +10,8 @@ endif =20 qemu_iotests_binaries =3D [qemu_img, qemu_io, qemu_nbd, qsd] qemu_iotests_env =3D {'PYTHON': python.full_path()} +# If altering this definition, also update docs/devel/testing/main.rst +# section on 'check-block' targets to reflect the changes qemu_iotests_formats =3D { 'qcow2': 'quick', 'raw': 'slow', --=20 2.54.0 From nobody Sat May 30 18:34:15 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1779268765; cv=none; d=zohomail.com; s=zohoarc; b=S8UrLIpcFZeTP56+heuBQwrX2OeZKWuR5I4H0byDFB2aIFlvC/RrNHfQ80Bx6GIPKv+M1DFAGhDlbnuiiFRiVtA9rO9SGKUJcxITguytdFERy6DjHGWpY0UmsokzrZoW6sY5P00yKuhT2GhQ4OF2l5Bc46dUA7ICdbvZON4L7w4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779268765; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ra1kgjEHqlBV+HJzlKtlJ7lUkm2o1amu5l5BhHzmIxE=; b=SlVXqBuMLXyiHPh+IskFrDHab5LQoPodMuTrIq189sNszSZkxgUR7Mc1YeH7JmISujmTWMc/CKg42EHbDIFhUbHwJZDDAN+OzvXt/Cuu81++UdfFnIckJNaRoz7vsrZAZWeUQmKFICWvLeaorv77pBEGNs4M89vb3W/HMnux/K4= 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=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779268765300383.28154885433435; Wed, 20 May 2026 02:19:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPd1D-0005g2-BF; Wed, 20 May 2026 05:15:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPd1A-0005WG-M7 for qemu-devel@nongnu.org; Wed, 20 May 2026 05:15:08 -0400 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 1wPd18-00061w-OZ for qemu-devel@nongnu.org; Wed, 20 May 2026 05:15:08 -0400 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-180-AQNsxBcZNU6I4tU9UK29Jg-1; Wed, 20 May 2026 05:15:01 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 703F81800603; Wed, 20 May 2026 09:15:00 +0000 (UTC) Received: from berrange.com (unknown [10.44.49.211]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 58B4F180075B; Wed, 20 May 2026 09:14:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779268506; 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=ra1kgjEHqlBV+HJzlKtlJ7lUkm2o1amu5l5BhHzmIxE=; b=EOdMZyi6VdeZT5noyNfdnkZsg/PmK9skxOGfjfi9xhC8FdfV9jl34Z/sbqybI2f4q6c3W9 PtXNooRmZlF52Qy5au+blTf9sBLxqHQGD76C0bErFe/WCbokqHfo8g8/WLfdlcVT5Oa7FX 3rXmtsNtO9H/s9iNRzE6bZW0bb9UXOk= X-MC-Unique: AQNsxBcZNU6I4tU9UK29Jg-1 X-Mimecast-MFC-AGG-ID: AQNsxBcZNU6I4tU9UK29Jg_1779268500 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thanos Makatos , qemu-block@nongnu.org, Hanna Reitz , Kevin Wolf , Pierrick Bouvier , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , John Snow , John Levon , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa Subject: [PULL 12/29] iotests: add nbd and luks to the I/O test suites Date: Wed, 20 May 2026 10:13:34 +0100 Message-ID: <20260520091351.1160442-13-berrange@redhat.com> In-Reply-To: <20260520091351.1160442-1-berrange@redhat.com> References: <20260520091351.1160442-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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=lists1p.gnu.org; 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: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1779268766849154100 This introduces new suites for running I/O tests on NBD and LUKS drivers, giving new make targets * make check-block-luks * make check-block-nbd as well as adding their tests to 'make check-block SPEED=3Dthorough' Reviewed-by: Kevin Wolf Reviewed-by: Pierrick Bouvier Signed-off-by: Daniel P. Berrang=C3=A9 --- docs/devel/testing/main.rst | 4 ++-- tests/qemu-iotests/meson.build | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/devel/testing/main.rst b/docs/devel/testing/main.rst index f691c624c1..843592e3e0 100644 --- a/docs/devel/testing/main.rst +++ b/docs/devel/testing/main.rst @@ -248,8 +248,8 @@ to run. A slightly more comprehensive test plan can be = run by defining ``SPEED=3Dslow``, which enables all tests for the ``qcow2`` and ``raw`` formats. The most comprehensive test plan can be run by defining ``SPEED=3Dthorough``, which enables all available tests for the formats -``parallels``, ``qcow2``, ``qed``, ``raw``, ``vdi``, ``vhdx``, -``vmdk``, and ``vpc``. +``luks``, ``nbd``, ``parallels``, ``qcow2``, ``qed``, ``raw``, ``vdi``, +``vhdx``, ``vmdk``, and ``vpc``. =20 Each of formats also has its own dedicated make target, named ``make check-block-$FORMAT`` which will run all available tests for diff --git a/tests/qemu-iotests/meson.build b/tests/qemu-iotests/meson.build index 66b09d6b97..744d0b6e88 100644 --- a/tests/qemu-iotests/meson.build +++ b/tests/qemu-iotests/meson.build @@ -15,12 +15,14 @@ qemu_iotests_env =3D {'PYTHON': python.full_path()} qemu_iotests_formats =3D { 'qcow2': 'quick', 'raw': 'slow', + 'luks': 'thorough', + 'nbd': 'thorough', 'parallels': 'thorough', 'qed': 'thorough', 'vdi': 'thorough', 'vhdx': 'thorough', 'vmdk': 'thorough', - 'vpc': 'thorough' + 'vpc': 'thorough', } =20 foreach k, v : emulators --=20 2.54.0 From nobody Sat May 30 18:34:15 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1779268727; cv=none; d=zohomail.com; s=zohoarc; b=WgaAO5r16mxhKc4dgSRA2yWMF+hNqRyZKw0TBTdslr0WtcAALhc4C+oR9X8FvSrt4D/9wTgq2mVw2FYmJfaKye7swPjgxspb2Rbfv6ye0efnKEUirCl4ppBwn/xZY7rTZ+1fg6OzE7Mt05itkTpN6NncXMrlqueNLTdywsALCVI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779268727; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=sLUP+Qqi8lwekmHrpvHEeDIL4kMTGn1JTiOLLT00BOs=; b=N4uvI0F7QRhCd0yqszIeEaWaU/BA29u2fXyQB3H1xiE21SmoWdXMx6a0yyMEEPRoaI+LGLYNovTkXHVR8pmiUN7z5SGdNmnIFdEtXG55oCZqe1WQ4PuzvmYRHbNQXmviF6k9eWjB3tCZFSzAP1IX96CUsGAc3jP6C2+sjIYbR/k= 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=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779268727357108.82570171821078; Wed, 20 May 2026 02:18:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPd1I-0005l8-NS; Wed, 20 May 2026 05:15:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPd1F-0005kO-UP for qemu-devel@nongnu.org; Wed, 20 May 2026 05:15:14 -0400 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 1wPd1C-00063A-T3 for qemu-devel@nongnu.org; Wed, 20 May 2026 05:15:13 -0400 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-582-8gh0wpOWMSCiwyAu4mtuSw-1; Wed, 20 May 2026 05:15:06 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6D44A1956054; Wed, 20 May 2026 09:15:05 +0000 (UTC) Received: from berrange.com (unknown [10.44.49.211]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0E81E1800760; Wed, 20 May 2026 09:15:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779268509; 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=sLUP+Qqi8lwekmHrpvHEeDIL4kMTGn1JTiOLLT00BOs=; b=J497961NOyJlBydjTP8oIKYhVviHEX5I5Bww5t7mBRImneBYtGKOJpez3s9x53PJP7y1u2 An9+I+fjFmB14mhiHLtQgL7F4UKUL/D4lRF90VxSLKw46n5L9vinsUd+zIttLHga7fxkcb jk/h/5iAZX/BQdDhdnPVRS2AeR9nEQw= X-MC-Unique: 8gh0wpOWMSCiwyAu4mtuSw-1 X-Mimecast-MFC-AGG-ID: 8gh0wpOWMSCiwyAu4mtuSw_1779268505 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thanos Makatos , qemu-block@nongnu.org, Hanna Reitz , Kevin Wolf , Pierrick Bouvier , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , John Snow , John Levon , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa , Thomas Huth Subject: [PULL 13/29] iotests: use 'driver' as collective term for either format or protocol Date: Wed, 20 May 2026 10:13:35 +0100 Message-ID: <20260520091351.1160442-14-berrange@redhat.com> In-Reply-To: <20260520091351.1160442-1-berrange@redhat.com> References: <20260520091351.1160442-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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=lists1p.gnu.org; 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: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1779268728264154100 The I/O tests integration previously exclusively tested block formats and now also covers the NBD protocol. Replace references to 'format' with 'driver', as a generic term to collectively apply to either a format or protocol. Reviewed-by: Thomas Huth Reviewed-by: Pierrick Bouvier Signed-off-by: Daniel P. Berrang=C3=A9 --- docs/devel/testing/main.rst | 13 +++++++------ tests/Makefile.include | 4 ++-- tests/qemu-iotests/meson.build | 24 ++++++++++++------------ 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/docs/devel/testing/main.rst b/docs/devel/testing/main.rst index 843592e3e0..c0321d1d25 100644 --- a/docs/devel/testing/main.rst +++ b/docs/devel/testing/main.rst @@ -237,7 +237,8 @@ check-block ~~~~~~~~~~~ =20 There are a variety of ways to exercise the block layer I/O tests -via make targets. +via make targets for a selection of formats / protocols (collectively +referred to as ``drivers`` below). =20 A default ``make check`` or ``make check-block`` command will exercise the ``qcow2`` format, using the tests tagged into the ``auto`` group @@ -246,14 +247,14 @@ only. These targets accept the ``SPEED`` variable to augment the set of tests to run. A slightly more comprehensive test plan can be run by defining ``SPEED=3Dslow``, which enables all tests for the ``qcow2`` and ``raw`` -formats. The most comprehensive test plan can be run by defining -``SPEED=3Dthorough``, which enables all available tests for the formats +drivers. The most comprehensive test plan can be run by defining +``SPEED=3Dthorough``, which enables all available tests for the drivers ``luks``, ``nbd``, ``parallels``, ``qcow2``, ``qed``, ``raw``, ``vdi``, ``vhdx``, ``vmdk``, and ``vpc``. =20 -Each of formats also has its own dedicated make target, named -``make check-block-$FORMAT`` which will run all available tests for -the designated format and does not require the ``SPEED`` variable +Each of drivers also has its own dedicated make target, named +``make check-block-$DRIVER`` which will run all available tests for +the designated driver and does not require the ``SPEED`` variable to be set. =20 See the "QEMU iotests" section below for more information on the diff --git a/tests/Makefile.include b/tests/Makefile.include index a820980bbe..a063a1d60f 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -14,8 +14,8 @@ check-help: @echo " $(MAKE) check-unit Run qobject tests" @echo " $(MAKE) check-qapi-schema Run QAPI schema tests" @echo " $(MAKE) check-tracetool Run tracetool generator tes= ts" - @echo " $(MAKE) check-block Run block tests (all format= s)" - @echo " $(MAKE) check-block-FORMAT Run block tests (only for F= ORMAT)" + @echo " $(MAKE) check-block Run block tests (all format= s/protocols)" + @echo " $(MAKE) check-block-DRIVER Run block tests (only for f= ormat/protocol 'DRIVER')" ifneq ($(filter $(all-check-targets), check-softfloat),) @echo " $(MAKE) check-softfloat Run FPU emulation tests" @echo " $(MAKE) check-tcg Run TCG tests" diff --git a/tests/qemu-iotests/meson.build b/tests/qemu-iotests/meson.build index 744d0b6e88..bc6132a0f7 100644 --- a/tests/qemu-iotests/meson.build +++ b/tests/qemu-iotests/meson.build @@ -12,7 +12,7 @@ qemu_iotests_binaries =3D [qemu_img, qemu_io, qemu_nbd, q= sd] qemu_iotests_env =3D {'PYTHON': python.full_path()} # If altering this definition, also update docs/devel/testing/main.rst # section on 'check-block' targets to reflect the changes -qemu_iotests_formats =3D { +qemu_iotests_drivers =3D { 'qcow2': 'quick', 'raw': 'slow', 'luks': 'thorough', @@ -33,12 +33,12 @@ endforeach =20 qemu_iotests_check_cmd =3D files('check') =20 -foreach format, speed: qemu_iotests_formats - # Formats tagged 'quick' get the subset of tests in the 'auto' +foreach driver, speed: qemu_iotests_drivers + # Drivers tagged 'quick' get the subset of tests in the 'auto' # group, run by default with 'make check' / 'make check-block' seen =3D [] if speed =3D=3D 'quick' - args =3D ['-tap', '-' + format, '-g', 'auto'] + args =3D ['-tap', '-' + driver, '-g', 'auto'] suites =3D ['block'] =20 rc =3D run_command( @@ -49,13 +49,13 @@ foreach format, speed: qemu_iotests_formats foreach item: rc.stdout().strip().split() seen +=3D item args =3D [qemu_iotests_check_cmd, - '-tap', '-' + format, item, + '-tap', '-' + driver, item, '--source-dir', meson.current_source_dir(), '--build-dir', meson.current_build_dir()] # Some individual tests take as long as 45 seconds # Bump the timeout to 3 minutes for some headroom # on slow machines to minimize spurious failures - test('io-' + format + '-' + item, + test('io-' + driver + '-' + item, python, args: args, depends: qemu_iotests_binaries, @@ -66,9 +66,9 @@ foreach format, speed: qemu_iotests_formats endforeach endif =20 - # Every format gets put in the format specific suite - suites =3D ['block-' + format + '-optional'] - # Any format tagged quick or slow also gets added to slow + # Every driver gets put in the driver specific suite + suites =3D ['block-' + driver + '-optional'] + # Any driver tagged quick or slow also gets added to slow # otherwise its tagged thorough if speed !=3D 'thorough' suites +=3D ['block-slow'] @@ -76,7 +76,7 @@ foreach format, speed: qemu_iotests_formats suites +=3D ['block-thorough'] endif =20 - args =3D ['-tap', '-' + format] + args =3D ['-tap', '-' + driver] =20 rc =3D run_command( [python, qemu_iotests_check_cmd] + args + ['-n'], @@ -91,13 +91,13 @@ foreach format, speed: qemu_iotests_formats endif =20 args =3D [qemu_iotests_check_cmd, - '-tap', '-' + format, item, + '-tap', '-' + driver, item, '--source-dir', meson.current_source_dir(), '--build-dir', meson.current_build_dir()] # Some individual tests take as long as 45 seconds # Bump the timeout to 3 minutes for some headroom # on slow machines to minimize spurious failures - test('io-' + format + '-' + item, + test('io-' + driver + '-' + item, python, args: args, depends: qemu_iotests_binaries, --=20 2.54.0 From nobody Sat May 30 18:34:15 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1779268551; cv=none; d=zohomail.com; s=zohoarc; b=mCXwyBsRHSC8C6zPc74GNECKPrAQrAcx+P1hSy2KJFMNyB156QIBB+gzTzTA7eWvykLu0PR/nWSYuJjKCtMnO0rfYMSOYefiJtHjo/AfG/WTEEAEw5EgmUtfm8OZguB5V5s4GEjCsbNpbol/+zdf78ArwAq/mwcCtwc8aEYu+f0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779268551; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=S1qpIroQyaGIbCB6MQky+U4C7yjILb1PZ8jYJABwVSg=; b=O8dXV8v7oGEgC1RGpae57ls416Itv92aN2oy4n/ZDOcYBQOR/Oof3SJpIfjomjMdHEhSkrfNMyQUALw4AExi0pisy+RU4+fk2eTDtPLPiwXLXSgI+b8YnU33PNL+5SQkSQ4T1HaScnAGHA7D8u+7/MOWJ4a+ytabKCYUDGBd4z4= 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=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779268551271350.6841783671481; Wed, 20 May 2026 02:15:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPd1K-0005mR-IZ; Wed, 20 May 2026 05:15:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPd1J-0005lz-Ac for qemu-devel@nongnu.org; Wed, 20 May 2026 05:15:17 -0400 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 1wPd1H-00064j-TA for qemu-devel@nongnu.org; Wed, 20 May 2026 05:15:17 -0400 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-196-6Nw5REvdMUi1oiTfAaWCcQ-1; Wed, 20 May 2026 05:15:11 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5CC9E18005B8; Wed, 20 May 2026 09:15:10 +0000 (UTC) Received: from berrange.com (unknown [10.44.49.211]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id F102418001EF; Wed, 20 May 2026 09:15:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779268515; 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=S1qpIroQyaGIbCB6MQky+U4C7yjILb1PZ8jYJABwVSg=; b=b+s49NnO/paaM7r8ufOkuXZIkt5GJFPTby5OQYWaexqmRGZm2viIQrZ+miQuYOO4x/583i lFxPJkjcLxwFun6JvIOlZ0cL+I/AQv61gSbc4VbxkPB7Yr+vpTsojvBgNsYkjGFiVAAVdk cfEdOqt7URBgqvBe8Dnjr0AhxRvPoTM= X-MC-Unique: 6Nw5REvdMUi1oiTfAaWCcQ-1 X-Mimecast-MFC-AGG-ID: 6Nw5REvdMUi1oiTfAaWCcQ_1779268510 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thanos Makatos , qemu-block@nongnu.org, Hanna Reitz , Kevin Wolf , Pierrick Bouvier , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , John Snow , John Levon , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa Subject: [PULL 14/29] iotests: validate dmsetup result in test 128 Date: Wed, 20 May 2026 10:13:36 +0100 Message-ID: <20260520091351.1160442-15-berrange@redhat.com> In-Reply-To: <20260520091351.1160442-1-berrange@redhat.com> References: <20260520091351.1160442-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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=lists1p.gnu.org; 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: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1779268553068154100 The I/O test 128 uses 'dmsetup create' to create a device, optionally using sudo to elevate privileges. This dmsetup command works in GitLab CI, however, the test then fails with a missing device name: 1..1 # running raw 128 not ok raw 128 ----------------------------------- stderr ------------------------------= ----- --- /builds/berrange/qemu/tests/qemu-iotests/128.out +++ /builds/berrange/qemu/build/scratch/raw-file-128/128.out.bad @@ -1,5 +1,5 @@ QA output created by 128 =3D=3D reading from error device =3D=3D -read failed: Input/output error +qemu-io: can't open device /dev/mapper/eiodev16546: Could not open '/dev= /mapper/eiodev16546': No such file or directory *** done (test program exited with status code 1) It is believed that this is due to the build env using a manually populated /dev, such that the device mapper node won't ever appear. It is not a race, since a test adding a sleep did not result in the device appearing. Reviewed-by: Kevin Wolf Reviewed-by: Pierrick Bouvier Signed-off-by: Daniel P. Berrang=C3=A9 --- tests/qemu-iotests/128 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/qemu-iotests/128 b/tests/qemu-iotests/128 index d0e00d24b1..d75b1a451a 100755 --- a/tests/qemu-iotests/128 +++ b/tests/qemu-iotests/128 @@ -42,6 +42,12 @@ _setup_eiodev() echo "0 $((1024 * 1024 * 1024 / 512)) error" | \ $cmd dmsetup create "$devname" 2>/dev/null if [ "$?" -eq 0 ]; then + DEV=3D"/dev/mapper/$devname" + if ! -e $DEV + then + _notrun "Device $DEV not appearing" + fi + sudo=3D"$cmd" return fi --=20 2.54.0 From nobody Sat May 30 18:34:15 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1779268586; cv=none; d=zohomail.com; s=zohoarc; b=V7+1vYZVb78B6Jg6YLys15OzVHk5/BEZ9I1lMtny1FgBYI4zIufoIboAz3gHGKRT7F9PrE3gyB0KFBTTpjcbOwxngEk66XXjZillGI6TUdF6N1b6UfVLmcmyCcCxNJ2Ao3aHALsAr7H7dvTFZRJR+QWSI8ehPYkSHrvBS0RQGbA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779268586; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=rC1gQ4KCww6UmwMM2Hg5rZTpCm9TVmnOV9UbYZ7eups=; b=JsflKnZD+czV5JPHrJE45pku+AvyHyzvm5N0rpRIJ1DEi6WB3+Uw2vqAoD7RRvBvbgFbszrPB14ZyJYqJhRtJtFTCIU7gwavKbl56yCnJ6x7Wlu9Pgx/+jeCNToUKbuKWuahCwceMrycyGXdAJEOS70nbC8OaQ4057IMa2fICTA= 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=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779268586213770.7591341454317; Wed, 20 May 2026 02:16:26 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPd1T-00064R-Hb; Wed, 20 May 2026 05:15:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPd1N-0005uQ-SC for qemu-devel@nongnu.org; Wed, 20 May 2026 05:15:22 -0400 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 1wPd1M-000671-G1 for qemu-devel@nongnu.org; Wed, 20 May 2026 05:15:21 -0400 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-182-u7DKdIsGNlylIxdaOtFSGQ-1; Wed, 20 May 2026 05:15:16 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6971E19560B0; Wed, 20 May 2026 09:15:15 +0000 (UTC) Received: from berrange.com (unknown [10.44.49.211]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id DD71A18001EF; Wed, 20 May 2026 09:15:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779268519; 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=rC1gQ4KCww6UmwMM2Hg5rZTpCm9TVmnOV9UbYZ7eups=; b=gGe3PGYZa8V6WWMuq04jv7AS5LQr5kZVHmWlejuyKdXZH9LRyJ22WKxYYKLWXHIl4QElJ3 g/ZSlaMvinT05+KGKnSBQEeG7WzVLGNw8C4irCvluZZIlLdyc2+0XFK2wZSOhsOEtm5U5H y9nFvW02BB4z9AM0KBsWgrEd8qGxURc= X-MC-Unique: u7DKdIsGNlylIxdaOtFSGQ-1 X-Mimecast-MFC-AGG-ID: u7DKdIsGNlylIxdaOtFSGQ_1779268515 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thanos Makatos , qemu-block@nongnu.org, Hanna Reitz , Kevin Wolf , Pierrick Bouvier , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , John Snow , John Levon , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa , Thomas Huth Subject: [PULL 15/29] iotests: fix check for sudo access in LUKS I/O test Date: Wed, 20 May 2026 10:13:37 +0100 Message-ID: <20260520091351.1160442-16-berrange@redhat.com> In-Reply-To: <20260520091351.1160442-1-berrange@redhat.com> References: <20260520091351.1160442-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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=lists1p.gnu.org; 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: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1779268606782154100 The test did not cope with the possibility that 'sudo' was not installed at all, merely that it was not configured. This broke tests in any CI env which lacks 'sudo'. Reviewed-by: Kevin Wolf Reviewed-by: Thomas Huth Reviewed-by: Pierrick Bouvier Signed-off-by: Daniel P. Berrang=C3=A9 --- tests/qemu-iotests/149 | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tests/qemu-iotests/149 b/tests/qemu-iotests/149 index c13343d7ef..6dff39a28a 100755 --- a/tests/qemu-iotests/149 +++ b/tests/qemu-iotests/149 @@ -95,11 +95,14 @@ def verify_passwordless_sudo(): =20 args =3D ["sudo", "-n", "/bin/true"] =20 - proc =3D subprocess.Popen(args, - stdin=3Dsubprocess.PIPE, - stdout=3Dsubprocess.PIPE, - stderr=3Dsubprocess.STDOUT, - universal_newlines=3DTrue) + try: + proc =3D subprocess.Popen(args, + stdin=3Dsubprocess.PIPE, + stdout=3Dsubprocess.PIPE, + stderr=3Dsubprocess.STDOUT, + universal_newlines=3DTrue) + except FileNotFoundError as e: + iotests.notrun('requires sudo binary: %s' % e) =20 msg =3D proc.communicate()[0] =20 --=20 2.54.0 From nobody Sat May 30 18:34:15 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1779268638; cv=none; d=zohomail.com; s=zohoarc; b=fMi69v06lIv3BGRkFk+wtIg4A1K3+pEIopHHjVQWb4SgOv3ojZBt+n1vQGrChodjkmIpdWUU1bOvLy2ZjG4ztVuOEFfOyB+/Q2ATgXJZeJ8ExNSCd30tC6PhhMaYbPajNUTL4XIqOizaVW9rXcsp01ZWZUro9WQtzxafMekwtTE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779268638; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=qyI/tzMp2ImDMh0+rZ0xpwtnUXHIjbxTzj+UiEn3P/Y=; b=aW3xP9Ek3NE60jOoS9gkIfEvVWpn7IzkHglkb1dDUKyvOKKvtAbvNIkBd7c2ECZMSTVy5/cVh2+1iIpzXkxyVrUZAQtvwDZXynMIq9xAUtBpbD6b6rU/v+/iH5Qa5IgL3nkSAu8KUrm/Jy4k+LUVZ04OZRCpTs2/yibeNcUQ3lY= 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=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779268638456313.637520435023; Wed, 20 May 2026 02:17:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPd1Y-0006CU-31; Wed, 20 May 2026 05:15:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPd1U-00066R-K9 for qemu-devel@nongnu.org; Wed, 20 May 2026 05:15:29 -0400 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 1wPd1S-00068F-4s for qemu-devel@nongnu.org; Wed, 20 May 2026 05:15:28 -0400 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-80-QXwsrN13MZ-YOHJjPmvxTA-1; Wed, 20 May 2026 05:15:21 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 3C6B118005BE; Wed, 20 May 2026 09:15:20 +0000 (UTC) Received: from berrange.com (unknown [10.44.49.211]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E06C818004A3; Wed, 20 May 2026 09:15:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779268525; 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=qyI/tzMp2ImDMh0+rZ0xpwtnUXHIjbxTzj+UiEn3P/Y=; b=Wdqr9/vZVOkBfxu890glRbeQPiWARtnLm6EMO9FYgCzX/KKTDVaUzy6dYggy0CbmmWeETs E/f3ReJ2WUELKvgzGyGbiar6oF7/SOpTzStUSZrGXHDI3a7Yc5V2I25Mc49o2Y13dkOx60 4G4RwJKBOYZ3R7WwBCHin5MtEYTlybc= X-MC-Unique: QXwsrN13MZ-YOHJjPmvxTA-1 X-Mimecast-MFC-AGG-ID: QXwsrN13MZ-YOHJjPmvxTA_1779268520 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thanos Makatos , qemu-block@nongnu.org, Hanna Reitz , Kevin Wolf , Pierrick Bouvier , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , John Snow , John Levon , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa , Thomas Huth Subject: [PULL 16/29] iotests: mark 185 as a flaky test Date: Wed, 20 May 2026 10:13:38 +0100 Message-ID: <20260520091351.1160442-17-berrange@redhat.com> In-Reply-To: <20260520091351.1160442-1-berrange@redhat.com> References: <20260520091351.1160442-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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=lists1p.gnu.org; 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: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1779268639812158500 Introduce a "_flaky_test" function for I/O tests which accepts a GitLab issue URL, and causes the I/O test to be skipped unless the $QEMU_TEST_FLAKY_TESTS environment variable is set. This is used by test 185 which currently fails in GitLab CI for unknown reasons. Reviewed-by: Kevin Wolf Reviewed-by: Thomas Huth Reviewed-by: Pierrick Bouvier Signed-off-by: Daniel P. Berrang=C3=A9 --- tests/qemu-iotests/185 | 1 + tests/qemu-iotests/common.rc | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/tests/qemu-iotests/185 b/tests/qemu-iotests/185 index 17489fb91c..a62ae8d329 100755 --- a/tests/qemu-iotests/185 +++ b/tests/qemu-iotests/185 @@ -50,6 +50,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto file _supported_os Linux +_flaky_test https://gitlab.com/qemu-project/qemu/-/issues/3270 =20 size=3D$((64 * 1048576)) TEST_IMG=3D"${TEST_IMG}.base" _make_test_img $size diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc index 731e4b2b99..298bc483e0 100644 --- a/tests/qemu-iotests/common.rc +++ b/tests/qemu-iotests/common.rc @@ -1088,5 +1088,21 @@ _qcow2_dump_header() fi } =20 +# This must be referenced after any _require_ lines, so that +# test filtering happens first +_flaky_test() +{ + if test -z "$1" + then + echo "A GitLab issue URL must be provided for a flaky test" + exit 1 + fi + + if test -z "$QEMU_TEST_FLAKY_TESTS" + then + _notrun "Test is flaky (see $1) and \$QEMU_TEST_FLAKY_TESTS is not set" + fi +} + # make sure this script returns success true --=20 2.54.0 From nobody Sat May 30 18:34:15 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1779268590; cv=none; d=zohomail.com; s=zohoarc; b=hj/u8Y2ptfnw6jOwG0MZBX+IGfMP8Y+ts0kvPKYt5wD/9u6gD3f6JWqtyTjDJqk70E8XcwVQyotIdJ1yp9Uhyb37c1n2ZLlH32WcYgPC8dMQ6wCNCLF/RKB182bZcY3HP9mDOeva21GNUlB6L73URfeQ/rsH7B3TOfqolOZ6ZuU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779268590; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=7WmkbRyCOvc8KhMxUJJu07mhxWy5DTBCisJMQWdsY70=; b=RLNV8HSHWqZot5gvSvUgEnV3wbjCH8F6bXsmSfJLnEg02qQLT6Pd2xNNeUUaPDx8UIkJK41MpYIYredtO3t73Wm7y+pc6Wxne1B9HoCA1O3huDo6lHJ0E9w4+jyqRV2TNOIFSR4Uf8fe+z2VMBLKS0XzR+mM2eS2MjmDfGI4u4U= 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=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779268590270763.6826514700557; Wed, 20 May 2026 02:16:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPd1Y-0006Dy-ID; Wed, 20 May 2026 05:15:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPd1W-000682-1L for qemu-devel@nongnu.org; Wed, 20 May 2026 05:15:30 -0400 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 1wPd1U-00069W-C3 for qemu-devel@nongnu.org; Wed, 20 May 2026 05:15:29 -0400 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-610-Km88CWgxPAmA0sb9Q9aPQA-1; Wed, 20 May 2026 05:15:26 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E9CEB1956053; Wed, 20 May 2026 09:15:24 +0000 (UTC) Received: from berrange.com (unknown [10.44.49.211]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id BBB251800347; Wed, 20 May 2026 09:15:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779268527; 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=7WmkbRyCOvc8KhMxUJJu07mhxWy5DTBCisJMQWdsY70=; b=PUVUBj7tbnhEB8ID++9fNvvjXRDAVQlI7IXqDzMfM1OQQZo6QTDnMW6LCQVoebTrzhC/uv 6+l4aBtMUyFy2J1Z48upnhiqbLbz6Be1yJfEOmKno5ITR2oWJ2HYWVX7iQqZ6peDn/brAj PS5QbHGh5FoG+hdxkzd0LlUSThJelCg= X-MC-Unique: Km88CWgxPAmA0sb9Q9aPQA-1 X-Mimecast-MFC-AGG-ID: Km88CWgxPAmA0sb9Q9aPQA_1779268525 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thanos Makatos , qemu-block@nongnu.org, Hanna Reitz , Kevin Wolf , Pierrick Bouvier , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , John Snow , John Levon , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa Subject: [PULL 17/29] gitlab: add jobs for thorough block tests Date: Wed, 20 May 2026 10:13:39 +0100 Message-ID: <20260520091351.1160442-18-berrange@redhat.com> In-Reply-To: <20260520091351.1160442-1-berrange@redhat.com> References: <20260520091351.1160442-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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=lists1p.gnu.org; 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: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1779268591659154100 CI is only exercising the qcow2 'auto' tests currently. As a result we get no exposure of changes which cause regressions in other block format drivers. This adds new CI jobs for each block format, that will run the target 'make check-block-$FORMAT'. The jobs are separate so that we have the ability to make each format gating or not, depending on their level of reliability. The 'centos' image is used to run the I/O tests since several tests have an implicit dependency on x86_64-softmmu, and thus break with other architecture targets. The 'centos' build job is the only one that creates the x86_64-softmmu target in CI. Ideally this target portability in I/O tests would be fixed to avoid this limitation. Acked-by: Kevin Wolf Reviewed-by: Pierrick Bouvier Signed-off-by: Daniel P. Berrang=C3=A9 --- .gitlab-ci.d/buildtest.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 4b1949a3a5..cf0281ecd6 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -174,6 +174,24 @@ build-system-centos: x86_64-softmmu rx-softmmu sh4-softmmu MAKE_CHECK_ARGS: check-build =20 + +# NB: block-XXX jobs use 'centos' since that is the build +# job that provides the x86_64-softmmu. Some I/O tests +# are currently buggy and blindly assume characteristics +# of x86 (such as PCIe) causing failures with other arches + +block: + extends: .native_test_job_template + needs: + - job: build-system-centos + artifacts: true + variables: + IMAGE: centos9 + MAKE_CHECK_ARGS: "check-block-$FORMAT" + parallel: + matrix: + - FORMAT: [luks, nbd, parallels, qcow2, qed, raw, vdi, vhdx, vmdk, v= pc] + # Previous QEMU release. Used for cross-version migration tests. build-previous-qemu: extends: .native_build_job_template --=20 2.54.0 From nobody Sat May 30 18:34:15 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1779268704; cv=none; d=zohomail.com; s=zohoarc; b=TD9Brdd48UE+RcoDO8E42LGxZIf4iL+KECAORIIaPkkLXJedVKHTfwQZ+Tk5T22UC1vGqAMn/tudjotM24yqg+X0ci7IxzxsI7H3JipmCPZ5fnGonroZQn0sXVsK0xQwxlyO3kVdVspvF2Vj2dmShQqpg64ESz5HcyqPWw8580Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779268704; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=SehIcGL5+cgE4/kfJH/adrcIXagz7Lnlktp3htwqCmA=; b=JsimKHeoOc+iyT7ChKLiGIggt7JQrffKaq6cudH+sCcZkjUVkVTepq+8TG4eNxzyTjnRXm59jdquazJQBrwu95ByFM6TOc9epq/w/ix3fnTM1AGbI7IEhGzQmJs2oCnO2+S40Ao6DK7eCt2PT+kO3GolIij/CwGCte1t5zoDLhs= 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=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779268704108409.16049563247157; Wed, 20 May 2026 02:18:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPd2G-0006vU-CM; Wed, 20 May 2026 05:16:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPd1h-0006ME-RN for qemu-devel@nongnu.org; Wed, 20 May 2026 05:15:45 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPd1g-0006Bz-49 for qemu-devel@nongnu.org; Wed, 20 May 2026 05:15:41 -0400 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-671-nA-IxpMzPQGS3MjAIYTBfg-1; Wed, 20 May 2026 05:15:37 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 04BC51955DCA; Wed, 20 May 2026 09:15:32 +0000 (UTC) Received: from berrange.com (unknown [10.44.49.211]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6513F18004A3; Wed, 20 May 2026 09:15:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779268539; 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=SehIcGL5+cgE4/kfJH/adrcIXagz7Lnlktp3htwqCmA=; b=U/NMmhcKix9C6+660tnz0LgpGmQghkadrPfk/QRhbXi3/elzDuwnCG99i68j7g8hf9C7mf VeZurWSG8m9sBW9whNfwWtUOpwLWphOG9eEB7vAa3i1mR3UHLr73PxjMWIV7kjbuqwSkZt gK+SAEhs3Mzm2wGjUcdi3Atq2Xi7VIo= X-MC-Unique: nA-IxpMzPQGS3MjAIYTBfg-1 X-Mimecast-MFC-AGG-ID: nA-IxpMzPQGS3MjAIYTBfg_1779268536 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thanos Makatos , qemu-block@nongnu.org, Hanna Reitz , Kevin Wolf , Pierrick Bouvier , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , John Snow , John Levon , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa , Thomas Huth Subject: [PULL 18/29] gitlab: remove I/O tests from build-tcg-disabled job Date: Wed, 20 May 2026 10:13:40 +0100 Message-ID: <20260520091351.1160442-19-berrange@redhat.com> In-Reply-To: <20260520091351.1160442-1-berrange@redhat.com> References: <20260520091351.1160442-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1779268704390158500 Now that we have dedicated CI jobs for running I/O tests on each supported format/protocol, we no longer need to special case a run of a hand picked set of tests in the build-tcg-disabled job. Acked-by: Kevin Wolf Reviewed-by: Thomas Huth Reviewed-by: Pierrick Bouvier Signed-off-by: Daniel P. Berrang=C3=A9 --- .gitlab-ci.d/buildtest.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index cf0281ecd6..d054349030 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -366,15 +366,6 @@ build-tcg-disabled: - make -j"$JOBS" - make check-unit - make check-qapi-schema - - ./run tests/qemu-iotests/check -raw 001 002 003 004 005 008 009 - 010 011 012 021 025 032 033 048 052 063 077 086 101 104 106 - 113 148 150 151 152 157 159 160 163 170 171 184 192 194 208 - 221 226 227 236 253 277 image-fleecing - - ./run tests/qemu-iotests/check -qcow2 028 051 056 057 058 065 068 - 082 085 091 095 096 102 122 124 132 139 142 144 145 151 152 - 155 157 165 194 196 200 202 208 209 216 218 227 234 246 247 - 248 250 254 255 257 258 260 261 262 263 264 270 272 273 277 - 279 image-fleecing - make distclean =20 build-user: --=20 2.54.0 From nobody Sat May 30 18:34:15 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1779268638; cv=none; d=zohomail.com; s=zohoarc; b=kBCFMHSxgdss7zPgMvEbDq/jGxrYT/f9gArxV38/sDdj+HD8WBjSMu7C20KAI6iGnWuNmC43TDgYBhXGRlDmySO16eHhBzGg1XFzdeXOKpvOpSTZqd9ILZhnmZsvqUwopeT9wuiIrbf7GhaF3M4GIpTx2AmbIUrbTu1MLOP4buk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779268638; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=7C2Z2x5rN4Ack7PYt2FC2o/xoovv41BQKNbjaIQCsWI=; b=kihkVSASwAQoLmh3EC0AVGpoKe4xSC7HzxkLEKf7IGQ1bMG/lUtsziUG9803ZDIOsYwCCMJT+Uor0DbZA8jmmc16LniH33dRDZsOiOdnALz2TZcS4b6h1NWSImFeq+nBYxQqkii0iIzsxR0cgR/qLNyX0LgsDzq46J8y5UzP4tA= 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=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779268638322537.3456339272738; Wed, 20 May 2026 02:17:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPd2S-0007Ii-Op; Wed, 20 May 2026 05:16:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPd1o-0006Qu-Pe for qemu-devel@nongnu.org; Wed, 20 May 2026 05:15:52 -0400 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 1wPd1m-0006EG-TL for qemu-devel@nongnu.org; Wed, 20 May 2026 05:15:48 -0400 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-172-Wz9gEhhVPK-6mkYPYAGZ5g-1; Wed, 20 May 2026 05:15:44 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7D16E1801344; Wed, 20 May 2026 09:15:38 +0000 (UTC) Received: from berrange.com (unknown [10.44.49.211]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 853311800764; Wed, 20 May 2026 09:15:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779268546; 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=7C2Z2x5rN4Ack7PYt2FC2o/xoovv41BQKNbjaIQCsWI=; b=VDOQi8HemUBupYaMPm1zS/R3NoLRu+uI64U7YudVd8S9o5AL1GBbXB8KNb3H59pBP5uo2+ V+dx/6v2X/wExVwlPNZCLFLQgsVHu3xinBDmdNzp31IPkx1zl67RKAMP9DiXyfJezjnM/L FgXTlm09Wv4On5pb5xm0Lb0y8q+zG3k= X-MC-Unique: Wz9gEhhVPK-6mkYPYAGZ5g-1 X-Mimecast-MFC-AGG-ID: Wz9gEhhVPK-6mkYPYAGZ5g_1779268542 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thanos Makatos , qemu-block@nongnu.org, Hanna Reitz , Kevin Wolf , Pierrick Bouvier , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , John Snow , John Levon , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PULL 19/29] qom: add trace events for object/property lifecycle Date: Wed, 20 May 2026 10:13:41 +0100 Message-ID: <20260520091351.1160442-20-berrange@redhat.com> In-Reply-To: <20260520091351.1160442-1-berrange@redhat.com> References: <20260520091351.1160442-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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=lists1p.gnu.org; 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: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1779268640599154100 This adds tracing around object allocation & finalization, the addition & deletion of properties, and the addition & deletion of children. Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 --- qom/object.c | 34 +++++++++++++++++++++++++++------- qom/trace-events | 12 ++++++++++-- 2 files changed, 37 insertions(+), 9 deletions(-) diff --git a/qom/object.c b/qom/object.c index dfdc5c8e42..4a15151c3b 100644 --- a/qom/object.c +++ b/qom/object.c @@ -594,6 +594,8 @@ static void object_property_del_all(Object *obj) object_property_iter_init(&iter, obj); while ((prop =3D object_property_iter_next(&iter)) !=3D NULL) { if (g_hash_table_add(done, prop)) { + trace_object_property_del(obj, obj->class->type->name, + prop->name, prop->opaque); if (prop->release) { prop->release(obj, prop->name, prop->opaque); released =3D true; @@ -612,10 +614,14 @@ static void object_property_del_child(Object *obj, Ob= ject *child) GHashTableIter iter; gpointer key, value; =20 + trace_object_property_del_child(obj, obj->class->type->name, + child, child->class->type->name); g_hash_table_iter_init(&iter, obj->properties); while (g_hash_table_iter_next(&iter, &key, &value)) { prop =3D value; if (object_property_is_child(prop) && prop->opaque =3D=3D child) { + trace_object_property_del(obj, obj->class->type->name, + prop->name, prop->opaque); if (prop->release) { prop->release(obj, prop->name, prop->opaque); prop->release =3D NULL; @@ -655,7 +661,7 @@ static void object_finalize(void *data) { Object *obj =3D data; TypeImpl *ti =3D obj->class->type; - + trace_object_finalize(obj, obj->class->type->name); object_property_del_all(obj); object_deinit(obj, ti); =20 @@ -705,6 +711,7 @@ static Object *object_new_with_type(Type type) object_initialize_with_type(obj, size, type); obj->free =3D obj_free; =20 + trace_object_new(obj, obj->class->type->name); return obj; } =20 @@ -835,8 +842,9 @@ Object *object_dynamic_cast(Object *obj, const char *ty= pename) Object *object_dynamic_cast_assert(Object *obj, const char *typename, const char *file, int line, const char = *func) { - trace_object_dynamic_cast_assert(obj ? obj->class->type->name : "(null= )", - typename, file, line, func); + trace_object_dynamic_cast_assert( + obj, obj ? obj->class->type->name : "(null)", + typename, file, line, func); =20 #ifdef CONFIG_QOM_CAST_DEBUG int i; @@ -926,8 +934,9 @@ ObjectClass *object_class_dynamic_cast_assert(ObjectCla= ss *class, { ObjectClass *ret; =20 - trace_object_class_dynamic_cast_assert(class ? class->type->name : "(n= ull)", - typename, file, line, func); + trace_object_class_dynamic_cast_assert( + class ? class->type->name : "(null)", + typename, file, line, func); =20 #ifdef CONFIG_QOM_CAST_DEBUG int i; @@ -1211,6 +1220,8 @@ object_property_try_add(Object *obj, const char *name= , const char *type, prop->release =3D release; prop->opaque =3D opaque; =20 + trace_object_property_add(obj, obj->class->type->name, + prop->name, prop->opaque); g_hash_table_insert(obj->properties, prop->name, prop); return prop; } @@ -1249,6 +1260,8 @@ object_class_property_add(ObjectClass *klass, prop->release =3D release; prop->opaque =3D opaque; =20 + trace_object_class_property_add(klass->type->name, prop->name, + prop->opaque); g_hash_table_insert(klass->properties, prop->name, prop); =20 return prop; @@ -1337,6 +1350,8 @@ void object_property_del(Object *obj, const char *nam= e) { ObjectProperty *prop =3D g_hash_table_lookup(obj->properties, name); =20 + trace_object_property_del(obj, obj->class->type->name, prop->name, + prop->opaque); if (prop->release) { prop->release(obj, name, prop->opaque); } @@ -1625,8 +1640,11 @@ int object_property_get_enum(Object *obj, const char= *name, bool object_property_parse(Object *obj, const char *name, const char *string, Error **errp) { - Visitor *v =3D string_input_visitor_new(string); - bool ok =3D object_property_set(obj, name, v, errp); + Visitor *v; + bool ok; + trace_object_property_parse(obj, obj->class->type->name, name, string); + v =3D string_input_visitor_new(string); + ok =3D object_property_set(obj, name, v, errp); =20 visit_free(v); return ok; @@ -1757,6 +1775,8 @@ object_property_try_add_child(Object *obj, const char= *name, g_autofree char *type =3D NULL; ObjectProperty *op; =20 + trace_object_property_add_child(obj, obj->class->type->name, name, + child, child->class->type->name); assert(!child->parent); =20 type =3D g_strdup_printf("child<%s>", object_get_typename(child)); diff --git a/qom/trace-events b/qom/trace-events index b2e9f4a712..44c63e72af 100644 --- a/qom/trace-events +++ b/qom/trace-events @@ -1,5 +1,13 @@ # See docs/devel/tracing.rst for syntax documentation. =20 # object.c -object_dynamic_cast_assert(const char *type, const char *target, const cha= r *file, int line, const char *func) "%s->%s (%s:%d:%s)" -object_class_dynamic_cast_assert(const char *type, const char *target, con= st char *file, int line, const char *func) "%s->%s (%s:%d:%s)" +object_dynamic_cast_assert(void *obj, const char *type, const char *target= , const char *file, int line, const char *func) "obj=3D%p type=3D%s->%s (%s= :%d:%s)" +object_finalize(void *obj, const char *type) "obj=3D%p type=3D%s" +object_new(void *obj, const char *type) "obj=3D%p type=3D%s" +object_property_add(void *obj, const char *type, const char *name, void *v= alue) "obj=3D%p type=3D%s name=3D%s value=3D%p" +object_property_add_child(void *obj, const char *type, const char *name, v= oid *child, const char *childtype) "obj=3D%p type=3D%s name=3D%s child=3D%p= child-type=3D%s" +object_property_del(void *obj, const char *type, const char *name, void *v= alue) "obj=3D%p type=3D%s name=3D%s value=3D%p" +object_property_del_child(void *obj, const char *type, void *child, const = char *childtype) "obj=3D%p type=3D%s child=3D%p child-type=3D%s" +object_property_parse(void *obj, const char *type, const char *name, const= char *value) "obj=3D%p type=3D%s prop=3D%s value=3D%s" +object_class_dynamic_cast_assert(const char *type, const char *target, con= st char *file, int line, const char *func) "type=3D%s->%s (%s:%d:%s)" +object_class_property_add(const char *type, const char *name, void *value)= "type=3D%s name=3D%s value=3D%p" --=20 2.54.0 From nobody Sat May 30 18:34:15 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1779268638; cv=none; d=zohomail.com; s=zohoarc; b=gSEgtVafqtSuzRNQLHPBiNaw532y7HVDZt01JOQIIWcRhsXcLzeBM+enRvit/f/YpGlLV3nK9p8BqKYY0+Wurls5pvxzCcVCxF3d/j91aNLHO/zabQ5+qpGY7BbWBzYw2trJcA0qpYm8QDb329wLywWE/1FW3W0A8sWMP7wQOSA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779268638; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=bTN7KM0p4ddNBC9D9/Fgy1Mf8VFA0ywcejxesu5DN7o=; b=awPyQKYUNApdz1K7Qy/9AEhuwWsbPNeSWS6OEjQnCxjsplS86qQnE8H8ubEEmwxwHB6J2ja7RRMsgF9tU049WoHmiY3zsKsiGr0NN+PRHOPuIamQEia/3tzY0uckiY8kUiE+HSy+ezzYCzqCPgAdlLogV1sWmqKPRS+0cj4ktyg= 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=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779268637999541.7470300294501; Wed, 20 May 2026 02:17:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPd2b-0007aj-La; Wed, 20 May 2026 05:16:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPd1s-0006TV-Fw for qemu-devel@nongnu.org; Wed, 20 May 2026 05:15:55 -0400 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 1wPd1r-0006Ew-37 for qemu-devel@nongnu.org; Wed, 20 May 2026 05:15:52 -0400 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-404-mmOLBjMZOxeEn9Uu3C9knw-1; Wed, 20 May 2026 05:15:46 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9104C1955F1A; Wed, 20 May 2026 09:15:43 +0000 (UTC) Received: from berrange.com (unknown [10.44.49.211]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0F5C01800760; Wed, 20 May 2026 09:15:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779268550; 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=bTN7KM0p4ddNBC9D9/Fgy1Mf8VFA0ywcejxesu5DN7o=; b=JhNJzINaTFzzYD862KUHJ04N+cW5euGlDxG2gzjtQNdIld8Ze61UnCrlQ9fOcSKYEW4yA6 w9IWBC80rqMru4n86tB80uxhtZsf2mB2sEem8tcTy3W4H900ZYzj2Hou3mLq4rk1Tg5vz3 z/9bzQaviTL1XW02hY4eBurMqrBr854= X-MC-Unique: mmOLBjMZOxeEn9Uu3C9knw-1 X-Mimecast-MFC-AGG-ID: mmOLBjMZOxeEn9Uu3C9knw_1779268545 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thanos Makatos , qemu-block@nongnu.org, Hanna Reitz , Kevin Wolf , Pierrick Bouvier , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , John Snow , John Levon , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa , Mark Cave-Ayland Subject: [PULL 20/29] hw/vfio-user: use a valid object ID for iothread Date: Wed, 20 May 2026 10:13:42 +0100 Message-ID: <20260520091351.1160442-21-berrange@redhat.com> In-Reply-To: <20260520091351.1160442-1-berrange@redhat.com> References: <20260520091351.1160442-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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=lists1p.gnu.org; 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: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1779268639792158500 The objectg_new_with_propv/props methods failed to validate that the QOM "id" was well formed. This allowed the vfio-user code to use an invalid ID of "VFIO user" (space is not permitted) in its internal code. Reviewed-by: C=C3=A9dric Le Goater Reviewed-by: Mark Cave-Ayland Signed-off-by: Daniel P. Berrang=C3=A9 --- hw/vfio-user/proxy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/vfio-user/proxy.c b/hw/vfio-user/proxy.c index 314dfd23d8..3d0d72e8b7 100644 --- a/hw/vfio-user/proxy.c +++ b/hw/vfio-user/proxy.c @@ -933,7 +933,7 @@ VFIOUserProxy *vfio_user_connect_dev(SocketAddress *add= r, Error **errp) qemu_cond_init(&proxy->close_cv); =20 if (vfio_user_iothread =3D=3D NULL) { - vfio_user_iothread =3D iothread_create("VFIO user", errp); + vfio_user_iothread =3D iothread_create("vfio-user", errp); } =20 proxy->ctx =3D iothread_get_aio_context(vfio_user_iothread); --=20 2.54.0 From nobody Sat May 30 18:34:15 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1779268716; cv=none; d=zohomail.com; s=zohoarc; b=UujEJPNEVITZ3Shw2OlftcOqSxyf30M4OAqWrrPXFsEqaFd/8Z0KPTQ0ZQyLLGyZtwJFYBRNZl5rgU/R2w3uN6xpsUDrk0TKsgUc/FlW+PY8EAZBJ2a6uKFvR9OKtspTcRxOSGlVeybPZE46hkgc6mf94rV3WA9tLP0ij3SmLXE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779268716; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=06hBjHCkindiUg1iDsa8qCRUsxP4CgOpUMReR198Kvw=; b=jfeobs6NKhLMLz1hQOhpk+VT0cWCYFIwXdjBU+KMgsLb0iEDJrFcxHfnuG01g6mkFcZL6ifTsLWjyA79IWWsmLfmWHw8lZaTPlKx6p0qw30PNWJi40rrMblMpf9qAWIxuimH/imlieUlX4m1lEMSILvlMlqE29bvtf3EyYRKEz4= 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=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779268716189496.49382826626857; Wed, 20 May 2026 02:18:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPd3E-0000bP-80; Wed, 20 May 2026 05:17:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPd1w-0006hI-Sh for qemu-devel@nongnu.org; Wed, 20 May 2026 05:15:59 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPd1v-0006Fa-DU for qemu-devel@nongnu.org; Wed, 20 May 2026 05:15:56 -0400 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-615-W4Cn4MVvMfuGIEHiSO5F3Q-1; Wed, 20 May 2026 05:15:50 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C707E1956048; Wed, 20 May 2026 09:15:48 +0000 (UTC) Received: from berrange.com (unknown [10.44.49.211]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 13C3F18004A3; Wed, 20 May 2026 09:15:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779268554; 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=06hBjHCkindiUg1iDsa8qCRUsxP4CgOpUMReR198Kvw=; b=a8Z+Z1kaiDx2C3sznOBFkVK0UQoWvKw9ZGdjHZun6bsIKmcjLOryVKJIhqc2uo59r/w9ZU 62JKcJSRp0JCGyz+Jj1XwVnaPK/7438436tuGYkv25APNtmCOxzcdM7Rn38xVnIXYjfOVj ezR3R+jtQJofw6GoCWWLPgabcReBPrQ= X-MC-Unique: W4Cn4MVvMfuGIEHiSO5F3Q-1 X-Mimecast-MFC-AGG-ID: W4Cn4MVvMfuGIEHiSO5F3Q_1779268548 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thanos Makatos , qemu-block@nongnu.org, Hanna Reitz , Kevin Wolf , Pierrick Bouvier , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , John Snow , John Levon , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PULL 21/29] qom: validate ID format when creating objects Date: Wed, 20 May 2026 10:13:43 +0100 Message-ID: <20260520091351.1160442-22-berrange@redhat.com> In-Reply-To: <20260520091351.1160442-1-berrange@redhat.com> References: <20260520091351.1160442-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1779268716464158500 The object_new_with_props/propv methods failed to validate the ID string format, thus diverging from user_creatable_add_type. Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 --- qom/object.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/qom/object.c b/qom/object.c index 4a15151c3b..08fc840f39 100644 --- a/qom/object.c +++ b/qom/object.c @@ -24,6 +24,8 @@ #include "qapi/forward-visitor.h" #include "qapi/qapi-builtin-visit.h" #include "qobject/qjson.h" +#include "qemu/id.h" +#include "qapi/qmp/qerror.h" #include "trace.h" =20 /* TODO: replace QObject with a simpler visitor to avoid a dependency @@ -755,6 +757,13 @@ Object *object_new_with_propv(const char *typename, ObjectClass *klass; UserCreatable *uc; =20 + if (id !=3D NULL && !id_wellformed(id)) { + error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "id", "an identifie= r"); + error_append_hint(errp, "Identifiers consist of letters, digits, " + "'-', '.', '_', starting with a letter.\n"); + return NULL; + } + klass =3D object_class_by_name(typename); if (!klass) { error_setg(errp, "invalid object type: %s", typename); --=20 2.54.0 From nobody Sat May 30 18:34:15 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1779268718; cv=none; d=zohomail.com; s=zohoarc; b=JWK/7h7E4bJ+8NGXeyGCxuNcPl/YgtZuFKk4TVaY0vR1P0moQZ4i7LjyONAnskgc2RjE/d2SUNy/D6PEJNSCAdn5vBdPlul2G/ZKwf/dH098z94dTs13xcYsbgH8d228rkdiyAtXi7r8dgaNNiAcwQieW/25CkwvcfIRaYE/1to= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779268718; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=8+P2JDg2djh/jf+gYQ0Qt/KfwgHeJkU+Z2fiHgOikzU=; b=nPhuq0e72fqNbiKfF5OzkGA9cdc+fsBaStnWtzN6D3GH+DyUJDPamzTyOu8G67z9X35ljvjAoTfaihc1yb5hRfkgHziENWaxbsYSP4xQ81GbMnnF2VItJJPKNqpPPRTwoHBI0/cgNrkUmHbLV8elcXvkfQ+ALSI6Nj2hYKVvnbw= 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=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779268718974681.5963378285892; Wed, 20 May 2026 02:18:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPd2d-0007cN-OO; Wed, 20 May 2026 05:16:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPd21-0006lA-6q for qemu-devel@nongnu.org; Wed, 20 May 2026 05:16:01 -0400 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 1wPd1z-0006HZ-Gl for qemu-devel@nongnu.org; Wed, 20 May 2026 05:16:00 -0400 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-210-s13qb9Y0NQaZfZvq8VCcAQ-1; Wed, 20 May 2026 05:15:55 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2AE8E19560B4; Wed, 20 May 2026 09:15:54 +0000 (UTC) Received: from berrange.com (unknown [10.44.49.211]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 49E1018004A3; Wed, 20 May 2026 09:15:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779268559; 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=8+P2JDg2djh/jf+gYQ0Qt/KfwgHeJkU+Z2fiHgOikzU=; b=XaelA/6Vu7wCWqhDt4v1lh2QtJHP13gvmQPZM0s/DNny44VmTKquZLDD5EA6cmt/LTIytZ MByeyYOwyNBL4vtFSnuC6i3CF71/JaPlDjZN3U6WNK6MaQpUaMkFFkAxOknuseIETVmSxN HF/b/jK7ockyhzTTD6k53lfP6CxDMIk= X-MC-Unique: s13qb9Y0NQaZfZvq8VCcAQ-1 X-Mimecast-MFC-AGG-ID: s13qb9Y0NQaZfZvq8VCcAQ_1779268554 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thanos Makatos , qemu-block@nongnu.org, Hanna Reitz , Kevin Wolf , Pierrick Bouvier , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , John Snow , John Levon , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PULL 22/29] qom: make errp last param in methods taking va_list Date: Wed, 20 May 2026 10:13:44 +0100 Message-ID: <20260520091351.1160442-23-berrange@redhat.com> In-Reply-To: <20260520091351.1160442-1-berrange@redhat.com> References: <20260520091351.1160442-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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=lists1p.gnu.org; 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: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1779268720574158500 object_new_with_props can't put 'errp' last due to the use of variadic arguments. That constraint does not apply to the use of va_list with object_new_with_propv, so follow normal practice with 'errp' placement. The same rationale applies to object_set_propv. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 --- include/qom/object.h | 10 +++++----- qom/object.c | 20 ++++++++++---------- tests/unit/check-qom-proplist.c | 4 ++-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/include/qom/object.h b/include/qom/object.h index 2a2829343d..a905a9e42f 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -689,16 +689,16 @@ Object *object_new_with_props(const char *typename, * @typename: The name of the type of the object to instantiate. * @parent: the parent object * @id: The unique ID of the object - * @errp: pointer to error object * @vargs: list of property names and values + * @errp: pointer to error object * * See object_new_with_props() for documentation. */ Object *object_new_with_propv(const char *typename, Object *parent, const char *id, - Error **errp, - va_list vargs); + va_list vargs, + Error **errp); =20 /** * object_set_props: @@ -739,14 +739,14 @@ bool object_set_props(Object *obj, Error **errp, ...)= G_GNUC_NULL_TERMINATED; /** * object_set_propv: * @obj: the object instance to set properties on - * @errp: pointer to error object * @vargs: list of property names and values + * @errp: pointer to error object * * See object_set_props() for documentation. * * Returns: %true on success, %false on error. */ -bool object_set_propv(Object *obj, Error **errp, va_list vargs); +bool object_set_propv(Object *obj, va_list vargs, Error **errp); =20 /** * object_initialize: diff --git a/qom/object.c b/qom/object.c index 08fc840f39..ecae322d2a 100644 --- a/qom/object.c +++ b/qom/object.c @@ -541,7 +541,7 @@ bool object_initialize_child_with_propsv(Object *parent= obj, object_initialize(childobj, size, type); obj =3D OBJECT(childobj); =20 - if (!object_set_propv(obj, errp, vargs)) { + if (!object_set_propv(obj, vargs, errp)) { goto out; } =20 @@ -740,7 +740,7 @@ Object *object_new_with_props(const char *typename, Object *obj; =20 va_start(vargs, errp); - obj =3D object_new_with_propv(typename, parent, id, errp, vargs); + obj =3D object_new_with_propv(typename, parent, id, vargs, errp); va_end(vargs); =20 return obj; @@ -750,8 +750,8 @@ Object *object_new_with_props(const char *typename, Object *object_new_with_propv(const char *typename, Object *parent, const char *id, - Error **errp, - va_list vargs) + va_list vargs, + Error **errp) { Object *obj; ObjectClass *klass; @@ -776,7 +776,7 @@ Object *object_new_with_propv(const char *typename, } obj =3D object_new_with_type(klass->type); =20 - if (!object_set_propv(obj, errp, vargs)) { + if (!object_set_propv(obj, vargs, errp)) { goto error; } =20 @@ -804,14 +804,14 @@ Object *object_new_with_propv(const char *typename, =20 =20 bool object_set_props(Object *obj, - Error **errp, - ...) + Error **errp, + ...) { va_list vargs; bool ret; =20 va_start(vargs, errp); - ret =3D object_set_propv(obj, errp, vargs); + ret =3D object_set_propv(obj, vargs, errp); va_end(vargs); =20 return ret; @@ -819,8 +819,8 @@ bool object_set_props(Object *obj, =20 =20 bool object_set_propv(Object *obj, - Error **errp, - va_list vargs) + va_list vargs, + Error **errp) { const char *propname; =20 diff --git a/tests/unit/check-qom-proplist.c b/tests/unit/check-qom-proplis= t.c index ee3c6fb32b..7f31735459 100644 --- a/tests/unit/check-qom-proplist.c +++ b/tests/unit/check-qom-proplist.c @@ -373,8 +373,8 @@ static Object *new_helper(Error **errp, obj =3D object_new_with_propv(TYPE_DUMMY, parent, "dummy0", - errp, - vargs); + vargs, + errp); va_end(vargs); return obj; } --=20 2.54.0 From nobody Sat May 30 18:34:15 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1779268652; cv=none; d=zohomail.com; s=zohoarc; b=YOu2GdtVtlBjRi1B+WVM4TQyPts4P+es1OBquN4I6Wi9NPt7yfKjJHGMbo5MH5vMtGghmH+ozzoU9TXXjSPSHy3rK/bciWJFh/EjxgWvKj3DjOVP+kjoozaipBPGkqY8pMphZuLeblng3/kH6Zp2L5vtDYNrZg5cwa4LCzwnCLs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779268652; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=k+gzzh0TF1FWRjL4FpB4zjStDbm4yVLLWmVa3Ip2Xtw=; b=b61IlIgimM0M7FHCcKS2ETxjYkzpSfmhVUxGcpsR25SpGIRN+rESPeiNknAE2tv5oduBTepNiQ3vPBRc3Q3iJg9xRhxDjN26XFidZGYIOVPKQmsTXvsm133wd43v3K2kUWBmZrGd8LWAOc+7pnYutOE7Xqck+ENVeWrdJv1H480= 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=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779268652228178.17946678715623; Wed, 20 May 2026 02:17:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPd2v-0007rz-Tl; Wed, 20 May 2026 05:16:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPd24-0006pI-Fr for qemu-devel@nongnu.org; Wed, 20 May 2026 05:16:06 -0400 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 1wPd22-0006I7-QN for qemu-devel@nongnu.org; Wed, 20 May 2026 05:16:04 -0400 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-400-QjYX1V1wPDiitCI9PEo7xQ-1; Wed, 20 May 2026 05:16:00 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8A9891955E89; Wed, 20 May 2026 09:15:59 +0000 (UTC) Received: from berrange.com (unknown [10.44.49.211]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id A2FB118004A3; Wed, 20 May 2026 09:15:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779268562; 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=k+gzzh0TF1FWRjL4FpB4zjStDbm4yVLLWmVa3Ip2Xtw=; b=Bf1aTau6h5ZR9/piqQRZzp3jtXDXYY796CmdkLbhaA/PKVoZhh856HboGbX+5r4ArXl5aW iqleMLeYs6v4BUFrVveqw0SC2plrDTOHUE12cTOGNomOyW3wEII7ku1IlHmxoAaFtSbpso o8oHjVNa4ZenBrt+HIOeKsArIhXkecM= X-MC-Unique: QjYX1V1wPDiitCI9PEo7xQ-1 X-Mimecast-MFC-AGG-ID: QjYX1V1wPDiitCI9PEo7xQ_1779268559 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thanos Makatos , qemu-block@nongnu.org, Hanna Reitz , Kevin Wolf , Pierrick Bouvier , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , John Snow , John Levon , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PULL 23/29] qom: shorten name of object_set_properties_from_keyval Date: Wed, 20 May 2026 10:13:45 +0100 Message-ID: <20260520091351.1160442-24-berrange@redhat.com> In-Reply-To: <20260520091351.1160442-1-berrange@redhat.com> References: <20260520091351.1160442-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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=lists1p.gnu.org; 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: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1779268654909154100 This matches the convention established by the object_set_props and object_set_propv methods. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 --- include/qom/object.h | 6 +++--- qom/object_interfaces.c | 12 ++++++------ system/qdev-monitor.c | 4 ++-- system/vl.c | 7 ++++--- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/include/qom/object.h b/include/qom/object.h index a905a9e42f..83b0cd01b5 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -915,7 +915,7 @@ type_init(do_qemu_init_ ## type_array) bool type_print_class_properties(const char *type); =20 /** - * object_set_properties_from_keyval: + * object_set_props_from_keyval: * @obj: a QOM object * @qdict: a dictionary with the properties to be set * @from_json: true if leaf values of @qdict are typed, false if they @@ -925,8 +925,8 @@ bool type_print_class_properties(const char *type); * For each key in the dictionary, parse the value string if needed, * then set the corresponding property in @obj. */ -void object_set_properties_from_keyval(Object *obj, const QDict *qdict, - bool from_json, Error **errp); +void object_set_props_from_keyval(Object *obj, const QDict *qdict, + bool from_json, Error **errp); =20 /** * object_class_dynamic_cast_assert: diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c index 415cbee8c5..4377d65b76 100644 --- a/qom/object_interfaces.c +++ b/qom/object_interfaces.c @@ -44,8 +44,8 @@ bool user_creatable_can_be_deleted(UserCreatable *uc) } } =20 -static void object_set_properties_from_qdict(Object *obj, const QDict *qdi= ct, - Visitor *v, Error **errp) +static void object_set_props_from_qdict(Object *obj, const QDict *qdict, + Visitor *v, Error **errp) { const QDictEntry *e; =20 @@ -62,8 +62,8 @@ out: visit_end_struct(v, NULL); } =20 -void object_set_properties_from_keyval(Object *obj, const QDict *qdict, - bool from_json, Error **errp) +void object_set_props_from_keyval(Object *obj, const QDict *qdict, + bool from_json, Error **errp) { Visitor *v; if (from_json) { @@ -71,7 +71,7 @@ void object_set_properties_from_keyval(Object *obj, const= QDict *qdict, } else { v =3D qobject_input_visitor_new_keyval(QOBJECT(qdict)); } - object_set_properties_from_qdict(obj, qdict, v, errp); + object_set_props_from_qdict(obj, qdict, v, errp); visit_free(v); } =20 @@ -110,7 +110,7 @@ Object *user_creatable_add_type(const char *type, const= char *id, =20 assert(qdict); obj =3D object_new_with_class(klass); - object_set_properties_from_qdict(obj, qdict, v, &local_err); + object_set_props_from_qdict(obj, qdict, v, &local_err); if (local_err) { goto out; } diff --git a/system/qdev-monitor.c b/system/qdev-monitor.c index e5b55e3004..dfc95a08c1 100644 --- a/system/qdev-monitor.c +++ b/system/qdev-monitor.c @@ -730,8 +730,8 @@ DeviceState *qdev_device_add_from_qdict(const QDict *op= ts, qdict_del(properties, "bus"); qdict_del(properties, "id"); =20 - object_set_properties_from_keyval(&dev->parent_obj, properties, from_j= son, - errp); + object_set_props_from_keyval(&dev->parent_obj, properties, from_json, + errp); qobject_unref(properties); if (*errp) { goto err_del_dev; diff --git a/system/vl.c b/system/vl.c index e690aa3ed8..da36b2c6e1 100644 --- a/system/vl.c +++ b/system/vl.c @@ -2010,7 +2010,8 @@ static bool object_create_early(const char *type) =20 static void qemu_apply_machine_options(QDict *qdict) { - object_set_properties_from_keyval(OBJECT(current_machine), qdict, fals= e, &error_fatal); + object_set_props_from_keyval(OBJECT(current_machine), qdict, + false, &error_fatal); =20 if (semihosting_enabled(false) && !semihosting_get_argc()) { /* fall back to the -kernel/-append */ @@ -2225,8 +2226,8 @@ static void qemu_create_machine(QDict *qdict) keyval_parse(machine_class->default_machine_opts, NULL, NULL, &error_abort); qemu_apply_legacy_machine_options(default_opts); - object_set_properties_from_keyval(OBJECT(current_machine), default= _opts, - false, &error_abort); + object_set_props_from_keyval(OBJECT(current_machine), default_opts, + false, &error_abort); qobject_unref(default_opts); } } --=20 2.54.0 From nobody Sat May 30 18:34:15 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1779268761; cv=none; d=zohomail.com; s=zohoarc; b=bRA+02+cPSNLckhHTcFntwBBUaTbJijNOKsRx8PaBkzVPLCJ4Vf8kIrIONhKz6P81QfP6JvPbcX68Mi0EzjwiqMhUEfbcXdYXCZn6hRK4hUaHcm2AZ45b8DVhM44rcBxnnZcVB4TZlTeMR/9pYuQ3YTA/eg3Pr/ysZDzvnlQ+Jw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779268761; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=SOlUxy0YzNh0sNDdbP3tPts0AP13pJpoY3TgxxsOfSk=; b=SG6laMxH/JrSKhXz+O7AiypkfZiZA9CRJV789SckibOmpvCo5ejZ4mjk42bRL0gnGtiLH2Eea+ztsuXNFO8rVjx06vri8kBKlSXrfFAEo2YkAwWrorIfVPvNUYOPxSfLn3rG1VRGpj+PE78tTg+HgcO2GZDcuyUEV2/uZLAqK+Q= 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=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779268761637402.8916311369028; Wed, 20 May 2026 02:19:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPd3A-0008Kb-6q; Wed, 20 May 2026 05:17:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPd2C-00071L-C1 for qemu-devel@nongnu.org; Wed, 20 May 2026 05:16:16 -0400 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 1wPd2A-0006Lz-KA for qemu-devel@nongnu.org; Wed, 20 May 2026 05:16:12 -0400 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-688-qroilm0MNF-aONaCzLIIOw-1; Wed, 20 May 2026 05:16:06 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 49AD51956058; Wed, 20 May 2026 09:16:05 +0000 (UTC) Received: from berrange.com (unknown [10.44.49.211]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2645018004A3; Wed, 20 May 2026 09:15:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779268569; 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=SOlUxy0YzNh0sNDdbP3tPts0AP13pJpoY3TgxxsOfSk=; b=ax1aTXaDqnau7yKDHlpJN2nPadbmi1mOVWbzraUeXMBhOitQPZNQvTEeInediRtZD5vbJx t3C04UqoG0tJwyMTX+OygfxdYATT5JPVB81qQxTpu04f/c6oh5MAj3lSJtXG+MlYOoavPh 6SR1Ge3a6Ctz/CxId+TzWrvogBhMZ3Q= X-MC-Unique: qroilm0MNF-aONaCzLIIOw-1 X-Mimecast-MFC-AGG-ID: qroilm0MNF-aONaCzLIIOw_1779268565 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thanos Makatos , qemu-block@nongnu.org, Hanna Reitz , Kevin Wolf , Pierrick Bouvier , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , John Snow , John Levon , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PULL 24/29] qom: have object_set_props_keyval return bool Date: Wed, 20 May 2026 10:13:46 +0100 Message-ID: <20260520091351.1160442-25-berrange@redhat.com> In-Reply-To: <20260520091351.1160442-1-berrange@redhat.com> References: <20260520091351.1160442-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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=lists1p.gnu.org; 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: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1779268762792154100 This matches the convention established by the object_set_props and object_set_propv methods. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 --- include/qom/object.h | 4 +++- qom/object_interfaces.c | 13 +++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/include/qom/object.h b/include/qom/object.h index 83b0cd01b5..822f56c87e 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -924,8 +924,10 @@ bool type_print_class_properties(const char *type); * * For each key in the dictionary, parse the value string if needed, * then set the corresponding property in @obj. + * + * Returns: %true on success, %false on error. */ -void object_set_props_from_keyval(Object *obj, const QDict *qdict, +bool object_set_props_from_keyval(Object *obj, const QDict *qdict, bool from_json, Error **errp); =20 /** diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c index 4377d65b76..50736b80c8 100644 --- a/qom/object_interfaces.c +++ b/qom/object_interfaces.c @@ -44,13 +44,14 @@ bool user_creatable_can_be_deleted(UserCreatable *uc) } } =20 -static void object_set_props_from_qdict(Object *obj, const QDict *qdict, +static bool object_set_props_from_qdict(Object *obj, const QDict *qdict, Visitor *v, Error **errp) { + ERRP_GUARD(); const QDictEntry *e; =20 if (!visit_start_struct(v, NULL, NULL, 0, errp)) { - return; + return false; } for (e =3D qdict_first(qdict); e; e =3D qdict_next(qdict, e)) { if (!object_property_set(obj, e->key, v, errp)) { @@ -60,19 +61,23 @@ static void object_set_props_from_qdict(Object *obj, co= nst QDict *qdict, visit_check_struct(v, errp); out: visit_end_struct(v, NULL); + + return *errp =3D=3D NULL; } =20 -void object_set_props_from_keyval(Object *obj, const QDict *qdict, +bool object_set_props_from_keyval(Object *obj, const QDict *qdict, bool from_json, Error **errp) { + bool ret; Visitor *v; if (from_json) { v =3D qobject_input_visitor_new(QOBJECT(qdict)); } else { v =3D qobject_input_visitor_new_keyval(QOBJECT(qdict)); } - object_set_props_from_qdict(obj, qdict, v, errp); + ret =3D object_set_props_from_qdict(obj, qdict, v, errp); visit_free(v); + return ret; } =20 Object *user_creatable_add_type(const char *type, const char *id, --=20 2.54.0 From nobody Sat May 30 18:34:15 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1779268758; cv=none; d=zohomail.com; s=zohoarc; b=NsSWvobkMcMbqa3XBXYvDI6w17ABuS/oc0ElEwiV+wd8yYg7+Xdek95bwT6d84QULcDpiyNrrcoKKSsu6xJ1jTUHojA/9JHrnkLktEJnNhiSvRon9ME1Lnqu/WQ2p1Z5AwZf7Q9Fx70snR5j9IpbCpoML9GaPgODhCZnJxrY3gM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779268758; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=TiRGP8c1Dq0aQiPmEyOYNIHy4V+WbpPidZD1+6P+U+Y=; b=Nun+3uvweDg4GRhDahbBCnkOmWmSTGQmmPnMux/as6BCljBO3dA0qoSOdS3Lftx/T1r0IO+lhnrF/WB4lDPdkAJbRU0wQekdk04Bnco3p6DzUUMFjFS+7vNgkshYb8I01wHvdPAvxjafJnnt7XqG9ngCspMwuRnScXLUVZ7nUb8= 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=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 177926875854832.427995782057565; Wed, 20 May 2026 02:19:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPd3D-0000Vn-Rn; Wed, 20 May 2026 05:17:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPd2I-00074H-PS for qemu-devel@nongnu.org; Wed, 20 May 2026 05:16:19 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPd2H-0006Mr-0u for qemu-devel@nongnu.org; Wed, 20 May 2026 05:16:18 -0400 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-631-BeNokoD2PbSe446AxVdSZA-1; Wed, 20 May 2026 05:16:12 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A530618005B8; Wed, 20 May 2026 09:16:10 +0000 (UTC) Received: from berrange.com (unknown [10.44.49.211]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id D9D301800347; Wed, 20 May 2026 09:16:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779268576; 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=TiRGP8c1Dq0aQiPmEyOYNIHy4V+WbpPidZD1+6P+U+Y=; b=DKpGUzB3TiveA438z1e9+3ukD1xvrMVEW02DP72t70EHnTgYC2wbdhXExCP0O5RwAhmOkW 4COQWc7CZpQjNrJpkXLIU0IS4nijvRnfZOS2w2g5n95Z8p1Sl3xv8pRnYKLnyqBWZlyY6Z JD4uvKMSVPD6n75M1TOjKMMpZNMWa4Y= X-MC-Unique: BeNokoD2PbSe446AxVdSZA-1 X-Mimecast-MFC-AGG-ID: BeNokoD2PbSe446AxVdSZA_1779268570 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thanos Makatos , qemu-block@nongnu.org, Hanna Reitz , Kevin Wolf , Pierrick Bouvier , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , John Snow , John Levon , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PULL 25/29] qom: move object_set_prop_keyval into object.c Date: Wed, 20 May 2026 10:13:47 +0100 Message-ID: <20260520091351.1160442-26-berrange@redhat.com> In-Reply-To: <20260520091351.1160442-1-berrange@redhat.com> References: <20260520091351.1160442-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1779268760781154100 This matches the location of the object_set_props and object_set_propv methods, since this method is not inherently tied to the user creatable interface. As part of this, object_set_props_from_qdict is also exposed as a public API since it is still called from object_interfaces.c. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 --- include/qom/object.h | 47 +++++++++++++++++++++++++++-------------- qom/object.c | 36 +++++++++++++++++++++++++++++++ qom/object_interfaces.c | 36 ------------------------------- 3 files changed, 67 insertions(+), 52 deletions(-) diff --git a/include/qom/object.h b/include/qom/object.h index 822f56c87e..be65acff93 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -748,6 +748,37 @@ bool object_set_props(Object *obj, Error **errp, ...) = G_GNUC_NULL_TERMINATED; */ bool object_set_propv(Object *obj, va_list vargs, Error **errp); =20 +/** + * object_set_props_from_qdict: + * @obj: a QOM object + * @qdict: a dictionary with the properties to be set + * @v: a visitor to iterate over @dict + * @errp: pointer to error object + * + * For each key in the dictionary, set the corresponding + * property in @obj. + * + * Returns: %true on success, %false on error. + */ +bool object_set_props_from_qdict(Object *obj, const QDict *qdict, + Visitor *v, Error **errp); + +/** + * object_set_props_from_keyval: + * @obj: a QOM object + * @qdict: a dictionary with the properties to be set + * @from_json: true if leaf values of @qdict are typed, false if they + * are strings + * @errp: pointer to error object + * + * For each key in the dictionary, parse the value string if needed, + * then set the corresponding property in @obj. + * + * Returns: %true on success, %false on error. + */ +bool object_set_props_from_keyval(Object *obj, const QDict *qdict, + bool from_json, Error **errp); + /** * object_initialize: * @obj: A pointer to the memory to be used for the object. @@ -914,22 +945,6 @@ type_init(do_qemu_init_ ## type_array) */ bool type_print_class_properties(const char *type); =20 -/** - * object_set_props_from_keyval: - * @obj: a QOM object - * @qdict: a dictionary with the properties to be set - * @from_json: true if leaf values of @qdict are typed, false if they - * are strings - * @errp: pointer to error object - * - * For each key in the dictionary, parse the value string if needed, - * then set the corresponding property in @obj. - * - * Returns: %true on success, %false on error. - */ -bool object_set_props_from_keyval(Object *obj, const QDict *qdict, - bool from_json, Error **errp); - /** * object_class_dynamic_cast_assert: * @klass: The #ObjectClass to attempt to cast. diff --git a/qom/object.c b/qom/object.c index ecae322d2a..3f2569d654 100644 --- a/qom/object.c +++ b/qom/object.c @@ -23,6 +23,7 @@ #include "qapi/qobject-input-visitor.h" #include "qapi/forward-visitor.h" #include "qapi/qapi-builtin-visit.h" +#include "qobject/qdict.h" #include "qobject/qjson.h" #include "qemu/id.h" #include "qapi/qmp/qerror.h" @@ -838,6 +839,41 @@ bool object_set_propv(Object *obj, return true; } =20 +bool object_set_props_from_qdict(Object *obj, const QDict *qdict, + Visitor *v, Error **errp) +{ + ERRP_GUARD(); + const QDictEntry *e; + + if (!visit_start_struct(v, NULL, NULL, 0, errp)) { + return false; + } + for (e =3D qdict_first(qdict); e; e =3D qdict_next(qdict, e)) { + if (!object_property_set(obj, e->key, v, errp)) { + goto out; + } + } + visit_check_struct(v, errp); +out: + visit_end_struct(v, NULL); + + return *errp =3D=3D NULL; +} + +bool object_set_props_from_keyval(Object *obj, const QDict *qdict, + bool from_json, Error **errp) +{ + bool ret; + Visitor *v; + if (from_json) { + v =3D qobject_input_visitor_new(QOBJECT(qdict)); + } else { + v =3D qobject_input_visitor_new_keyval(QOBJECT(qdict)); + } + ret =3D object_set_props_from_qdict(obj, qdict, v, errp); + visit_free(v); + return ret; +} =20 Object *object_dynamic_cast(Object *obj, const char *typename) { diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c index 50736b80c8..e0a3cd8d0f 100644 --- a/qom/object_interfaces.c +++ b/qom/object_interfaces.c @@ -44,42 +44,6 @@ bool user_creatable_can_be_deleted(UserCreatable *uc) } } =20 -static bool object_set_props_from_qdict(Object *obj, const QDict *qdict, - Visitor *v, Error **errp) -{ - ERRP_GUARD(); - const QDictEntry *e; - - if (!visit_start_struct(v, NULL, NULL, 0, errp)) { - return false; - } - for (e =3D qdict_first(qdict); e; e =3D qdict_next(qdict, e)) { - if (!object_property_set(obj, e->key, v, errp)) { - goto out; - } - } - visit_check_struct(v, errp); -out: - visit_end_struct(v, NULL); - - return *errp =3D=3D NULL; -} - -bool object_set_props_from_keyval(Object *obj, const QDict *qdict, - bool from_json, Error **errp) -{ - bool ret; - Visitor *v; - if (from_json) { - v =3D qobject_input_visitor_new(QOBJECT(qdict)); - } else { - v =3D qobject_input_visitor_new_keyval(QOBJECT(qdict)); - } - ret =3D object_set_props_from_qdict(obj, qdict, v, errp); - visit_free(v); - return ret; -} - Object *user_creatable_add_type(const char *type, const char *id, const QDict *qdict, Visitor *v, Error **errp) --=20 2.54.0 From nobody Sat May 30 18:34:15 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1779268692; cv=none; d=zohomail.com; s=zohoarc; b=EmB7ofYYOTDpNlxl2RGhj+RXMxOX8OJvRabg8W3LWmonZT6HG/B0DLTpEM6p9nvzZpiiM+amoLGwSOb/Yv5btASFQofYd6n+YbX3Gd1DbXVHFCnGCw07rlAMz+dAgQn3EJ8mXHUigUxtZRDe8HbHE0Su7rFw12Iawo1WVc+rtSs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779268692; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=1MQXuPaRB7cSoaPWWgGbs2E8mNqPEjYl8oMsJfb79dM=; b=kmnMK+RCTN8SH+03X1z1Kimf5qCQdst6xfoP65uxwS1PWUFNvlSJy/iTziHUcWhEWA4x1oK4VqfsAxDQBPXaaDTvi1IRcirC46n7kf9eEt2GZIXzzJ1HAPsO1ij99HZ7sdKqFX706HxhREfT4IoTTNPhKCYTRziGurvA/yfqBUI= 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=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779268692547980.6383486258887; Wed, 20 May 2026 02:18:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPd3K-000158-JI; Wed, 20 May 2026 05:17:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPd2M-00079k-IZ for qemu-devel@nongnu.org; Wed, 20 May 2026 05:16:23 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPd2K-0006NE-DA for qemu-devel@nongnu.org; Wed, 20 May 2026 05:16:22 -0400 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-695-DSLNrBMUOJui_V7PsvCfnw-1; Wed, 20 May 2026 05:16:16 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 40D51195608F; Wed, 20 May 2026 09:16:15 +0000 (UTC) Received: from berrange.com (unknown [10.44.49.211]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 34FE018004A3; Wed, 20 May 2026 09:16:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779268579; 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=1MQXuPaRB7cSoaPWWgGbs2E8mNqPEjYl8oMsJfb79dM=; b=MaWFj3NO2YtEwTiaUxmW+KipO2lXtptNm1BYZtVgpxUwgkqT+RY1gwLG7399dLkd4YDF4z tO9rESRNKI4hJ5VHcuU0dzV1pbNbO0ePa+pYRCuFrjD6hfBMYjiLWKKX0pSD5QCzQIRPYQ W/1a2VIkEU7egAeNkPqBUtn0Lc1GzmI= X-MC-Unique: DSLNrBMUOJui_V7PsvCfnw-1 X-Mimecast-MFC-AGG-ID: DSLNrBMUOJui_V7PsvCfnw_1779268575 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thanos Makatos , qemu-block@nongnu.org, Hanna Reitz , Kevin Wolf , Pierrick Bouvier , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , John Snow , John Levon , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PULL 26/29] qom: add object_new_with_props_from_qdict Date: Wed, 20 May 2026 10:13:48 +0100 Message-ID: <20260520091351.1160442-27-berrange@redhat.com> In-Reply-To: <20260520091351.1160442-1-berrange@redhat.com> References: <20260520091351.1160442-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1779268694443158500 This will be used to replace user_creatable_add_type with an impl that shares most code with object_new_with_props, and is not tied to the user creatable interface. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 --- include/qom/object.h | 19 +++++++++++ qom/object.c | 75 ++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 88 insertions(+), 6 deletions(-) diff --git a/include/qom/object.h b/include/qom/object.h index be65acff93..fb1cd92d97 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -700,6 +700,25 @@ Object *object_new_with_propv(const char *typename, va_list vargs, Error **errp); =20 +/** + * object_new_with_props_from_qdict: + * @typename: The name of the type of the object to instantiate. + * @parent: the parent object + * @id: The unique ID of the object + * @props: dictionary of property names and values + * @v: visitor to iterate over @props + * @errp: pointer to error object + * + * A variant of object_new_with_props() which accepts the + * properties in a QDict. + */ +Object *object_new_with_props_from_qdict(const char *typename, + Object *parent, + const char *id, + const QDict *props, + Visitor *v, + Error **errp); + /** * object_set_props: * @obj: the object instance to set properties on diff --git a/qom/object.c b/qom/object.c index 3f2569d654..a11f559445 100644 --- a/qom/object.c +++ b/qom/object.c @@ -748,11 +748,14 @@ Object *object_new_with_props(const char *typename, } =20 =20 -Object *object_new_with_propv(const char *typename, - Object *parent, - const char *id, - va_list vargs, - Error **errp) +static Object * +object_new_with_props_helper(const char *typename, + Object *parent, + const char *id, + void *props, + bool (set_props)(Object *obj, void *props, + Error **errp), + Error **errp) { Object *obj; ObjectClass *klass; @@ -777,7 +780,7 @@ Object *object_new_with_propv(const char *typename, } obj =3D object_new_with_type(klass->type); =20 - if (!object_set_propv(obj, vargs, errp)) { + if (!set_props(obj, props, errp)) { goto error; } =20 @@ -803,6 +806,66 @@ Object *object_new_with_propv(const char *typename, return NULL; } =20 +struct ObjectNewVargsData { + va_list vargs; +}; + +static bool object_new_with_propv_setter(Object *obj, + void *props, + Error **errp) +{ + struct ObjectNewVargsData *data =3D props; + return object_set_propv(obj, data->vargs, errp); +} + +Object *object_new_with_propv(const char *typename, + Object *parent, + const char *id, + va_list vargs, + Error **errp) +{ + Object *obj; + struct ObjectNewVargsData data; + + va_copy(data.vargs, vargs); + obj =3D object_new_with_props_helper(typename, + parent, + id, + &data, + object_new_with_propv_setter, + errp); + va_end(data.vargs); + return obj; +} + +struct ObjectNewQDictData { + const QDict *props; + Visitor *v; +}; + +static bool object_new_with_qdict_setter(Object *obj, + void *props, + Error **errp) +{ + struct ObjectNewQDictData *data =3D props; + return object_set_props_from_qdict(obj, data->props, data->v, errp); +} + +Object *object_new_with_props_from_qdict(const char *typename, + Object *parent, + const char *id, + const QDict *props, + Visitor *v, + Error **errp) +{ + struct ObjectNewQDictData data =3D { props, v }; + return object_new_with_props_helper(typename, + parent, + id, + &data, + object_new_with_qdict_setter, + errp); +} =20 bool object_set_props(Object *obj, Error **errp, --=20 2.54.0 From nobody Sat May 30 18:34:15 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1779268704; cv=none; d=zohomail.com; s=zohoarc; b=BgPivBumyOFtGnwUoAE8Kit0Ak2TmymGLNEwXScJkOx/elnqHOumh/ZPITtaOIc5Mrrs6gjxgm2MbwM6XtCh/JZkLEZJcse2FnIAmP/yjUz9A5V71/gY/KWfFmzEYCkqCgXyCzVriZvlpgeOyr3QFLnfzdD5pRivXegegt9G1/Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779268704; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=26FOAWe6CEIbzXUqveh6ti2zrWxtCUNKJmgkkPmlgVE=; b=GsJpABK/Z/ORufaq93PMqFqflP5l4p+Di0zEfZSjr7SJZBVIkP/3qNfncw2WOzDQZ6Ct/Q9oKUeBjEGDdkCq+l0UKcG2XVKcxg+xzStf/jc7+olCwHBt8e5SgUVeVZs2KBn5JlkhcPV0G7s0TPLN4IebyhMtv0N795y15Q7PEXA= 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=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779268704102557.0586660963759; Wed, 20 May 2026 02:18:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPd2w-00081m-P2; Wed, 20 May 2026 05:16:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPd2S-0007LM-Uq for qemu-devel@nongnu.org; Wed, 20 May 2026 05:16:30 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPd2Q-0006O8-UJ for qemu-devel@nongnu.org; Wed, 20 May 2026 05:16:28 -0400 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-245-JPPiJfkKMPSXgcsVAOwDXg-1; Wed, 20 May 2026 05:16:21 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A1F121800614; Wed, 20 May 2026 09:16:20 +0000 (UTC) Received: from berrange.com (unknown [10.44.49.211]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C941B18004A3; Wed, 20 May 2026 09:16:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779268586; 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=26FOAWe6CEIbzXUqveh6ti2zrWxtCUNKJmgkkPmlgVE=; b=FcbgxgvtE3D4GtrCZWGlHc1W1EnQXSLydJQBSrhe2W0etme7h2gxEzzi0fT2gNJPstCnFk Vyipww6/NwDa3zR6JlFj/VUZcIWZT4FIkdoRqU1nuH9kdepC7BL7t9piSmXtAE8/MRidef PGWUsf+93REFIE40wMJS8HQZ1db2V8Y= X-MC-Unique: JPPiJfkKMPSXgcsVAOwDXg-1 X-Mimecast-MFC-AGG-ID: JPPiJfkKMPSXgcsVAOwDXg_1779268580 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thanos Makatos , qemu-block@nongnu.org, Hanna Reitz , Kevin Wolf , Pierrick Bouvier , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , John Snow , John Levon , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PULL 27/29] qom: fix ability to create objects without a parent Date: Wed, 20 May 2026 10:13:49 +0100 Message-ID: <20260520091351.1160442-28-berrange@redhat.com> In-Reply-To: <20260520091351.1160442-1-berrange@redhat.com> References: <20260520091351.1160442-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1779268704528158500 object_new_with_propv allowed id/parent to be optional, in which case the caller was expected to own the returned object. Unfortunately a trailing object_unref() meant that the returned object was already freed. It is confusing to have a single method with two different ownership scenarios for the returned object. Make id/parent mandatory in object_new_with_propv once more, and add a new object_new_with_propv_parentless that does not accept id/parent at all and lets the caller own the returned reference. The helper method has abstracted the way properties are represented and set in order to facilitate the subsequent commit. Unit tests are added to address the root cause that allowed the bug to slip through in commit 6134d752. Fixes: 6134d7522e5 ("qom: don't require user creatable objects to be regist= ered") Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 --- include/qom/object.h | 47 ++++++++++++++++++ qom/object.c | 74 +++++++++++++++++++++++---- tests/unit/check-qom-proplist.c | 88 ++++++++++++++++++++++++++++----- 3 files changed, 187 insertions(+), 22 deletions(-) diff --git a/include/qom/object.h b/include/qom/object.h index fb1cd92d97..11f55613fc 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -719,6 +719,53 @@ Object *object_new_with_props_from_qdict(const char *t= ypename, Visitor *v, Error **errp); =20 +/** + * object_new_with_props_parentless: + * @typename: The name of the type of the object to instantiate. + * @errp: pointer to error object + * @...: list of property names and values + * + * Behaviour as object_new_with_props(), except the object + * will not be added to any parent and thus the caller will + * own the returned instance. The caller must call + * object_unref when it is no longer required. + */ +Object *object_new_with_props_parentless(const char *typename, + Error **errp, + ...) G_GNUC_NULL_TERMINATED; + +/** + * object_new_with_propv_parentless: + * @typename: The name of the type of the object to instantiate. + * @vargs: list of property names and values + * @errp: pointer to error object + * + * Behaviour as object_new_with_propv(), except the object + * will not be added to any parent and thus the caller will + * own the returned instance. The caller must call + * object_unref when it is no longer required. + */ +Object *object_new_with_propv_parentless(const char *typename, + va_list vargs, + Error **errp); + +/** + * object_new_with_props_from_qdict_parentless: + * @typename: The name of the type of the object to instantiate. + * @props: dictionary of property names and values + * @v: visitor to iterate over @props + * @errp: pointer to error object + * + * Behaviour as object_new_with_props_from_qdict(), except the + * object will not be added to any parent and thus the caller + * will own the returned instance. The caller must call + * object_unref when it is no longer required. + */ +Object *object_new_with_props_from_qdict_parentless(const char *typename, + const QDict *props, + Visitor *v, + Error **errp); + /** * object_set_props: * @obj: the object instance to set properties on diff --git a/qom/object.c b/qom/object.c index a11f559445..5a7ac457c1 100644 --- a/qom/object.c +++ b/qom/object.c @@ -740,6 +740,8 @@ Object *object_new_with_props(const char *typename, va_list vargs; Object *obj; =20 + assert(parent !=3D NULL); + assert(id !=3D NULL); va_start(vargs, errp); obj =3D object_new_with_propv(typename, parent, id, vargs, errp); va_end(vargs); @@ -757,10 +759,14 @@ object_new_with_props_helper(const char *typename, Error **errp), Error **errp) { + ERRP_GUARD(); Object *obj; ObjectClass *klass; UserCreatable *uc; =20 + assert((id !=3D NULL && parent !=3D NULL) || + (id =3D=3D NULL && parent =3D=3D NULL)); + if (id !=3D NULL && !id_wellformed(id)) { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "id", "an identifie= r"); error_append_hint(errp, "Identifiers consist of letters, digits, " @@ -785,7 +791,10 @@ object_new_with_props_helper(const char *typename, } =20 if (id !=3D NULL) { - object_property_add_child(parent, id, obj); + object_property_try_add_child(parent, id, obj, errp); + if (*errp) { + goto error; + } } =20 uc =3D (UserCreatable *)object_dynamic_cast(obj, TYPE_USER_CREATABLE); @@ -798,7 +807,6 @@ object_new_with_props_helper(const char *typename, } } =20 - object_unref(obj); return obj; =20 error: @@ -826,7 +834,8 @@ Object *object_new_with_propv(const char *typename, { Object *obj; struct ObjectNewVargsData data; - + assert(parent !=3D NULL); + assert(id !=3D NULL); va_copy(data.vargs, vargs); obj =3D object_new_with_props_helper(typename, parent, @@ -835,6 +844,9 @@ Object *object_new_with_propv(const char *typename, object_new_with_propv_setter, errp); va_end(data.vargs); + if (obj) { + object_unref(obj); + } return obj; } =20 @@ -859,12 +871,56 @@ Object *object_new_with_props_from_qdict(const char *= typename, Error **errp) { struct ObjectNewQDictData data =3D { props, v }; - return object_new_with_props_helper(typename, - parent, - id, - &data, - object_new_with_qdict_setter, - errp); + Object *obj; + assert(parent !=3D NULL); + assert(id !=3D NULL); + obj =3D object_new_with_props_helper(typename, + parent, + id, + &data, + object_new_with_qdict_setter, + errp); + if (obj) { + object_unref(obj); + } + return obj; +} + +Object *object_new_with_props_parentless(const char *typename, + Error **errp, + ...) +{ + va_list vargs; + Object *obj; + + va_start(vargs, errp); + obj =3D object_new_with_propv_parentless(typename, vargs, errp); + va_end(vargs); + + return obj; +} + +Object *object_new_with_propv_parentless(const char *typename, + va_list vargs, + Error **errp) +{ + Object *ret; + struct ObjectNewVargsData data; + va_copy(data.vargs, vargs); + ret =3D object_new_with_props_helper(typename, NULL, NULL, &data, + object_new_with_propv_setter, errp); + va_end(data.vargs); + return ret; +} + +Object *object_new_with_props_from_qdict_parentless(const char *typename, + const QDict *props, + Visitor *v, + Error **errp) +{ + struct ObjectNewQDictData data =3D { props, v }; + return object_new_with_props_helper(typename, NULL, NULL, &data, + object_new_with_qdict_setter, errp= ); } =20 bool object_set_props(Object *obj, diff --git a/tests/unit/check-qom-proplist.c b/tests/unit/check-qom-proplis= t.c index 7f31735459..954c898ce1 100644 --- a/tests/unit/check-qom-proplist.c +++ b/tests/unit/check-qom-proplist.c @@ -336,7 +336,7 @@ static QemuOptsList qemu_object_opts =3D { }; =20 =20 -static void test_dummy_createv(void) +static void test_dummy_createv_tree(void) { Error *err =3D NULL; Object *parent =3D object_get_objects_root(); @@ -351,6 +351,7 @@ static void test_dummy_createv(void) NULL)); =20 g_assert(err =3D=3D NULL); + g_assert_cmpint(dobj->parent_obj.ref, =3D=3D, 1); g_assert_cmpstr(dobj->sv, =3D=3D, "Hiss hiss hiss"); g_assert(dobj->bv =3D=3D true); g_assert(dobj->av =3D=3D DUMMY_PLATYPUS); @@ -362,9 +363,30 @@ static void test_dummy_createv(void) } =20 =20 -static Object *new_helper(Error **errp, - Object *parent, - ...) +static void test_dummy_createv_parentless(void) +{ + Error *err =3D NULL; + DummyObject *dobj =3D DUMMY_OBJECT( + object_new_with_props_parentless(TYPE_DUMMY, + &err, + "bv", "yes", + "sv", "Hiss hiss hiss", + "av", "platypus", + NULL)); + + g_assert(err =3D=3D NULL); + g_assert_cmpint(dobj->parent_obj.ref, =3D=3D, 1); + g_assert_cmpstr(dobj->sv, =3D=3D, "Hiss hiss hiss"); + g_assert(dobj->bv =3D=3D true); + g_assert(dobj->av =3D=3D DUMMY_PLATYPUS); + + object_unref(OBJECT(dobj)); +} + + +static Object *new_helper_tree(Error **errp, + Object *parent, + ...) { va_list vargs; Object *obj; @@ -379,19 +401,20 @@ static Object *new_helper(Error **errp, return obj; } =20 -static void test_dummy_createlist(void) +static void test_dummy_createlist_tree(void) { Error *err =3D NULL; Object *parent =3D object_get_objects_root(); DummyObject *dobj =3D DUMMY_OBJECT( - new_helper(&err, - parent, - "bv", "yes", - "sv", "Hiss hiss hiss", - "av", "platypus", - NULL)); + new_helper_tree(&err, + parent, + "bv", "yes", + "sv", "Hiss hiss hiss", + "av", "platypus", + NULL)); =20 g_assert(err =3D=3D NULL); + g_assert_cmpint(dobj->parent_obj.ref, =3D=3D, 1); g_assert_cmpstr(dobj->sv, =3D=3D, "Hiss hiss hiss"); g_assert(dobj->bv =3D=3D true); g_assert(dobj->av =3D=3D DUMMY_PLATYPUS); @@ -402,6 +425,39 @@ static void test_dummy_createlist(void) object_unparent(OBJECT(dobj)); } =20 +static Object *new_helper_parentless(Error **errp, + ...) +{ + va_list vargs; + Object *obj; + + va_start(vargs, errp); + obj =3D object_new_with_propv_parentless(TYPE_DUMMY, + vargs, + errp); + va_end(vargs); + return obj; +} + +static void test_dummy_createlist_parentless(void) +{ + Error *err =3D NULL; + DummyObject *dobj =3D DUMMY_OBJECT( + new_helper_parentless(&err, + "bv", "yes", + "sv", "Hiss hiss hiss", + "av", "platypus", + NULL)); + + g_assert(err =3D=3D NULL); + g_assert_cmpint(dobj->parent_obj.ref, =3D=3D, 1); + g_assert_cmpstr(dobj->sv, =3D=3D, "Hiss hiss hiss"); + g_assert(dobj->bv =3D=3D true); + g_assert(dobj->av =3D=3D DUMMY_PLATYPUS); + + object_unref(OBJECT(dobj)); +} + static bool test_create_obj(QDict *qdict, Error **errp) { Visitor *v =3D qobject_input_visitor_new_keyval(QOBJECT(qdict)); @@ -658,8 +714,14 @@ int main(int argc, char **argv) type_register_static(&dummy_bus_info); type_register_static(&dummy_backend_info); =20 - g_test_add_func("/qom/proplist/createlist", test_dummy_createlist); - g_test_add_func("/qom/proplist/createv", test_dummy_createv); + g_test_add_func("/qom/proplist/createlist/tree", + test_dummy_createlist_tree); + g_test_add_func("/qom/proplist/createlist/parentless", + test_dummy_createlist_parentless); + g_test_add_func("/qom/proplist/createv/tree", + test_dummy_createv_tree); + g_test_add_func("/qom/proplist/createv/parentless", + test_dummy_createv_parentless); g_test_add_func("/qom/proplist/createcmdline", test_dummy_createcmdl); g_test_add_func("/qom/proplist/badenum", test_dummy_badenum); g_test_add_func("/qom/proplist/getenum", test_dummy_getenum); --=20 2.54.0 From nobody Sat May 30 18:34:15 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1779268754; cv=none; d=zohomail.com; s=zohoarc; b=WXEs6Vf4FARZWJ/4E3fQs2MR8ISfb4hq+mMjYhEhho6aFE6GP3/t9Nrj5LEHU1ujJ/FHVdkpyv/nL+yHtSsIxzdL10m2oVGSq8wI8GrzY34/JvIQXXImo8qFQH/yaPFgPJRkSXZD1UeH0pkuNzFoB+712Qpy7e74d9d/bXuTa2w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779268754; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=SADnjsuaX2tH7zST0yPw1LUuFBObWj6PVplsWh6o5Ng=; b=iEInHfkaUCTHC7Iqv7UnY7gkfPUk/O9R1QWC0pbJvf0G4KSjqHOKByY6BmV7jkPtHoOUaptCgJKV4uRHslCeUGaex39AftvVy/fNmYRgPcCS5E7KhdMrTzqLsKhBxTG42s6D0Ft8lzHhPSgWK9d3dNBPJXsRX2qIEzoQwgDRC9Y= 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=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779268754610879.5550637676143; Wed, 20 May 2026 02:19:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPd3M-0001N5-B4; Wed, 20 May 2026 05:17:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPd2X-0007WR-KY for qemu-devel@nongnu.org; Wed, 20 May 2026 05:16:34 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPd2W-0006Oy-9A for qemu-devel@nongnu.org; Wed, 20 May 2026 05:16:33 -0400 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-503-v3GAIuf_NCC6sTaVwBHbGA-1; Wed, 20 May 2026 05:16:27 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 17EA819560A7; Wed, 20 May 2026 09:16:26 +0000 (UTC) Received: from berrange.com (unknown [10.44.49.211]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 243971800347; Wed, 20 May 2026 09:16:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779268591; 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=SADnjsuaX2tH7zST0yPw1LUuFBObWj6PVplsWh6o5Ng=; b=cVc/iwISrrdaJL/p/zfpT9cjYGlsAxHA0HsBlry9CzVjLhOdg0fdgYElMPvxcPpU45A4KV G9XxBR4L3+zflNgYXNNva68YQJOFrfelYYnzb0rkoKzAyXukk/p5WtzIYC9oC7JQ8E/I1E bfToH/HO5f0HBu8bF7gQdiqGmv/IDEI= X-MC-Unique: v3GAIuf_NCC6sTaVwBHbGA-1 X-Mimecast-MFC-AGG-ID: v3GAIuf_NCC6sTaVwBHbGA_1779268586 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thanos Makatos , qemu-block@nongnu.org, Hanna Reitz , Kevin Wolf , Pierrick Bouvier , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , John Snow , John Levon , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PULL 28/29] qom: allow object_new_with_prop* to trigger module loading Date: Wed, 20 May 2026 10:13:50 +0100 Message-ID: <20260520091351.1160442-29-berrange@redhat.com> In-Reply-To: <20260520091351.1160442-1-berrange@redhat.com> References: <20260520091351.1160442-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1779268756718154100 The object_new_with_prop* methods will shortly be replacing the user_creatable_add_type method. In order to do that, the object_new_with_prop* methods must allow module loading to be triggered for any types. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 --- qom/object.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qom/object.c b/qom/object.c index 5a7ac457c1..0ac201de4c 100644 --- a/qom/object.c +++ b/qom/object.c @@ -774,7 +774,7 @@ object_new_with_props_helper(const char *typename, return NULL; } =20 - klass =3D object_class_by_name(typename); + klass =3D module_object_class_by_name(typename); if (!klass) { error_setg(errp, "invalid object type: %s", typename); return NULL; --=20 2.54.0 From nobody Sat May 30 18:34:15 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1779268754; cv=none; d=zohomail.com; s=zohoarc; b=nAluXgKE/SZ+t4hmzxIfAFxO5SobcG6/74xDsCkF6QeP1GrMoPQJA1G/Op1o3HtbVzbTK/W44KYeGlA14SIiJ2Ra40bqrdXiuvQuo7rQQh3EO1+QvmU9W2cckUd0z3HslI7ByOkdf7+R0nB8WIbajM7N0b+YtOegYIAqVq5VigM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779268754; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=h9wLB4CLym9nrvKDYBwDKPAx6VH+gv3KlNnDNRnFKzg=; b=knm2egNd9lv+y57uEu9hLLNjOjGTcELCeBVzOsIbVGXxzqZRVAGzB3KsUL2JNOq5ThO/ao3dtakp50q6sfAW+wiUQ2RSP6wUQJ7RGNT2Mc4ahl/dkXhyjlHuvY3Fo0QLxnMoGKhwBdc29zJb1sRSGM9KxZsG8FfC1Qa3lHKiucM= 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=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779268754238324.9974211424935; Wed, 20 May 2026 02:19:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPd3A-0008VK-J0; Wed, 20 May 2026 05:17:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPd2h-0007lb-5j for qemu-devel@nongnu.org; Wed, 20 May 2026 05:16:46 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPd2c-0006S1-RT for qemu-devel@nongnu.org; Wed, 20 May 2026 05:16:40 -0400 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-211-Dc18ffGSNgunqJbQSzcLoQ-1; Wed, 20 May 2026 05:16:32 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6CEDF1956046; Wed, 20 May 2026 09:16:31 +0000 (UTC) Received: from berrange.com (unknown [10.44.49.211]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id A78B118004A3; Wed, 20 May 2026 09:16:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779268598; 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=h9wLB4CLym9nrvKDYBwDKPAx6VH+gv3KlNnDNRnFKzg=; b=i0zDDIMGONl1ERFZjuG13onUhUFcjcc1J4VyaHMK35WdFcFqiz1PBc40p5dLws44bxaqVN LkG5UdfqEbdCX8rBAsEV/6uNJgadXT2sJKF9/aeFEm2i0l0AjkB4v8FjuWyYwfEY0hwUPF wR2EfArnCugen7pY0DC37ly0ji80AhE= X-MC-Unique: Dc18ffGSNgunqJbQSzcLoQ-1 X-Mimecast-MFC-AGG-ID: Dc18ffGSNgunqJbQSzcLoQ_1779268591 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thanos Makatos , qemu-block@nongnu.org, Hanna Reitz , Kevin Wolf , Pierrick Bouvier , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , John Snow , John Levon , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PULL 29/29] qom: drop user_creatable_add_type method Date: Wed, 20 May 2026 10:13:51 +0100 Message-ID: <20260520091351.1160442-30-berrange@redhat.com> In-Reply-To: <20260520091351.1160442-1-berrange@redhat.com> References: <20260520091351.1160442-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1779268756779154100 This can be replaced by object_new_with_props_from_qdict, which does functionally the same job, but the caller does not own the returned reference, instead the parent object owns it. In one case we can use object_new_with_props_from_qdict_owned instead since the object is not intended to have any parent. Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 --- authz/listfile.c | 4 +- include/qom/object_interfaces.h | 18 --------- qom/object_interfaces.c | 70 ++------------------------------- tests/unit/check-qom-proplist.c | 5 +-- 4 files changed, 7 insertions(+), 90 deletions(-) diff --git a/authz/listfile.c b/authz/listfile.c index 13741d5a72..23655f8663 100644 --- a/authz/listfile.c +++ b/authz/listfile.c @@ -79,8 +79,8 @@ qauthz_list_file_load(QAuthZListFile *fauthz, Error **err= p) =20 v =3D qobject_input_visitor_new(obj); =20 - ret =3D (QAuthZ *)user_creatable_add_type(TYPE_QAUTHZ_LIST, - NULL, pdict, v, errp); + ret =3D QAUTHZ(object_new_with_props_from_qdict_parentless( + TYPE_QAUTHZ_LIST, pdict, v, errp)); =20 cleanup: visit_free(v); diff --git a/include/qom/object_interfaces.h b/include/qom/object_interface= s.h index 02b11a7ef0..e2b8615617 100644 --- a/include/qom/object_interfaces.h +++ b/include/qom/object_interfaces.h @@ -69,24 +69,6 @@ bool user_creatable_complete(UserCreatable *uc, Error **= errp); */ bool user_creatable_can_be_deleted(UserCreatable *uc); =20 -/** - * user_creatable_add_type: - * @type: the object type name - * @id: the unique ID for the object - * @qdict: the object properties - * @v: the visitor - * @errp: if an error occurs, a pointer to an area to store the error - * - * Create an instance of the user creatable object @type, placing - * it in the object composition tree with name @id, initializing - * it with properties from @qdict - * - * Returns: the newly created object or NULL on error - */ -Object *user_creatable_add_type(const char *type, const char *id, - const QDict *qdict, - Visitor *v, Error **errp); - /** * user_creatable_add_qapi: * @options: the object definition diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c index e0a3cd8d0f..7080f85f95 100644 --- a/qom/object_interfaces.c +++ b/qom/object_interfaces.c @@ -44,75 +44,11 @@ bool user_creatable_can_be_deleted(UserCreatable *uc) } } =20 -Object *user_creatable_add_type(const char *type, const char *id, - const QDict *qdict, - Visitor *v, Error **errp) -{ - ERRP_GUARD(); - Object *obj; - ObjectClass *klass; - Error *local_err =3D NULL; - - if (id !=3D NULL && !id_wellformed(id)) { - error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "id", "an identifie= r"); - error_append_hint(errp, "Identifiers consist of letters, digits, " - "'-', '.', '_', starting with a letter.\n"); - return NULL; - } - - klass =3D module_object_class_by_name(type); - if (!klass) { - error_setg(errp, "invalid object type: %s", type); - return NULL; - } - - if (!object_class_dynamic_cast(klass, TYPE_USER_CREATABLE)) { - error_setg(errp, "object type '%s' isn't supported by object-add", - type); - return NULL; - } - - if (object_class_is_abstract(klass)) { - error_setg(errp, "object type '%s' is abstract", type); - return NULL; - } - - assert(qdict); - obj =3D object_new_with_class(klass); - object_set_props_from_qdict(obj, qdict, v, &local_err); - if (local_err) { - goto out; - } - - if (id !=3D NULL) { - object_property_try_add_child(object_get_objects_root(), - id, obj, &local_err); - if (local_err) { - goto out; - } - } - - if (!user_creatable_complete(USER_CREATABLE(obj), &local_err)) { - if (id !=3D NULL) { - object_property_del(object_get_objects_root(), id); - } - goto out; - } -out: - if (local_err) { - error_propagate(errp, local_err); - object_unref(obj); - return NULL; - } - return obj; -} - void user_creatable_add_qapi(ObjectOptions *options, Error **errp) { Visitor *v; QObject *qobj; QDict *props; - Object *obj; =20 v =3D qobject_output_visitor_new(&qobj); visit_type_ObjectOptions(v, NULL, &options, &error_abort); @@ -124,9 +60,9 @@ void user_creatable_add_qapi(ObjectOptions *options, Err= or **errp) qdict_del(props, "id"); =20 v =3D qobject_input_visitor_new(QOBJECT(props)); - obj =3D user_creatable_add_type(ObjectType_str(options->qom_type), - options->id, props, v, errp); - object_unref(obj); + object_new_with_props_from_qdict(ObjectType_str(options->qom_type), + object_get_objects_root(), + options->id, props, v, errp); qobject_unref(qobj); visit_free(v); } diff --git a/tests/unit/check-qom-proplist.c b/tests/unit/check-qom-proplis= t.c index 954c898ce1..89de92b7d9 100644 --- a/tests/unit/check-qom-proplist.c +++ b/tests/unit/check-qom-proplist.c @@ -461,10 +461,9 @@ static void test_dummy_createlist_parentless(void) static bool test_create_obj(QDict *qdict, Error **errp) { Visitor *v =3D qobject_input_visitor_new_keyval(QOBJECT(qdict)); - Object *obj =3D user_creatable_add_type(TYPE_DUMMY, "dev0", qdict, v, = errp); - + Object *obj =3D object_new_with_props_from_qdict( + TYPE_DUMMY, object_get_objects_root(), "dev0", qdict, v, errp); visit_free(v); - object_unref(obj); return !!obj; } =20 --=20 2.54.0