From nobody Tue May 14 06:14:12 2024 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=1618237932; cv=none; d=zohomail.com; s=zohoarc; b=DCxJedIANBUts9PM744knLCHWXq8BL/Sau4bS9OrCPG6ABx5u0PqdRJRdSjYwjdtOtvzHsdTbdoseO4HyvgPu4IcYf8KAgKL2Wyl7JomVdwM8bAPSJZEdAtbvZpqJ7s3/28PPwg6Ay9ilsyRm2NW085CEanwddm15q+AmN3xCBo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618237932; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=8DhdbzN8kWd9sNt/Yr/XDn2YwH3qOzYTm56pAd+o/eg=; b=mxBk5BeJmmmRd8qB5C0fT6CngXk5Y3nHSGNSQ0qhnoC/RUc+x9CvROCoSOP0J8FNVdC/BXLgeJTFGQ/zeCuc2djeYlYpNG3MZhdN5YUfZuOhv1G0LYHtlUugG98+RgaTG9vQ0DooSlIUn+RA+lrMoBqqg25rh5PsIw0x10i63As= 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 1618237932651664.8863825964656; Mon, 12 Apr 2021 07:32:12 -0700 (PDT) Received: from localhost ([::1]:58770 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lVxbm-0004Fa-3Q for importer@patchew.org; Mon, 12 Apr 2021 10:32:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44428) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lVxac-0003gz-25 for qemu-devel@nongnu.org; Mon, 12 Apr 2021 10:30:58 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:37192) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lVxaZ-0005Yz-UT for qemu-devel@nongnu.org; Mon, 12 Apr 2021 10:30:57 -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-93-GjmtHk9eMHikyC3VQUjWKw-1; Mon, 12 Apr 2021 10:30:53 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1031210054F6; Mon, 12 Apr 2021 14:30:52 +0000 (UTC) Received: from localhost (ovpn-115-66.ams2.redhat.com [10.36.115.66]) by smtp.corp.redhat.com (Postfix) with ESMTP id 716012DAD0; Mon, 12 Apr 2021 14:30:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618237854; 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; bh=8DhdbzN8kWd9sNt/Yr/XDn2YwH3qOzYTm56pAd+o/eg=; b=CZS9eb9ZL+oaYLQIOy0HJWjh89rPQfOKb73I1P5uXL+VNGA8seD6LQW5JLKzLWdkwDUPhv Zjf8MkVg3uIAECy0RzAtJj5CMYvN7cbAiQZ5QtBEmRKty6yWJIpnVELU37bruWYrFDqmy0 xmG6HaLwTV11Hv2V+nxymBz6eW9SNdI= X-MC-Unique: GjmtHk9eMHikyC3VQUjWKw-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PATCH v3] libqtest: refuse QTEST_QEMU_BINARY=qemu-kvm Date: Mon, 12 Apr 2021 15:30:50 +0100 Message-Id: <20210412143050.725918-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=stefanha@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=216.205.24.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MIME_BASE64_TEXT=1.741, 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: Laurent Vivier , Peter Maydell , Thomas Huth , Emanuele Giuseppe Esposito , Qin Wang , Stefan Hajnoczi , Paolo Bonzini 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" 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 Cc: Emanuele Giuseppe Esposito Signed-off-by: Stefan Hajnoczi Reviewed-by: Emanuele Giuseppe Esposito Reviewed-by: Thomas Huth --- v3: * Add newline to wrap error message output at 80 columns [Thomas] * Drop information about working around this using a symlink [Thomas] * Use exit(1) instead of abort() [Thomas] 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.30.2