From nobody Tue Feb 10 05:41:13 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.218.53 as permitted sender) client-ip=209.85.218.53; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-f53.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.218.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1612536258; cv=none; d=zohomail.com; s=zohoarc; b=JJmtq203zOmBc1i24wGevCfT9SHtSUsS3oulmIKrvum4juiie9kIuMSa8yQr7F8OpF7HTk73ufv84pBfkgIbVL1jlD8i4oQh2+aJa74DeUQVMR1cbGF5g7+zALkH1Ab5nNLErSg6qJnrPsjrghgiracsCiapVAbm4o1gCveg1ic= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612536258; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Xkg/zu6AKq/Ee23oMpv0PA3XN//XoILVWe2S9GBryeE=; b=l1EVljE9WuYRQeAZxTA1ddQXbpdkfog4z2pD7+p8Yn388SEPiBtg3ggH0QMLoOOyYMa8fHBgPSvVtjK/ZyKGHROhCK79uJy5Ror3IWqtJ9SjtT9tomhdcvPzpaiTWWAdldwmyNDZ94f5rIKaI4BiXtPdCc9/4Ha8CS2Q9V4NtTw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.218.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) by mx.zohomail.com with SMTPS id 1612536258062842.1084380237986; Fri, 5 Feb 2021 06:44:18 -0800 (PST) Received: by mail-ej1-f53.google.com with SMTP id w1so12246000ejf.11 for ; Fri, 05 Feb 2021 06:44:17 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id u2sm3982732ejb.65.2021.02.05.06.44.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 06:44:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Xkg/zu6AKq/Ee23oMpv0PA3XN//XoILVWe2S9GBryeE=; b=DUzbQda1m4bnqAFLyLB6eIM8vYj/X4I0dEM5/Ae7NndZhZNO++wYpb/GsrkM9G2fdb ZdeE4zBDjXvdz2m8akGj5Yn4O3blQpeegw8s7cKFkwW2dxZCe1yEEF0ZHFmFNwE4WiTh FYRsGfxNqFIjlDK7mJH5yPmKclBvvtlGUbMpmjW7jJ95L0i50SUz6FPktQzwc5M2QUwW hRlosIUrdwj5wu8eRpSOBgh1/Zvhvt94LHhBxDhkbdaCRuPF9vE6OcJmZAocZpM0Q2Cb LQqFcH1zXbw2ipZoLIq+thGyDXa/6A2DHUSbkSQC73XfLGutXgdH6fl1jwQ0QMczt3Ow LQhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Xkg/zu6AKq/Ee23oMpv0PA3XN//XoILVWe2S9GBryeE=; b=hr53QLAuI/SOBjYDohkLmc1zxxz5BYax7zuCgaTNCR8EVuP1ONL42C5Ft1/oGpZZII 9u2mLlCm4zSMN6OncBea4c9Rb5LCCx1AoCtdrqCIaZpNlRuCQkbX4VrIv4ilY5eVdZq+ DjoQW4KAp6F+dZrssITj02etJg4zzvu66VPy6Dk64iv1eiTMyaYw+iC5MNajK3Q2lVKY JEv1EoTNhKdoCN2W3zaa+3bvQ6ksTigwuWXRCzCvHmGZQf4N9NSazSZ7PXyXgJ3t+OIT rn7swJ9Bdz0siQHA+HJsREGIhLnavTirfztmv5sYe7+eqvwm9tNSC+GAqTU0dvIANBYg MMtw== X-Gm-Message-State: AOAM532TwmR2N7B+y/lfp+QhvPuLRQbcZFTWxRpattphmF4PT64sFEYZ lE5dxeAS7FNpaQNX+MthFjV0KLG1weE= X-Google-Smtp-Source: ABdhPJyPOvLRzMbqEXMiNye6S+y3gEcu3PM5eYVrEVRsGsPslWOGaP7SGofKpbBnhs2bGt5IvYs4LQ== X-Received: by 2002:a17:907:3f13:: with SMTP id hq19mr4391142ejc.142.1612536256133; Fri, 05 Feb 2021 06:44:16 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , qemu-arm@nongnu.org, Peter Maydell , Thomas Huth , Andrew Jones , qemu-block@nongnu.org, Laurent Vivier , John Snow , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 5/9] hw/arm/virt: Improve CPU name in help message Date: Fri, 5 Feb 2021 15:43:41 +0100 Message-Id: <20210205144345.2068758-6-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210205144345.2068758-1-f4bug@amsat.org> References: <20210205144345.2068758-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) When selecting an incorrect CPU, there is a mismatch between the CPU name provided and the one displayed (which is some QEMU internal name): $ qemu-system-aarch64 -M virt -cpu cortex-a8 qemu-system-aarch64: mach-virt: CPU type cortex-a8-arm-cpu not supported Strip the suffix to display the correct CPU name: $ qemu-system-aarch64 -M virt -cpu cortex-a8 qemu-system-aarch64: mach-virt: CPU type cortex-a8-arm Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Andrew Jones --- hw/arm/virt.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 399da734548..7802d3a66e8 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1829,7 +1829,10 @@ static void machvirt_init(MachineState *machine) finalize_gic_version(vms); =20 if (!cpu_type_valid(machine->cpu_type)) { - error_report("mach-virt: CPU type %s not supported", machine->cpu_= type); + int len =3D strlen(machine->cpu_type) - strlen(ARM_CPU_TYPE_SUFFIX= ); + + error_report("mach-virt: CPU type %.*s not supported", + len, machine->cpu_type); exit(1); } =20 --=20 2.26.2