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 EA778606A32A for ; Thu, 12 Nov 2026 13:36:51 +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=D82cNKgC Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xRUxs-0003Lr-32; Thu, 12 Nov 2026 08:35:44 -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 1xRUuX-0006Yn-MD for qemu-devel@nongnu.org; Thu, 12 Nov 2026 08:32:20 -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 1xRUuW-0005UQ-51 for qemu-devel@nongnu.org; Thu, 12 Nov 2026 08:32:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1794490335; 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=RY033q8XnBgYbH8ljmHV2d2lfppy6oZ/3Tecl6HdVmY=; b=D82cNKgCnJM6wJkewbvddAVzHDG+9mRKWQb4V4x6UkgB1n8PAzOLG8W9jnbc42Bt6l3aha qrGv9fy0A6rqqsbIWRLcEMRBoOIsJI6IeCF45ASLC+HO0kSUbRbXsoflmaCgJ8Nhw4xNVi oONtrH5pYUU9Za9wDhM1GoygfAT3kBU= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-176-v89rSf11MrynwaSfFkzfcw-1; Thu, 12 Nov 2026 08:32:12 -0500 X-MC-Unique: v89rSf11MrynwaSfFkzfcw-1 X-Mimecast-MFC-AGG-ID: v89rSf11MrynwaSfFkzfcw_1794490331 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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1E102180060C; Thu, 12 Nov 2026 13:32:11 +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 910651956087; Thu, 12 Nov 2026 13:32:09 +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 40/48] hw/riscv: declare riscv machine target Date: Thu, 12 Nov 2026 13:30:46 +0000 Message-ID: <20261112133054.1977618-41-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: -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, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-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.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 This prevents creation of riscv machines unless the current selected target is riscv and enables removal of the 'is_available' callback. Signed-off-by: Daniel P. Berrangé --- hw/riscv/virt.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index 2901f67d796..178b47f4c15 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -62,6 +62,7 @@ #include "hw/virtio/virtio-iommu.h" #include "hw/uefi/var-service-api.h" #include "qom/object_interfaces.h" +#include "qemu/base-arch-defs.h" #include "aia.h" @@ -1125,6 +1126,7 @@ static void virt_machine_class_init(ObjectClass *oc, const void *data) MachineClass *mc = MACHINE_CLASS(oc); HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(oc); AliasedClass *alc = ALIASED_CLASS(oc); + TargetSpecificClass *tsc = TARGET_SPECIFIC_CLASS(oc); static const char *const aliases[] = { MACHINE_TYPE_NAME("virt"), NULL, }; @@ -1147,6 +1149,8 @@ static void virt_machine_class_init(ObjectClass *oc, const void *data) mc->get_hotplug_handler = virt_machine_get_hotplug_handler; alc->aliases = aliases; + tsc->targets = QEMU_ARCH_BIT(SYS_EMU_TARGET_RISCV32) | + QEMU_ARCH_BIT(SYS_EMU_TARGET_RISCV64); hc->plug = virt_machine_device_plug_cb; @@ -1202,7 +1206,6 @@ static const TypeInfo virt_machine_typeinfo = { .instance_init = virt_machine_instance_init, .instance_finalize = virt_machine_instance_finalize, .instance_size = sizeof(RISCVVirtState), - .is_available = target_base_riscv, .interfaces = (const InterfaceInfo[]) { { TYPE_HOTPLUG_HANDLER }, { } -- 2.56.1