From patchwork Mon Mar 16 21:26:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 184603 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp3321440ile; Mon, 16 Mar 2020 14:49:52 -0700 (PDT) X-Google-Smtp-Source: ADFU+vt+uGBj6U0lz2HH0Y1sHx1uL/smO5A47ZujqfoRTsZOYHpRhTiYM4gNob6DpnAqREZP2Mg7 X-Received: by 2002:a37:b8c2:: with SMTP id i185mr1849556qkf.156.1584395392160; Mon, 16 Mar 2020 14:49:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1584395392; cv=none; d=google.com; s=arc-20160816; b=Z2Qen8NJ7vGOhqXR1BkjeRZT7CZWW3NbryOVSUieKYNWrzGGDDdmNXFCgxfN7NXdyY T4fuMqqTyJs1lK1/6YoQ2jA224tudBVBuwCA0sl19Oik5SdRJyx2B6ViobMbmTYoBx7y 8EtkjGqDc22eXb3xz8CdygIQSBIsIvAvwDHOS7HGffGnHBpMMkJ7QfcmD8kXPrJfOiS0 XGMVTscWO3RLdlYrTMrR4r+bmid6ceo2pTF2ZE+zMwuccFCoKn0fgbRK1z3wMpJfB3G0 NFB677p79stb24sYltwHTG4sZbzXMUR9o3Dm/oxKsNDj8PNzq7rJKSGLVihv68ZBZyis DY1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=HxC1eILjyyD4vXLg01tF8j7MmRukmacLFrXLAYZM6r4=; b=zSpXAEIoobkbpUzB4K9dhQfAbvsnfDXniXV+/U2H2mnTdcOdL2U+LpW0c/ZjjWmONV rY6J5I4UtF/EE0p6ltz8uIXSJJT5DK4qPE3fy2l4W9q2gcCteJkQjjEA3VTRXbUSNQKu lfFVYi2wNhxPMBldvyam0YRl4ViBMWFR8VntNEnGPT7H6wCQ/MYr7ObVtxrGZ/kuv5Vm wm//5AWcFNfGtNe/5OlxhmG/UXTm3L8q+BOwxszIfxhKPl7cXaeaz/9Uso+i1d73uIVt OyfR7OQ6BQaVU1XhyAPpW/Us3EqkDGRCTCb/3ij+GrGuzKdo9nZP7qTbGTrMPn0P8t6Z wlXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=LopQyfnf; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id x4si903866qkj.12.2020.03.16.14.49.52 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 16 Mar 2020 14:49:52 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=LopQyfnf; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:49528 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDxcN-0001IP-KY for patch@linaro.org; Mon, 16 Mar 2020 17:49:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42764) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDxHs-00044I-2C for qemu-devel@nongnu.org; Mon, 16 Mar 2020 17:28:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jDxHo-0006CQ-M6 for qemu-devel@nongnu.org; Mon, 16 Mar 2020 17:28:39 -0400 Received: from us-smtp-delivery-74.mimecast.com ([216.205.24.74]:38549) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jDxHo-00068b-GG for qemu-devel@nongnu.org; Mon, 16 Mar 2020 17:28:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584394116; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HxC1eILjyyD4vXLg01tF8j7MmRukmacLFrXLAYZM6r4=; b=LopQyfnfFRMwh55F3fxmeLAgjmyAFye3GLLHkQLFUszkq0SzjPgCYPHnjqeuTndrJ6aeO+ czPtQ7Fu7ROj/aDth0I8CUclW8tAXKwycH4eJV1n2wjTcxoswCR2HNbQTOLrDYTThf8RvD mbLLvDhuQQSuRa7MNoVmmoYEmkrN3u8= 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-11-iAUgFsVKNAiTFCetGgpXDA-1; Mon, 16 Mar 2020 17:28:32 -0400 X-MC-Unique: iAUgFsVKNAiTFCetGgpXDA-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3E023149CF; Mon, 16 Mar 2020 21:28:31 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 46AD319C4F; Mon, 16 Mar 2020 21:28:30 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 31/61] softmmu/vl.c: Handle '-cpu help' and '-device help' before 'no default machine' Date: Mon, 16 Mar 2020 22:26:58 +0100 Message-Id: <1584394048-44994-32-git-send-email-pbonzini@redhat.com> In-Reply-To: <1584394048-44994-1-git-send-email-pbonzini@redhat.com> References: <1584394048-44994-1-git-send-email-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 216.205.24.74 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: Peter Maydell Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Peter Maydell Currently if you try to ask for the list of CPUs for a target architecture which does not specify a default machine type you just get an error: $ qemu-system-arm -cpu help qemu-system-arm: No machine specified, and there is no default Use -machine help to list supported machines Since the list of CPUs doesn't depend on the machine, this is unnecessarily unhelpful. "-device help" has a similar problem. Move the checks for "did the user ask for -cpu help or -device help" up so they precede the select_machine() call which checks that the user specified a valid machine type. Signed-off-by: Peter Maydell Signed-off-by: Paolo Bonzini --- softmmu/vl.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) -- 1.8.3.1 diff --git a/softmmu/vl.c b/softmmu/vl.c index ff2685d..6a28592 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -3789,6 +3789,22 @@ void qemu_init(int argc, char **argv, char **envp) */ loc_set_none(); + /* + * Check for -cpu help and -device help before we call select_machine(), + * which will return an error if the architecture has no default machine + * type and the user did not specify one, so that the user doesn't need + * to say '-cpu help -machine something'. + */ + if (cpu_option && is_help_option(cpu_option)) { + list_cpus(cpu_option); + exit(0); + } + + if (qemu_opts_foreach(qemu_find_opts("device"), + device_help_func, NULL, NULL)) { + exit(0); + } + user_register_global_props(); replay_configure(icount_opts); @@ -3877,11 +3893,6 @@ void qemu_init(int argc, char **argv, char **envp) qemu_set_hw_version(machine_class->hw_version); } - if (cpu_option && is_help_option(cpu_option)) { - list_cpus(cpu_option); - exit(0); - } - if (!trace_init_backends()) { exit(1); } @@ -4112,11 +4123,6 @@ void qemu_init(int argc, char **argv, char **envp) fsdev_init_func, NULL, &error_fatal); #endif - if (qemu_opts_foreach(qemu_find_opts("device"), - device_help_func, NULL, NULL)) { - exit(0); - } - /* * Note: we need to create block backends before * machine_set_property(), so machine properties can refer to