From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3134EC433B4 for ; Mon, 12 Apr 2021 14:47:32 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6DF8561352 for ; Mon, 12 Apr 2021 14:47:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6DF8561352 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:51490 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lVxqc-0005Zu-BR for qemu-devel@archiver.kernel.org; Mon, 12 Apr 2021 10:47:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48086) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lVxol-0004fk-MN for qemu-devel@nongnu.org; Mon, 12 Apr 2021 10:45:39 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:52677) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lVxoU-0005sr-O5 for qemu-devel@nongnu.org; Mon, 12 Apr 2021 10:45:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618238716; 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=VnbAR8IHHNmiPgFzB4bE8bzCswKwlEOrCOUQNBUnB+U=; b=DUeJcjK0Lvu6ot3bvwu2V/ftaEk4hYBN7uZ/jKaJsLOLnnL/+qGMBZe+6L6NQTZOFxAUEa EmSChC8b3N05VjONkUmgcn4j6+9M2fcF+RmIr8q77Gmj8OsVdZdyxuXNDj02iLmsou/SA3 MetjnFbYhBQrBIUY3WzNDvOF63auZ/A= 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-565-0NHQLD1sPnS5KydTBw0Hgw-1; Mon, 12 Apr 2021 10:45:15 -0400 X-MC-Unique: 0NHQLD1sPnS5KydTBw0Hgw-1 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 E249D6D246; Mon, 12 Apr 2021 14:45:12 +0000 (UTC) Received: from thuth.remote.csb (ovpn-112-84.ams2.redhat.com [10.36.112.84]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9E172620DE; Mon, 12 Apr 2021 14:45:10 +0000 (UTC) Subject: Re: [PATCH v3] libqtest: refuse QTEST_QEMU_BINARY=qemu-kvm To: Stefan Hajnoczi , qemu-devel@nongnu.org References: <20210412143050.725918-1-stefanha@redhat.com> From: Thomas Huth Message-ID: Date: Mon, 12 Apr 2021 16:45:09 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.9.0 MIME-Version: 1.0 In-Reply-To: <20210412143050.725918-1-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=216.205.24.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, NICE_REPLY_A=-0.001, 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=unavailable 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 , Paolo Bonzini , Emanuele Giuseppe Esposito , Qin Wang , Peter Maydell Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 12/04/2021 16.30, Stefan Hajnoczi wrote: > 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 > --- > 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) > > 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); > } > > return end + 1; > Reviewed-by: Thomas Huth