From nobody Thu Mar 28 15:22:36 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=1617792382; cv=none; d=zohomail.com; s=zohoarc; b=d3rzXrKsZkzGFWWcpYIesi/5T2hkSG0ZVMWepHqhuSuPCaisMemlK4TBjEVDsYKL9n3HuvTs38gcchAw75ntsELvyDfyHPx/xXI6zlP4c2oIs1e0urw0E/y21k/CarstHk4UK68mZ/pqb/NRtkBx/jyGb8MXfqfXEHwTTkwmQx8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617792382; 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=4yYs4XGWfQPgVs/65PGKUB1sHYl5p2m+qxRYzu3svUs=; b=ZPA5ubYuNqKG4GtIBqs50Mq3QSby3iz5gMf5VrSXRMXFrlYaDw6fv36pnSnc2cMT3XgZNLXqXcVMDDHRY66MakLHvdzq0oEiMWEvPv7qzrr2fvrxgVzcUzhK5/dERDI0QKBM5x0wS6bsFnUb8m7xORg/LdRtu4nfGxI66gPcqvg= 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 161779238230675.17518397970025; Wed, 7 Apr 2021 03:46:22 -0700 (PDT) Received: from localhost ([::1]:47280 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lU5hU-0004nw-Vs for importer@patchew.org; Wed, 07 Apr 2021 06:46:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57960) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lU5ga-0004I2-Jc for qemu-devel@nongnu.org; Wed, 07 Apr 2021 06:45:24 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:36466) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lU5gX-0000FB-NN for qemu-devel@nongnu.org; Wed, 07 Apr 2021 06:45:23 -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-31-xjjukNEpO6KupC80cXQIgQ-1; Wed, 07 Apr 2021 06:45:18 -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 167186D4E0; Wed, 7 Apr 2021 10:45:17 +0000 (UTC) Received: from localhost (ovpn-114-86.ams2.redhat.com [10.36.114.86]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8A41614108; Wed, 7 Apr 2021 10:45:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617792319; 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=4yYs4XGWfQPgVs/65PGKUB1sHYl5p2m+qxRYzu3svUs=; b=i0ReozbcB3/0xKe7uR2qjVncWOje45VAUD4hDzt8Q/gmaUxCCVZ1jkZrrBqCD0G4MI13DN 4ZfvIc1rqV1gDS4jUIwARTCHMYZxCq8F3ON0c5rwBPHASx1iFu2f03g1do1N7TeV0g2xoH 1KjO6mzUh8g2vljZJmsU0DODbBFx1hc= X-MC-Unique: xjjukNEpO6KupC80cXQIgQ-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PATCH] libqtest: refuse QTEST_QEMU_BINARY=qemu-kvm Date: Wed, 7 Apr 2021 11:45:11 +0100 Message-Id: <20210407104511.343061-1-stefanha@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=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 , Emanuele Giuseppe Esposito , Thomas Huth , 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 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c index 71e359efcd..2fc249c0b5 100644 --- a/tests/qtest/libqtest.c +++ b/tests/qtest/libqtest.c @@ -910,6 +910,14 @@ const char *qtest_get_arch(void) abort(); } =20 + if (strcmp(end + 1, "kvm") =3D=3D 0) { + fprintf(stderr, "QTEST_QEMU_BINARY must end with *-. If you = are " + "using qemu-kvm, 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