From patchwork Thu Dec 7 15:58:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabiano Rosas X-Patchwork-Id: 1873285 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=Ebk2urIf; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=t2PR7f8/; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=Ebk2urIf; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=t2PR7f8/; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SmJqS61rSz23nW for ; Fri, 8 Dec 2023 02:59:16 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rBGls-0000Dj-8l; Thu, 07 Dec 2023 10:58:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rBGlZ-0000B3-J0 for qemu-devel@nongnu.org; Thu, 07 Dec 2023 10:58:21 -0500 Received: from smtp-out2.suse.de ([195.135.223.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rBGlW-0007Cs-Qf for qemu-devel@nongnu.org; Thu, 07 Dec 2023 10:58:21 -0500 Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id D18D81FB68; Thu, 7 Dec 2023 15:58:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1701964696; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GXlVKxAEzxwStXFlgc6yUq0QevzR9UkhEfJIwxqvs5Y=; b=Ebk2urIfnyf4JJMaSNte0qh4VduLgNra5aaZ8dQf7reJv7ZSszqtQnh0D0SepvDK36qPuE JlbIQ0XW6xX2xzpubjAlHTBMb08IhFzLa7zM3vJkg6MSyUoet/lOGJM4sFbhM8sspKoNv9 nNs+AP0s9g+d/5PrTLJ25AT0rKyF6JI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1701964696; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GXlVKxAEzxwStXFlgc6yUq0QevzR9UkhEfJIwxqvs5Y=; b=t2PR7f8/wd92BRdZG9xv/ll7VvNtiNFm1DT1ewvQZeYG871X7DsnQg2XH5mwFSidrakrHq 1/irYFVCV3cSKnBw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1701964696; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GXlVKxAEzxwStXFlgc6yUq0QevzR9UkhEfJIwxqvs5Y=; b=Ebk2urIfnyf4JJMaSNte0qh4VduLgNra5aaZ8dQf7reJv7ZSszqtQnh0D0SepvDK36qPuE JlbIQ0XW6xX2xzpubjAlHTBMb08IhFzLa7zM3vJkg6MSyUoet/lOGJM4sFbhM8sspKoNv9 nNs+AP0s9g+d/5PrTLJ25AT0rKyF6JI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1701964696; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GXlVKxAEzxwStXFlgc6yUq0QevzR9UkhEfJIwxqvs5Y=; b=t2PR7f8/wd92BRdZG9xv/ll7VvNtiNFm1DT1ewvQZeYG871X7DsnQg2XH5mwFSidrakrHq 1/irYFVCV3cSKnBw== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 5390413B6A; Thu, 7 Dec 2023 15:58:14 +0000 (UTC) Received: from dovecot-director2.suse.de ([10.150.64.162]) by imap1.dmz-prg2.suse.org with ESMTPSA id OMUAB5brcWXDVgAAD6G6ig (envelope-from ); Thu, 07 Dec 2023 15:58:14 +0000 From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Juan Quintela , Peter Xu , Leonardo Bras , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Thomas Huth , Laurent Vivier , Paolo Bonzini Subject: [PATCH v1 1/5] tests/qtest: Add a helper to query the QEMU version Date: Thu, 7 Dec 2023 12:58:05 -0300 Message-Id: <20231207155809.25673-2-farosas@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20231207155809.25673-1-farosas@suse.de> References: <20231207155809.25673-1-farosas@suse.de> MIME-Version: 1.0 X-Spam-Score: 3.16 Authentication-Results: smtp-out2.suse.de; none X-Spam-Score: 1.70 X-Spamd-Result: default: False [1.70 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_MISSING_CHARSET(2.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; BROKEN_CONTENT_TYPE(1.50)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; RCVD_COUNT_THREE(0.00)[3]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; RCPT_COUNT_SEVEN(0.00)[9]; MID_CONTAINS_FROM(1.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:email]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-2.00)[95.07%] Received-SPF: pass client-ip=195.135.223.131; envelope-from=farosas@suse.de; helo=smtp-out2.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Fabiano Rosas Reviewed-by: Thomas Huth --- tests/qtest/libqtest.c | 24 ++++++++++++++++++++++++ tests/qtest/libqtest.h | 10 ++++++++++ 2 files changed, 34 insertions(+) diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c index f33a210861..7cee68a834 100644 --- a/tests/qtest/libqtest.c +++ b/tests/qtest/libqtest.c @@ -337,6 +337,30 @@ void qtest_remove_abrt_handler(void *data) } } +void qtest_query_version(QTestState *who, int *major, int *minor, int *micro) +{ + QDict *rsp, *version; + + rsp = qtest_qmp_assert_success_ref(who, "{ 'execute': 'query-version' }"); + g_assert(rsp); + + version = qdict_get_qdict(rsp, "qemu"); + + if (major) { + *major = qdict_get_int(version, "major"); + } + + if (minor) { + *minor = qdict_get_int(version, "minor"); + } + + if (micro) { + *micro = qdict_get_int(version, "micro"); + } + + qobject_unref(rsp); +} + static const char *qtest_qemu_binary(const char *var) { const char *qemu_bin; diff --git a/tests/qtest/libqtest.h b/tests/qtest/libqtest.h index 6e3d3525bf..db7a780d26 100644 --- a/tests/qtest/libqtest.h +++ b/tests/qtest/libqtest.h @@ -1085,4 +1085,14 @@ bool have_qemu_img(void); */ bool mkimg(const char *file, const char *fmt, unsigned size_mb); +/** + * qtest_query_version: + * @who: QTestState instance to operate on + * @major: Pointer to where to store the major version number + * @minor: Pointer to where to store the minor version number + * @micro: Pointer to where to store the micro version number + * + */ +void qtest_query_version(QTestState *who, int *major, int *minor, int *micro); + #endif