From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9C36C606A885 for ; Thu, 12 Nov 2026 13:35:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=OBOAihH9 Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xRUwz-0001Vk-QE; Thu, 12 Nov 2026 08:34:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1xRUuL-0006Hy-VV for qemu-devel@nongnu.org; Thu, 12 Nov 2026 08:32:12 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1xRUuK-0004el-EN for qemu-devel@nongnu.org; Thu, 12 Nov 2026 08:32:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1794490323; 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=LeG2q5nZDF6gOwJDdrcL3noJlJ1KLDJsg96sBYxTtHk=; b=OBOAihH9bYyZsO4qQCJXDtuEGychCznc7M+vYAB3fmyMPZPXfxgwZhA/cTzvl9I8lFrYy4 jNpuUlYZX93SKzitSGuRldPx6FxxcrUSXr4V0HslvZ11uNWQsQhqf0oe+yuI8j4t99UK89 HuN+YVM2GPK0db3FBHFy7j/jTE9ElWI= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-516-PE4dW_8DPI2jksbeO-aWHw-1; Thu, 12 Nov 2026 08:31:55 -0500 X-MC-Unique: PE4dW_8DPI2jksbeO-aWHw-1 X-Mimecast-MFC-AGG-ID: PE4dW_8DPI2jksbeO-aWHw_1794490314 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 364F0195609F; Thu, 12 Nov 2026 13:31:54 +0000 (UTC) Received: from berrange.csb (headnet04.pony-001.prod.iad2.dc.redhat.com [10.2.32.116]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id BE3A21956087; Thu, 12 Nov 2026 13:31:52 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier , Markus Armbruster , Yonggang Luo , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH 31/48] system: filter machine type list if a target is selected Date: Thu, 12 Nov 2026 13:30:37 +0000 Message-ID: <20261112133054.1977618-32-berrange@redhat.com> In-Reply-To: <20261112133054.1977618-1-berrange@redhat.com> References: <20261112133054.1977618-1-berrange@redhat.com> X-Archived-By: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 Received-SPF: pass client-ip=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 5 X-Spam_score: 0.5 X-Spam_bar: / X-Spam_report: (0.5 / 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, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_PASS, SPF_PASS autolearn=ham autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on aws-us-west-2-korg-listserv-alma10-1 If a specific target is selected then filter the machine type list, otherwise report all registered types and aliases. Signed-off-by: Daniel P. Berrangé --- system/vl.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/system/vl.c b/system/vl.c index e822a30c8df..0afcc18866d 100644 --- a/system/vl.c +++ b/system/vl.c @@ -144,6 +144,7 @@ #include "qemu/guest-random.h" #include "qemu/keyval.h" #include "memory-internal.h" +#include "qemu/target-info-def.h" #define MAX_VIRTIO_CONSOLES 1 @@ -1561,8 +1562,18 @@ static void machine_help_func(const QDict *qdict) printf("Supported machines are:\n"); for (el = machines; el; el = el->next) { - MachineClass *mc = el->data; - AliasedClass *alc = ALIASED_CLASS(mc); + ObjectClass *oc = el->data; + MachineClass *mc = MACHINE_CLASS(oc); + AliasedClass *alc = ALIASED_CLASS(oc); + /* + * If we've selected a specific target, then filter + * based on what is creatable, otherwise report + * everything that is registered + */ + if (target_info() && !target_specific_class_creatable(oc)) { + continue; + } + if (alc->aliases) { for (i = 0; alc->aliases[i] != NULL; i++) { g_autofree char *name = g_strndup( @@ -1580,7 +1591,7 @@ static void machine_help_func(const QDict *qdict) "%-25s %s%s%s%s\n", mc->name, mc->desc, mc->is_default ? " (default)" : "", mc->deprecation_reason ? " (deprecated)" : "", - object_class_is_secure(OBJECT_CLASS(mc)) ? " (secure)" : ""); + object_class_is_secure(oc) ? " (secure)" : ""); lines[nlines + 1] = NULL; nlines++; } -- 2.56.1