From nobody Tue May 14 14:08:35 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=1618219193; cv=none; d=zohomail.com; s=zohoarc; b=HSHKwXD0yjrg5mGA+YQJuEBl5rTv2QgwEYiR2rW/MXiAhYlwhargNpFfLkR3K/X6IsPQgDLfP6WQBn23d7FPsSOD+NMFsIXNDcC2+dLCP87uCZAe2N2KT98Xj0A8yZXMgtaamxp2NFeeERZadQmrG6ieIRb8x/WHdZCBSrS46wc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618219193; 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=h2zBXeHQksvcaRIstg4r3aQ4YJKiVFW+sz0ufPrakKw=; b=jOX7912GTR/sGEXpyeGWY40NlnLYLRPepAv1iAemS66/EM+UCfo/J17nx5x1WvcqSUzZcz+CLrp5RfV0p23JatYIPp/qI054BPVq0vbA4eDngHtDvTNn+PHjUTwvgazSAyrAtCfphmkpOyGx083LI363/wgymIaghfTYaqg4WNY= 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 1618219193702724.1310560262084; Mon, 12 Apr 2021 02:19:53 -0700 (PDT) Received: from localhost ([::1]:33730 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lVsjY-0002yA-L8 for importer@patchew.org; Mon, 12 Apr 2021 05:19:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44560) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lVsiJ-000248-PU for qemu-devel@nongnu.org; Mon, 12 Apr 2021 05:18:35 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:43129) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lVsiH-0006np-Ki for qemu-devel@nongnu.org; Mon, 12 Apr 2021 05:18:34 -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-574-rImBbWQ4NZucw5MEAd-2gw-1; Mon, 12 Apr 2021 05:18:30 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9697E107ACF4; Mon, 12 Apr 2021 09:18:29 +0000 (UTC) Received: from localhost (ovpn-115-66.ams2.redhat.com [10.36.115.66]) by smtp.corp.redhat.com (Postfix) with ESMTP id A1ED35D6DC; Mon, 12 Apr 2021 09:18:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618219112; 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=h2zBXeHQksvcaRIstg4r3aQ4YJKiVFW+sz0ufPrakKw=; b=FHduk5r1FfNkS3+TytLKTPNFULPejGwkVyY9z478uPgNfq0FychFBxqmWq+iZ6e8naHlC+ PYk79SKXaHa9fkxOAHYTKssOZUh9+afybX0RJxkIOug41C71rLUKfh4CXy/62VzNxPWNqg +FA+CMgc/gMfeAB7/8YXu34d2eQepEw= X-MC-Unique: rImBbWQ4NZucw5MEAd-2gw-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PATCH v2] libqtest: refuse QTEST_QEMU_BINARY=qemu-kvm Date: Mon, 12 Apr 2021 10:18:24 +0100 Message-Id: <20210412091824.707855-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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=63.128.21.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.01, RCVD_IN_MSPIKE_WL=-0.01, 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. Reported-by: Qin Wang Cc: Emanuele Giuseppe Esposito Signed-off-by: Stefan Hajnoczi --- tests/qtest/libqtest.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c index 71e359efcd..7caf20f56b 100644 --- a/tests/qtest/libqtest.c +++ b/tests/qtest/libqtest.c @@ -910,6 +910,16 @@ const char *qtest_get_arch(void) abort(); } =20 + if (!strstr(qemu, "-system-")) { + fprintf(stderr, "QTEST_QEMU_BINARY must end with *-system- w= here " + "'arch' is the target architecture (x86_64, aarch6= 4, " + "etc). If you are using qemu-kvm or another custom= " + "name, please create a symlink like ln -s " + "path/to/qemu-kvm qemu-system-x86_64 and use that " + "instead.\n"); + abort(); + } + return end + 1; } =20 --=20 2.30.2