From nobody Mon Feb 9 04:46:27 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1620995229; cv=none; d=zohomail.com; s=zohoarc; b=mfdB/1RqKoCPFR1VcM57WadzGZCMfTnE+Mwsy03hx+wfeLTbrT1bgVXTU3354+OHwQYaLLodd8x3u1+HDoTuogNKN4xikp84188J4x6Hk5torqM/HGHhP5FPpM2rvmblnXaa4Mx1DUSADWG54Mt4mk8hsHb4sF8aoI2SwL0y2D4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620995229; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=tZU6RUrWrKBMiQej9SF7Mt71rREj59rM//14ac3a1uY=; b=X7/KvF4lDr0gfyNC/iH486QmRiKkpl9IJgXW+bBQ9XOUZv+/r6AUGUdiBHjJ/02kSQc+Tyko8cL7WzAdIvUxh9+XaU5GOyQ+OnWu1NhkVFcV0ZPb19udEhJTIA8XvmQCvDteIAnMS4M0uoNW9E6dyO7lQvy/hMAMKg/y/jiFBJY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1620995229256604.3854406822638; Fri, 14 May 2021 05:27:09 -0700 (PDT) Received: from localhost ([::1]:34004 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lhWuK-0000Rc-4e for importer@patchew.org; Fri, 14 May 2021 08:27:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56454) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhWjT-0000cs-FC for qemu-devel@nongnu.org; Fri, 14 May 2021 08:15:55 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:53541) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhWjR-00054p-Oq for qemu-devel@nongnu.org; Fri, 14 May 2021 08:15:55 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-122-P0JBbm3nPlqMNB4URc-ucw-1; Fri, 14 May 2021 08:15:51 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7257E801106; Fri, 14 May 2021 12:15:50 +0000 (UTC) Received: from thuth.com (ovpn-112-191.ams2.redhat.com [10.36.112.191]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0F4F060CCF; Fri, 14 May 2021 12:15:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620994553; 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=tZU6RUrWrKBMiQej9SF7Mt71rREj59rM//14ac3a1uY=; b=VUlT5dycbjZ1wu8YWSnK42LM6kTCceBSJ+iLW0xfhPIv+KSHmIko9bJQbFujVOTzVWrUkY ntMa/nasWBTTtjMKXZhYtl6FT8/gflVSMZG5CHKgu4ZVsfRmwbIPSjvsB9AfEw4tH4c/Np ql8iDS1k0C2HzrT0EFp69eWQOcBXRUM= X-MC-Unique: P0JBbm3nPlqMNB4URc-ucw-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 07/20] libqtest: refuse QTEST_QEMU_BINARY=qemu-kvm Date: Fri, 14 May 2021 14:15:05 +0200 Message-Id: <20210514121518.832729-8-thuth@redhat.com> In-Reply-To: <20210514121518.832729-1-thuth@redhat.com> References: <20210514121518.832729-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.699, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Emanuele Giuseppe Esposito , Qin Wang , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Stefan Hajnoczi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Stefan Hajnoczi Some downstreams rename the QEMU binary to "qemu-kvm". This breaks qtest_get_arch(), which attempts to parse the target architecture from the QTEST_QEMU_BINARY environment variable. Print an error instead of returning the architecture "kvm". Things fail in weird ways when the architecture string is bogus. Arguably qtests should always be run in a build directory instead of against an installed QEMU. In any case, printing a clear error when this happens is helpful. Since this is an error that is triggered by the user and not a test failure, use exit(1) instead of abort(). Change the existing abort() call in qtest_get_arch() to exit(1) too for the same reason and to be consistent. Reported-by: Qin Wang Signed-off-by: Stefan Hajnoczi Reviewed-by: Emanuele Giuseppe Esposito Reviewed-by: Thomas Huth Cc: Emanuele Giuseppe Esposito Message-Id: <20210412143050.725918-1-stefanha@redhat.com> Signed-off-by: Thomas Huth --- tests/qtest/libqtest.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c index 71e359efcd..825b13a44c 100644 --- a/tests/qtest/libqtest.c +++ b/tests/qtest/libqtest.c @@ -907,7 +907,14 @@ const char *qtest_get_arch(void) =20 if (!end) { fprintf(stderr, "Can't determine architecture from binary name.\n"= ); - abort(); + exit(1); + } + + if (!strstr(qemu, "-system-")) { + fprintf(stderr, "QTEST_QEMU_BINARY must end with *-system- " + "where 'arch' is the target\narchitecture (x86_64, aarch64= , " + "etc).\n"); + exit(1); } =20 return end + 1; --=20 2.27.0