From nobody Sat Sep 26 19:16:11 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1790410774; cv=none; d=zohomail.com; s=zohoarc; b=QRkLaWm5aj6kFXu5KckQdSySPP3bitPHg+YHXErNt0xnuHNbuiKLMJHTxZUISefuuIojCIFb3iZcRVxPO+YVkfkIt+ySw0SEyNzvXIlexGz36LPBtFKgXV6ZacAIVFBmmXLJj/zUz2b1lAw3nuPXlc+X5VfaPW5FIqseVTy9SlE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790410774; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=exZwZi6kUGYGpdAf583ubd0KYwWAqRs91Lhg3wPcRlQ=; b=VVQ0d48yoR6Sq/2qGctU6sU3KG4LjcWMVWyvXYLcwAuIf+awve3r4Nz/1/TaG3SjNzjyu/F07vTT64+/7HDlsfkaToApRR2F7AZVkqtlYdCJXX315dQwzvBy05+pxvz+P0RvLkmNzHX40ZhnS/phtvc4adRFLRaZpAU7l53OPJw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1790410774898959.8861846133102; Sat, 26 Sep 2026 01:19:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xANZt-00084N-Ne; Sat, 26 Sep 2026 04:16:13 -0400 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 1xANZs-00083b-1H for qemu-devel@nongnu.org; Sat, 26 Sep 2026 04:16:12 -0400 Received: from mail-dy2-x0e.google.com ([2607:f8b0:4864:36::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1xANZp-0006mq-2D for qemu-devel@nongnu.org; Sat, 26 Sep 2026 04:16:11 -0400 Received: by mail-dy2-x0e.google.com with SMTP id 5a478bee46e88-34182b58c7eso1241553eec.0 for ; Sat, 26 Sep 2026 01:16:08 -0700 (PDT) Received: from WIN-BH9M8FJACR9 ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id 5a478bee46e88-34144f4eb9esm11970568eec.19.2026.09.26.01.16.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Sep 2026 01:16:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790410567; x=1791015367; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=exZwZi6kUGYGpdAf583ubd0KYwWAqRs91Lhg3wPcRlQ=; b=K61czQywXx8jWhWILNe+WgP2lub2PudojG/E7eyKCN3p5qFHHcViEerSLUD5BtB/lL c+YwFg4PJH5+hiE43WPR2/97bPSj9YIgAkIycCFd87CGAMnRLCosHNn6XdhnvDxuH0aN CfUKDenajkA3QoLAPa7nhALxIxudS8XdvAferE7tSXWEe+vKWUKpYa/0cv7TJT5kpck9 GeyRLuGz4UiiE+mo4l0VNUUyho9cgg+naRWUkt/51rFQBsEdTzAnM8XrpfxRUaTnE7Zv J2HPJf9Yv3Yu5m+DOfdBDQF4I1d/cwk1nFDyMOKa8ULPtcNmB0SAuuNNbJ5s8PzJ7cuB F7nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790410567; x=1791015367; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=exZwZi6kUGYGpdAf583ubd0KYwWAqRs91Lhg3wPcRlQ=; b=F9V6VPdK/2Qd3Gbiuyu347XP2kS6Zh9wUWe2mg8ZDuHzDCrJ4bWtlzzwxP8cscUYQv v11gPMRPIwL17U5qGX/KxdSIARWkjQJ99peIo/wo9NzO2tklMv1yNz8Rt0wqQOqqcLDl irlZdWA59uhQ9GzfaaTTsytqOTz8UX+YFz4FZFWXuUxL0N4y2OpcjB9qcBhwPf7aiUva LVNfFXJPJJMJF+7jmazP3O7K7t0CIgbxhnZX/+TnF+Bj5ELgolCtp2Wji/xCI1ph+wBH Yrc/h3Lmm5R32IAddN0dTyGs10End1LesjaNn5hhOE/SCoSQZzaT/zK3wKBHJPNqpqM3 Gj2A== X-Gm-Message-State: AFuF++mTmFsiVmXbporYxXXocQgvBOMUnpTYZmGgVyDAJ9WqfJb26n87 SDGauNAZKyxz1iPI4Yi04m0J1UFWHqZV1RcSRVwGqMjDMrefRrDEp5GVVyryQKtl X-Gm-Gg: AYBFou3kt37izIgOysoUEJBHGFnpXmq7hzHaWNo7B/Sd36xJaCDJIbbzFergKY39nFi qCIsuB3pjh0M5TR747rNAg2YhrRQf+emu14X6MPDyTJxLzvHFQLVDn3UDXOuKLWlLPqVp5wgIbO hI8/ZykKU49lYbdhDgK8mgtbZWNaDM3wrvmFwpMth/OhUNq8CrmwrGEJUsjKQfQdAgbdLh+n9IO Hcy3Wn76YmG2PY6TxYqIu+j2Wb5Hfc+BB9nnZttaIKbkp0X97S/XnbC2QJrvw4pj296rk/FhUp9 nfshOiw++HHSBS4RM9CCBCtRhsUWZzuwRRxxp1O2Vd/ZgcGC1fYlgkSagEmoWhhT7L0DBXQlc18 Ewg9wGKsizUSEEOSTwvpei7t4fDSynQmP0UN3C7azO23j8GIVic43i1qnZFpKoA6WNiYjGwkVUs qdptIaFk5RM6scwSyNnAf7ln3k2DL4IMwyOFOIKBux4+S2mmJe98awN+IiFFFZrrobxGtjObBxa oqlALtPRAoPvuWqm9REqwnyslMPoovl X-Received: by 2002:a05:7300:4728:b0:33c:e82:70c9 with SMTP id 5a478bee46e88-34272c4f38amr1974119eec.32.1790410566579; Sat, 26 Sep 2026 01:16:06 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Cc: Chao Liu , Eric Blake , qemu-arm@nongnu.org, Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Markus Armbruster , Alistair Francis , Brian Cain , Stafford Horne , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Peter Maydell , Jiaxun Yang , Fabiano Rosas , Daniel Henrique Barboza , Pierrick Bouvier , qemu-riscv@nongnu.org, Laurent Vivier , Max Filippov , Song Gao <17746591750@163.com>, Philippe Mathieu-Daude , Palmer Dabbelt , Laurent Vivier , Weiwei Li , Zhao Liu Subject: [PATCH v3 01/10] machine: allow -M name to differ from QOM type Date: Sat, 26 Sep 2026 16:15:41 +0800 Message-ID: <20260926081551.29-2-luoyonggang@gmail.com> X-Mailer: git-send-email 2.52.0.windows.1 In-Reply-To: <20260926081551.29-1-luoyonggang@gmail.com> References: <20260926081551.29-1-luoyonggang@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:36::e; envelope-from=luoyonggang@gmail.com; helo=mail-dy2-x0e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=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.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1790410777124158500 - Add machine_class_set_name() so boards can keep a stable -M name when the QOM type is uniquified. machine_class_base_init still defaults the name to the QOM type without -machine. - Document that MachineClass::name is the -M name, not the QOM type. - Sort -M help by MachineClass::name so order matches the printed names when QOM types are prefixed (arm-virt-11.1-machine vs virt-11.1). Signed-off-by: Yonggang Luo Reviewed-by: Daniel P. Berrang=C3=A9 --- hw/core/machine.c | 6 ++++++ include/hw/core/boards.h | 12 +++++++++++- system/vl.c | 8 +++----- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/hw/core/machine.c b/hw/core/machine.c index 92f7be52a13..6b933f2302d 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -1215,6 +1215,12 @@ static void machine_class_init(ObjectClass *oc, cons= t void *data) "Memory size configuration"); } =20 +void machine_class_set_name(MachineClass *mc, const char *name) +{ + g_free(mc->name); + mc->name =3D g_strdup(name); +} + static void machine_class_base_init(ObjectClass *oc, const void *data) { MachineClass *mc =3D MACHINE_CLASS(oc); diff --git a/include/hw/core/boards.h b/include/hw/core/boards.h index 3b86724cf00..851140ad052 100644 --- a/include/hw/core/boards.h +++ b/include/hw/core/boards.h @@ -36,6 +36,16 @@ const char *machine_default_cpu_type(const MachineState = *ms); * @mc: Machine class */ const char *machine_class_default_cpu_type(MachineClass *mc); +/** + * machine_class_set_name: Set the -M name when it differs from the QOM ty= pe + * @mc: Machine class + * @name: Name used by -M lookup, help, and migration + * + * machine_class_base_init sets MachineClass::name from the QOM type with + * the -machine suffix removed. Call this from board class_init when the + * CLI name must stay stable after the QOM type is uniquified. + */ +void machine_class_set_name(MachineClass *mc, const char *name); =20 void machine_add_audiodev_property(MachineClass *mc); void machine_run_board_init(MachineState *machine, const char *mem_path, E= rror **errp); @@ -269,7 +279,7 @@ struct MachineClass { /*< public >*/ =20 const char *family; /* NULL iff @name identifies a standalone machtype= */ - char *name; + char *name; /* -M name; default is QOM type without -machine */ const char *alias; const char *desc; const char *deprecation_reason; diff --git a/system/vl.c b/system/vl.c index 468a9fc247a..0d52c5d0a46 100644 --- a/system/vl.c +++ b/system/vl.c @@ -1538,10 +1538,9 @@ static gint machine_class_cmp(gconstpointer a, gcons= tpointer b, gpointer d) if (mc1->family =3D=3D NULL) { if (mc2->family =3D=3D NULL) { /* Compare standalone machine types against each other; they s= ort - * in increasing order. + * in increasing order by the name shown in -M help. */ - return strcmp(object_class_get_name(OBJECT_CLASS(mc1)), - object_class_get_name(OBJECT_CLASS(mc2))); + return strcmp(mc1->name, mc2->name); } =20 /* Standalone machine types sort after families. */ @@ -1560,8 +1559,7 @@ static gint machine_class_cmp(gconstpointer a, gconst= pointer b, gpointer d) } =20 /* Within the same family, machine types sort in decreasing order. */ - return strcmp(object_class_get_name(OBJECT_CLASS(mc2)), - object_class_get_name(OBJECT_CLASS(mc1))); + return strcmp(mc2->name, mc1->name); } =20 static void machine_help_func(const QDict *qdict) --=20 2.52.0.windows.1 From nobody Sat Sep 26 19:16:11 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1790410622; cv=none; d=zohomail.com; s=zohoarc; b=IXzABNMJXlAsSLM1th3r4Xdhs5Aq45AJgmGyKXL5TnmZQ10RSVvKgu+3U0EZEzDjTt+f2hpgwrHGxApixI2P1nt2q9THUh8e8Oyh1QQn9HPpBGtw1Jku7/bLh3oHyduDU2tZQMZmXT3UzwzeGUGHsPPLYPloKmbTYvpNetsjnC8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790410622; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=2gVclOB8hui0Zzz9xz3lHkA1krFP7WoPwFwVaOSKavs=; b=FWyyKpy4uZ6k9I3xqJCTyxDmaXMLxTtlrv3Bh/hs1LFSokw0f5aAs7OYtD7Wvlq6aOchFGWfP9DgvNsimKEC9stBV990XDSUJiS1Em+ZP/nlcCvC+LQu8IJcC3Qj3FbRoz/HcQHdKwwlJGpm0hSNYbe6nla3jZ+NPMjzd8fdP28= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1790410622882592.9657657686776; Sat, 26 Sep 2026 01:17:02 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xANZz-00085m-1V; Sat, 26 Sep 2026 04:16:19 -0400 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 1xANZw-000853-Mu for qemu-devel@nongnu.org; Sat, 26 Sep 2026 04:16:16 -0400 Received: from mail-dy2-x0e.google.com ([2607:f8b0:4864:36::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1xANZt-0006nN-S5 for qemu-devel@nongnu.org; Sat, 26 Sep 2026 04:16:16 -0400 Received: by mail-dy2-x0e.google.com with SMTP id 5a478bee46e88-3429bca3880so956999eec.3 for ; Sat, 26 Sep 2026 01:16:13 -0700 (PDT) Received: from WIN-BH9M8FJACR9 ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id 5a478bee46e88-34144f4eb9esm11970568eec.19.2026.09.26.01.16.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Sep 2026 01:16:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790410572; x=1791015372; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=2gVclOB8hui0Zzz9xz3lHkA1krFP7WoPwFwVaOSKavs=; b=LR576KRK7Lj/KSvjqObbPr5x5AIkVoFCR3wesNBYR1bg0tnqIrDvhwyY/dSyx11itG sjuiq8JcZkooUyk5pxwg7dkx3dorwrr1VlG/3AUixpTEUqj+XjssTBEkiTBWUdXIMc5u FxYP1z6xqIqZaIbYEwdN8cQK3BYmHtgJiRFOekQEIEo+lgAlUWfTXYMaWhZKNxTwFEZr w4QZDGmAVF1QCKfyucQ/onMMipgUrTvxPXhBg76RKOPcRhGTOTq4XZjJyxiP/rQbvt/g 5FelccWU4uXbB21MVQsEtM9mu2wZv+mq+YquqIfef1m0hfEX0musXQqQgb8E1zV683/v xPZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790410572; x=1791015372; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=2gVclOB8hui0Zzz9xz3lHkA1krFP7WoPwFwVaOSKavs=; b=0fNm5gwY+6GmQvYFd4T8aa9v2znv4lA6lpSBjf+4x7dBpvlDJeulnpRhB5tv8n81j0 P/ZmDKHFL7kGE8y/+OWW71dQbFlqb6r7FxGsZv5ehj3an4ZBYZnbL1knN+ksZOntTTgy eUoBKofpYNDtvyd5zr8gmujjiDOb6IjAP0FkQKvwWfTWj5JcMOHeKqX10qV2gJpmRGch NMC+bKyEVRyCndTxyPG76MyMq5VcSQoe/SEONO0r7JDeiFLBCsYf7NomI7r1pXMGmHFA +xa+HsCwla2Xd2qrty6CzzbYEcBDmdhPOlZMmFjV4cVcvU6KY00WJwJ7i4wu5+Z5zJ4F rrEg== X-Gm-Message-State: AFuF++kNjVf6ltnAJluPADI6qeFlnkyM83ltTYtVgORaSKqE+pvH6CVK cubQj2UJC7icoIVtaPbWgaSGOD7sIXh6Z8hA5FvQgzYxWYmh7g/8EPcxlv0SmvPL X-Gm-Gg: AYBFou2bHirAhnB5BLzZcQ2DCQwlPoFXkX7mSgLyXZ5ES7PxoieVI5pMo5hoJnV9YZt DaQotF/FWno+qjsLjtUFpxMSspdlAkpn0MLx0ZHpXKnjUkFoT5VYtBBhRRa+IUZS06kRhfQTHgI X3p8Y3U6t2T3M16mtenBiv2/N9aLFfXbz5TWPBhpnwK0EKO67R7mfhjQvgCwJIWeD/gxTSLIYcf gAw93eV4NGMZ4fkFHlVM81KAnxBnlbyUlcrCeTSTbEwAIW1/JywoXvm1JVkKH8QXtrbeySdfdfR YKy6Di1SLEhJx5dHoLx8uJv1XtaJ6nq5yd/XY8IfW8LBNvuvsPqtaWqo6nngC5gpr1097Ctf/Wn HCX3cmmJi2m7L4npYC+hv04t8ZgUwyC8L+/HPb5ZRT/RQV8bEBxxYy00eWOSjJsYnob5K0/TSxM SkOhAH/lN8kLmAO74JZ7EnMiUYzENTrsGgH9zMVwBUuJk+wmdT40E12Y0QJIIwrWfVHe/Un6Zvg oWYAmHmNSugCLKojoMGwTt4Pal2/Og= X-Received: by 2002:a05:7301:4d0b:b0:331:89d6:80e7 with SMTP id 5a478bee46e88-342703c0860mr2555838eec.13.1790410572385; Sat, 26 Sep 2026 01:16:12 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Cc: Chao Liu , Eric Blake , qemu-arm@nongnu.org, Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Markus Armbruster , Alistair Francis , Brian Cain , Stafford Horne , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Peter Maydell , Jiaxun Yang , Fabiano Rosas , Daniel Henrique Barboza , Pierrick Bouvier , qemu-riscv@nongnu.org, Laurent Vivier , Max Filippov , Song Gao <17746591750@163.com>, Philippe Mathieu-Daude , Palmer Dabbelt , Laurent Vivier , Weiwei Li , Zhao Liu Subject: [PATCH v3 02/10] hw/riscv/virt: use unique QOM name Date: Sat, 26 Sep 2026 16:15:42 +0800 Message-ID: <20260926081551.29-3-luoyonggang@gmail.com> X-Mailer: git-send-email 2.52.0.windows.1 In-Reply-To: <20260926081551.29-1-luoyonggang@gmail.com> References: <20260926081551.29-1-luoyonggang@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:36::e; envelope-from=luoyonggang@gmail.com; helo=mail-dy2-x0e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=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.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1790410625388158500 Use TYPE_RISCV_VIRT_MACHINE so the RISC-V virt QOM type does not collide with ARM virt in a combined qemu-system binary. Keep the -M / help / migration name as virt via machine_class_set_name(). Signed-off-by: Yonggang Luo Reviewed-by: Marc-Andr=C3=A9 Lureau --- hw/riscv/virt.c | 3 ++- include/hw/riscv/virt.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index d4b501802f6..b29182cb39b 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -1134,6 +1134,7 @@ static void virt_machine_class_init(ObjectClass *oc, = const void *data) HotplugHandlerClass *hc =3D HOTPLUG_HANDLER_CLASS(oc); =20 mc->desc =3D "RISC-V VirtIO board"; + machine_class_set_name(mc, "virt"); mc->init =3D virt_machine_init; mc->max_cpus =3D VIRT_CPUS_MAX; mc->default_cpu_type =3D TYPE_RISCV_CPU_BASE; @@ -1197,7 +1198,7 @@ static void virt_machine_class_init(ObjectClass *oc, = const void *data) } =20 static const TypeInfo virt_machine_typeinfo =3D { - .name =3D MACHINE_TYPE_NAME("virt"), + .name =3D TYPE_RISCV_VIRT_MACHINE, .parent =3D TYPE_MACHINE, .class_init =3D virt_machine_class_init, .instance_init =3D virt_machine_instance_init, diff --git a/include/hw/riscv/virt.h b/include/hw/riscv/virt.h index e516898f9ad..969aa5866ee 100644 --- a/include/hw/riscv/virt.h +++ b/include/hw/riscv/virt.h @@ -30,7 +30,7 @@ #define VIRT_SOCKETS_MAX_BITS 2 #define VIRT_SOCKETS_MAX (1 << VIRT_SOCKETS_MAX_BITS) =20 -#define TYPE_RISCV_VIRT_MACHINE MACHINE_TYPE_NAME("virt") +#define TYPE_RISCV_VIRT_MACHINE MACHINE_TYPE_NAME("riscv-virt") typedef struct RISCVVirtState RISCVVirtState; DECLARE_INSTANCE_CHECKER(RISCVVirtState, RISCV_VIRT_MACHINE, TYPE_RISCV_VIRT_MACHINE) --=20 2.52.0.windows.1 From nobody Sat Sep 26 19:16:11 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1790410771; cv=none; d=zohomail.com; s=zohoarc; b=m7leaR+HdmiXydO5yDZWD0pt5LwubxPcAhZ8f2Fu2j8tb4VT6XlMhemGAvWemwJmKhXpHGSYZqyJpL3bAVAuBuVIwg9lrzJqRsIVIAHzceyy0DV2FZLCSItvc5AsAxSrFVHx3TVj+TRY3yshjo9SOXoeSSReczfwYkAUH5M+ccw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790410771; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=HLR3DcDRFMXee/h9DcZWZdigMHQTObO1dl0aI6gcriM=; b=XNoqMCptAXCEOZSbelYfEZNv/CqIIL5pzVRSxCHOosnxgoA3wzsX6ooq7EFFyEnoW0r8FwsRnP8k6plcq9S+SYL5dSlSrIND7XYSthGkRt330Q4eGV9Xjn0UgcoE/BC1gCyTcW4Vj89FjmZKxHEpAXh+td4SVV8DvnyB5jIg0NA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1790410771887827.1642712621383; Sat, 26 Sep 2026 01:19:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xANa3-00087C-TP; Sat, 26 Sep 2026 04:16:23 -0400 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 1xANa1-00086W-Pq for qemu-devel@nongnu.org; Sat, 26 Sep 2026 04:16:22 -0400 Received: from mail-dy2-x0e.google.com ([2607:f8b0:4864:36::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1xANa0-0006np-7E for qemu-devel@nongnu.org; Sat, 26 Sep 2026 04:16:21 -0400 Received: by mail-dy2-x0e.google.com with SMTP id 5a478bee46e88-341d5303884so871391eec.3 for ; Sat, 26 Sep 2026 01:16:19 -0700 (PDT) Received: from WIN-BH9M8FJACR9 ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id 5a478bee46e88-34144f4eb9esm11970568eec.19.2026.09.26.01.16.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Sep 2026 01:16:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790410579; x=1791015379; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=HLR3DcDRFMXee/h9DcZWZdigMHQTObO1dl0aI6gcriM=; b=Vg+k/ASQD6JOkPO9QXAm5J9Ha1gLZFJpC/LEj++NoahVWrDImATqRYyqLEjbyXZwQ8 3LywuCA7RwtG9b5KVNcSo9+XTvXUdikzBs34HDmMQHzbcH/gaAb5C8Kx0F4I/sTb46OF GUEmieXCiPw4MxpALpFSGuNhyqVhVLPfkG4mpqdhOPTo09ET7oQxXBdC0633vwfhv0BQ eALEQjQMBah3P8+GDMg1aek54Pa9OIUTHoWRhqEXNPZ12luDB+PDv9Li8g0SGZZFbeKn LLmWWDUtBn+NmwFqGBOPfFBS3Y3Nsu1F6Pcjx4I8iSHHtpBIxTIy3zEvUclt+gED0AyC mQCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790410579; x=1791015379; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=HLR3DcDRFMXee/h9DcZWZdigMHQTObO1dl0aI6gcriM=; b=QnI/2zITvzhQ3LWLBlPACGPoIcMn9+YDXW6rpP8+V5ZTMtoh3qZlc+vLOComcHMzos GRztRF/aUVHokvuKp9w4Dz/0E/7/l7+9QqKkr589BDOe1hQM6WA6P7fHcj8ekXTGuJFk T/0jeubkjN6aSuKTSk+VATJmFriSxPK9r6ncb4USbgfHyfHREyYckeu4LNVaEeUx2c0R sQX/9oTvzyfNIXyWhsJKuAcl3OHJ29lgQpptg44TjIvlJKhwkTUo2zo6Yyvit6aET+oJ QDvuoGASuiI0GXdwQDIapVHAE/HvN9ZH9ucnWl8DVm6ZOEUomXEuJFAlwfV6WxN2QyoN OMqg== X-Gm-Message-State: AFuF++lHGngtkUYsPH0TQ/9I0AOsWJSFJtbHH1UDcGryliWilri/ia9G iHA992gUgg4Ovx80dtFrJRO/fJVrCtSD8/INxIDpeh82uOKxHPk/DO/t5dYcFswA X-Gm-Gg: AYBFou1jsaVyQrX86H4T8YG5edb1C83EpkBH+f2QfQ5U2r2SraarVi5f8XwlPphQlKF h3VoB7+SUIMdZNWMJocnImRTe4X/Z0s06Tlb0n4Mf7CtoXBoZoFQblTFRqCabMvj5humoXt1ROz OT9TZ5W1uhUtA5HWBjKqwsCJ95Ub86JniR6SOd6JRlxsVni5CELzkgj9hokPYFHr1Wrd4NGIiEH F1AGbptymzO4XGVx6ibDgclDC4IZAjzlcntJto3Atb6Wng/urPotCsLJIRanKDJNF7wLslzsN69 /0hgDUVJnzN9Y3Cn3lbXxo5saUDAx1FBQZE0YtnSgz22DBNmisPwb3AbQOT9CHxgYvqjCnkYoZp 0LnuARabYificVqPN267TBOW1tZjXVj9weHK2nsU9tSWqQ3hyG6EI3TEP/1+2cnfvBjRQim7Iw9 lWqUosQ+547vvogZ04uwrfUMGOe2A8dk+6n3M6EW6SFF4KUOgV8/UpllBHN1lwwP2WFhMfpRS/h klJsnCqpi5Hfw0bq5/AcAoQsYjt2kM= X-Received: by 2002:a05:693c:8816:20b0:343:6622:ee15 with SMTP id 5a478bee46e88-3436622efc7mr492061eec.11.1790410578058; Sat, 26 Sep 2026 01:16:18 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Cc: Chao Liu , Eric Blake , qemu-arm@nongnu.org, Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Markus Armbruster , Alistair Francis , Brian Cain , Stafford Horne , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Peter Maydell , Jiaxun Yang , Fabiano Rosas , Daniel Henrique Barboza , Pierrick Bouvier , qemu-riscv@nongnu.org, Laurent Vivier , Max Filippov , Song Gao <17746591750@163.com>, Philippe Mathieu-Daude , Palmer Dabbelt , Laurent Vivier , Weiwei Li , Zhao Liu Subject: [PATCH v3 03/10] hw/arm/virt: use unique QOM name Date: Sat, 26 Sep 2026 16:15:43 +0800 Message-ID: <20260926081551.29-4-luoyonggang@gmail.com> X-Mailer: git-send-email 2.52.0.windows.1 In-Reply-To: <20260926081551.29-1-luoyonggang@gmail.com> References: <20260926081551.29-1-luoyonggang@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:36::e; envelope-from=luoyonggang@gmail.com; helo=mail-dy2-x0e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, SPF_HELO_NONE=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-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1790410773085158500 Set TYPE_VIRT_MACHINE to MACHINE_TYPE_NAME("arm-virt") so ARM virt no longer collides with other virt-machine types in one process. Keep the -M / help / migration name as virt-* via machine_class_set_name(). Signed-off-by: Yonggang Luo Reviewed-by: Marc-Andr=C3=A9 Lureau --- hw/arm/virt.c | 3 ++- include/hw/arm/virt.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 3eecf094bcc..c8ffa1ceaf4 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -123,13 +123,14 @@ static void arm_virt_compat_default_set(MachineClass = *mc) MACHINE_VER_SYM(options, virt, __VA_ARGS__)(mc); \ mc->desc =3D "QEMU " MACHINE_VER_STR(__VA_ARGS__) " ARM Virtual Ma= chine"; \ MACHINE_VER_DEPRECATION(__VA_ARGS__); \ + machine_class_set_name(mc, "virt-" MACHINE_VER_STR(__VA_ARGS__)); \ if (latest) { \ mc->alias =3D "virt"; \ } \ } \ static const TypeInfo MACHINE_VER_SYM(info, virt, __VA_ARGS__) =3D \ { \ - .name =3D MACHINE_VER_TYPE_NAME("virt", __VA_ARGS__), \ + .name =3D MACHINE_VER_TYPE_NAME("arm-virt", __VA_ARGS__), \ .parent =3D TYPE_VIRT_MACHINE, \ .class_init =3D MACHINE_VER_SYM(class_init, virt, __VA_ARGS__), \ }; \ diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index 22e66d1a113..383ee320948 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -215,7 +215,7 @@ struct VirtMachineState { =20 #define VIRT_ECAM_ID(high) (high ? VIRT_HIGH_PCIE_ECAM : VIRT_PCIE_ECAM) =20 -#define TYPE_VIRT_MACHINE MACHINE_TYPE_NAME("virt") +#define TYPE_VIRT_MACHINE MACHINE_TYPE_NAME("arm-virt") OBJECT_DECLARE_TYPE(VirtMachineState, VirtMachineClass, VIRT_MACHINE) =20 void virt_acpi_setup(VirtMachineState *vms); --=20 2.52.0.windows.1 From nobody Sat Sep 26 19:16:11 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1790410677; cv=none; d=zohomail.com; s=zohoarc; b=TU8tHEnSFvHCKWv6PDBLm5aHwP5gUG0YTGjjm2hA8nbf4M/DsA5E8vDjbE+PCAR7Wh16/x1kZtEgCmqtNHYHbX/2be5o8W7ZGmKKL+Tm9pgQfBF//TBm6e4J8wTSGYvOS8M4ieFeWkhCbj+wnK+WHTuBm46UeUVD9DCW79I8Ioo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790410677; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=dGcjkcxYt8eZEjWK6mpDvnDtPiferHjEtlr90RuU0eI=; b=AQYeXDWHx4SfhZE8c2TCLFiqxgW7uQIc+GX4pJ75crBVGj4JVIW8RmOeqRP5CWHbwCumaVgXlUD60qmlebs1Ro3t+GW6IP8uASTaUzgiekhE/1h47Zwlj9yGzlUDgE53I33DO15JoZNicI1hBudBMvviC9BJRm0ETcS0YTxANUM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1790410677634543.3222162768743; Sat, 26 Sep 2026 01:17:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xANa8-0008Db-WE; Sat, 26 Sep 2026 04:16:29 -0400 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 1xANa6-0008C1-Qj for qemu-devel@nongnu.org; Sat, 26 Sep 2026 04:16:26 -0400 Received: from mail-dy2-x0f.google.com ([2607:f8b0:4864:36::f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1xANa5-0006oR-A6 for qemu-devel@nongnu.org; Sat, 26 Sep 2026 04:16:26 -0400 Received: by mail-dy2-x0f.google.com with SMTP id 5a478bee46e88-33e46a156f4so871431eec.0 for ; Sat, 26 Sep 2026 01:16:24 -0700 (PDT) Received: from WIN-BH9M8FJACR9 ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id 5a478bee46e88-34144f4eb9esm11970568eec.19.2026.09.26.01.16.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Sep 2026 01:16:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790410584; x=1791015384; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=dGcjkcxYt8eZEjWK6mpDvnDtPiferHjEtlr90RuU0eI=; b=GhY45SZTYPb0XGwu4MkKSEpJ6U16TBOjaJQeZx9N64CL20BoEpJ2x7330p4pP1SuyR kRFve7hnbZoW14xM8Ex3iVc/Cg22invFc1xgvrS5LAixlWsJmHlu0SqUSyZVRIRWoHHC gvAigC1Q4OnRbMHLH10I3pJJgSl/Old7O2yDZw5rnbNfadTndOy5TUw0rGjx6pkye3HQ m8mtpl3P4GXLSPcJ+A8UyLjUBwYC3M0Rd3XeoPxAzIyXkSaGvhg8DLtfEUI2mudpv3ny Pi/2TjdLYZHv3Ur7h4RKjUVNy1EIpqOKrf7d8FHknKbbUop/bvDEopM0YgjkJrE9AoqD 5OrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790410584; x=1791015384; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=dGcjkcxYt8eZEjWK6mpDvnDtPiferHjEtlr90RuU0eI=; b=w67bh5/+A3Y/Fy5q72MigBmunhdz4wSXOM3+4YYv9/i3X/pPRN30hFkYT/NwhsRn/T xPB1y59VqFLOKVp0a/ekeXoQLT+elfDCmnOV8QxJhq4H+rdh2e+bi3YbI20DQ2iYXMGg cMOEBGkpKmQ2FPnfME55rLw+D7uCBKn+rbU3XYei4nfH+YIrobbDk448kAiV3sfpkZkR btZLX7IcSoiwB229ROFiJKSq4DER1Ifyl3bgeQQ7QCJ5Z1Mk356bcjSC2TFWZ3IXtQo7 p8xtyjkL3wTX05ouE7pYwzL5SoAj0rOFuzXEZxkn7Dm8w7BwC4hlOjXpW9U8xEwCdqoc 8sJQ== X-Gm-Message-State: AFuF++m2k2dT+AZqPjEJPnKyUuMDqVAJ5S5K8oSQoaTrOOz8td54GE16 0aN48QCE4+fAYH23BfIr55Xyoaamr7GdQuj8S6sFBMfIfvzEUVdIVw1P2BFPQRQi X-Gm-Gg: AYBFou1I39Mqy9/1dvY3RDfhF+EJ4F5tezgZ2o1xynwF2PTT0kagOwJY9AaAmLDH3qW 53fsIE1gD7qDOhHLmYoprmYvG8fDe36fnu3YVNLPsYbO/nEI8+yAyKyZsVDSRyUhlbfYnNbtOz/ zb1ATrUEvhgp8WDIjJIhWPFuICPkLQPVXBzaYVseVnqu+QwvjXRp7QqZiyogSSbmH0VT0alDgQF BndXGp5FRMJpB0PmsmH3q/dxjqJi18WAyeYJDqfX7LD3TtSIqkMC2Giej+2nhfo8QVfQyITU4CQ 1kteC+DVKBvDYMlAzVxR4kkkIjDFePZYudI8PMukoGpdlNIo1CVzM38PX3eOCWf+EW7kRZwjA1Z /nK8NyNf1rDXXDsHMBfdmakhmfJMwluVMIUIjHpHvc4PKKbYPxVE18dVXwmMZ8RQ16i6DImKS1l H9YdC5FRQpFOxw9zlKpGfVM1z8AtiVRkIYzelXz1Z2wtSY42WExQi75Xz4TCBroDFDr+S9/ao4s CKjw1L9BJQfFEAXmN5jNPZ4v9sKlrZz X-Received: by 2002:a05:7301:f10:b0:33b:c69b:7074 with SMTP id 5a478bee46e88-342700be120mr2169607eec.4.1790410583789; Sat, 26 Sep 2026 01:16:23 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Cc: Chao Liu , Eric Blake , qemu-arm@nongnu.org, Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Markus Armbruster , Alistair Francis , Brian Cain , Stafford Horne , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Peter Maydell , Jiaxun Yang , Fabiano Rosas , Daniel Henrique Barboza , Pierrick Bouvier , qemu-riscv@nongnu.org, Laurent Vivier , Max Filippov , Song Gao <17746591750@163.com>, Philippe Mathieu-Daude , Palmer Dabbelt , Laurent Vivier , Weiwei Li , Zhao Liu Subject: [PATCH v3 04/10] hw/or1k/virt: use unique QOM name Date: Sat, 26 Sep 2026 16:15:44 +0800 Message-ID: <20260926081551.29-5-luoyonggang@gmail.com> X-Mailer: git-send-email 2.52.0.windows.1 In-Reply-To: <20260926081551.29-1-luoyonggang@gmail.com> References: <20260926081551.29-1-luoyonggang@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:36::f; envelope-from=luoyonggang@gmail.com; helo=mail-dy2-x0f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, SPF_HELO_NONE=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-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1790410678735158500 Set TYPE_VIRT_MACHINE to MACHINE_TYPE_NAME("or1k-virt") so OpenRISC virt no longer collides with other virt-machine types in one process. Keep the -M / help / migration name as virt via machine_class_set_name(). Signed-off-by: Yonggang Luo Reviewed-by: Marc-Andr=C3=A9 Lureau --- hw/or1k/virt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/or1k/virt.c b/hw/or1k/virt.c index 2ff5c084a2b..35884252379 100644 --- a/hw/or1k/virt.c +++ b/hw/or1k/virt.c @@ -34,7 +34,7 @@ #define VIRT_CPUS_MAX 4 #define VIRT_CLK_MHZ 20000000 =20 -#define TYPE_VIRT_MACHINE MACHINE_TYPE_NAME("virt") +#define TYPE_VIRT_MACHINE MACHINE_TYPE_NAME("or1k-virt") #define VIRT_MACHINE(obj) \ OBJECT_CHECK(OR1KVirtState, (obj), TYPE_VIRT_MACHINE) =20 @@ -548,6 +548,7 @@ static void openrisc_virt_machine_init(ObjectClass *oc,= const void *data) MachineClass *mc =3D MACHINE_CLASS(oc); =20 mc->desc =3D "or1k virtual machine"; + machine_class_set_name(mc, "virt"); mc->init =3D openrisc_virt_init; mc->max_cpus =3D VIRT_CPUS_MAX; mc->is_default =3D false; --=20 2.52.0.windows.1 From nobody Sat Sep 26 19:16:11 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1790410631; cv=none; d=zohomail.com; s=zohoarc; b=dVigJKvK/sLibVoCbJSHj91orekI7bn6KlAcy4T90ZVeDZDriaoXjAzV1nf+zuX7ZIeRng4wbiUkCv64KDP+IvipKydG1zoPeQjJn34ixRMxG02X9lXbRhUTj0XmXNotcAb51xA8lzugs0eART1TCxH8LJzTL1roS/8geHJmo6Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790410631; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=wpCAiLq/NIQne16b95JcTKYglPeBieSpO35EZW0OqVs=; b=TNKbO4zLXU3gD05aAdkt15Zgo0GIy0i/bUFc2ICMtz37Z84fJlxsrNL4FiBx/uOBIWG0VvHChOlqGtfF1thylfqpATBkqcLnZK7ZWAdEyr0KDD1tGJXuHsbyqnGfXazad5jVciDFSfZb/aW4N9kTw+A3v+MJh+ePSth+VCrJCQQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1790410631094903.4785652232814; Sat, 26 Sep 2026 01:17:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xANaJ-0008Ez-1m; Sat, 26 Sep 2026 04:16:40 -0400 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 1xANaD-0008EP-Fj for qemu-devel@nongnu.org; Sat, 26 Sep 2026 04:16:35 -0400 Received: from mail-dl2-x10.google.com ([2607:f8b0:4864:38::10]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1xANaB-0006p9-Kx for qemu-devel@nongnu.org; Sat, 26 Sep 2026 04:16:33 -0400 Received: by mail-dl2-x10.google.com with SMTP id a92af1059eb24-142dd025d06so1040173c88.1 for ; Sat, 26 Sep 2026 01:16:31 -0700 (PDT) Received: from WIN-BH9M8FJACR9 ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id 5a478bee46e88-34144f4eb9esm11970568eec.19.2026.09.26.01.16.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Sep 2026 01:16:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790410590; x=1791015390; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=wpCAiLq/NIQne16b95JcTKYglPeBieSpO35EZW0OqVs=; b=UBRYb0xqs+5xbFZ0fVbWG04l4Vb5FcRApE2iO119Tvg/DF4m5rvKpncnYJxjOZx1Se iDmoDttTYaV19nAB2A3eKROaz56jhSfPZvkmG64ab6wF4vS19kCd0+efNt2zDz3+oBSy 3CaMkyT1aF93CcjvGIuD/p8d75HpQDNLKLxc/oS7LCaVvY2Rb2Bn7hX6lXQCsRMq0RZv 21GXPAZdbe+fwDSkrlAwkDiKYjCqJNOMNN74TwpqjYrPzRmfIeb3oPPllgYQ5sylCKyF /dBEbfkQIxPsbQ6rjqAEXzzCdwIZIWWZu72idg0d2UMFt+LXDB5s9N3IOWxK6hXkZPef x7wA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790410590; x=1791015390; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=wpCAiLq/NIQne16b95JcTKYglPeBieSpO35EZW0OqVs=; b=m/9sMWGTausMH8Fx09jXfMC6Ho1CiPoEPsvRNRBtNIfIsRJ80YIgX/QYPBPexOl2pS Zk3eIA2inR2gvAoC5mx6uj0oyNDBhSCq+RtLeHveXgy03pV43sZ7hzGGBwwxPY49+j0F 9lZB7M9ldQy3kCprTdlNNTJirveDk635wjZ2/bfor4Pn5W3CH/x/BJZTXZLRUNEZxGNi nn9RWwI1bTgATI9PuwxvukF2zUOlWTXEUM5dsBFcKIZ9ZJMQRRP+ZXzmaO4T/JPpWlKQ IeNgE49foS0Kf0ZpkE4mJO9vGYlVuQEJgVHNvtG8YH6RXcjBQFUkpqvwiEK+t7AOw38Y 6Zhg== X-Gm-Message-State: AFuF++lioM1Ef4NE1gaU12NBAMHt/Kqm0aIy5R6yKN/3Vv14KvP8jsSX qGDVfBfhzs9OsWKqaWsobhc9b/w/q/XCo++oEe9wHXJrfoFUjBhC2PUO9ExoA/0o X-Gm-Gg: AYBFou0Yt1U2mrtPxcrdPjaDvg5ubqWiZfxN7fwm5hcEcRTFLeoywHdAkT6mCVaCY00 dgaHotTf8D3zW8f0wQ1YdShngaNYuTEzNJxFKc1CfeKJVNwxbO063ePrk3Gdt64TdKXaG9Ec3XZ Ew1sRc/TY8fn/e6cEQG0GIYyvnzGHv0oC2Hr4WXlpLnU72LTkkH8QPqXOJbkhdjN7NCUQyVuH1H dorHS4UsbSESgqqWOlmqJC6leLNXpmU0wPicCgd9RX7Ze7o4//dwqdYIcpcefpaRv6fCrd6A5ji KZ4MTvqOFMa1+CoQqgqBPpnuJySckVtMFyCiEZzXCxda5cdOejkuViBs8u6sw3/PzEvO1nKiqJ0 TBdxm+NSTzsjNd9SFNK9uQ7BePkS8mKZWu94q+Kv2S81qTCBhp59xnL+l7huKaS1+J1bbYQEq1l VZsSnUIOqRsGnBVcodj78EpnlX5GCeueAHq+2ewvLI4HChmcur82Kz+HZXk8lIxZqqd/uBxsTpi mhxtoBH+cY/J3wvsVUXtlZhQKCFmmU= X-Received: by 2002:a05:7301:3899:b0:342:5098:a983 with SMTP id 5a478bee46e88-342706b19f7mr2314817eec.11.1790410589508; Sat, 26 Sep 2026 01:16:29 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Cc: Chao Liu , Eric Blake , qemu-arm@nongnu.org, Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Markus Armbruster , Alistair Francis , Brian Cain , Stafford Horne , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Peter Maydell , Jiaxun Yang , Fabiano Rosas , Daniel Henrique Barboza , Pierrick Bouvier , qemu-riscv@nongnu.org, Laurent Vivier , Max Filippov , Song Gao <17746591750@163.com>, Philippe Mathieu-Daude , Palmer Dabbelt , Laurent Vivier , Weiwei Li , Zhao Liu Subject: [PATCH v3 05/10] hw/hexagon/virt: use unique QOM name Date: Sat, 26 Sep 2026 16:15:45 +0800 Message-ID: <20260926081551.29-6-luoyonggang@gmail.com> X-Mailer: git-send-email 2.52.0.windows.1 In-Reply-To: <20260926081551.29-1-luoyonggang@gmail.com> References: <20260926081551.29-1-luoyonggang@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:38::10; envelope-from=luoyonggang@gmail.com; helo=mail-dl2-x10.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=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.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1790410632677158500 Set TYPE_HEXAGON_VIRT_MACHINE to MACHINE_TYPE_NAME("hexagon-virt") so Hexagon virt no longer collides with other virt-machine types in one process. Keep the -M / help / migration name as virt via machine_class_set_name(). Signed-off-by: Yonggang Luo Reviewed-by: Brian Cain Reviewed-by: Marc-Andr=C3=A9 Lureau --- hw/hexagon/virt.c | 1 + include/hw/hexagon/virt.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/hexagon/virt.c b/hw/hexagon/virt.c index 64d8366d27d..04591066bef 100644 --- a/hw/hexagon/virt.c +++ b/hw/hexagon/virt.c @@ -359,6 +359,7 @@ static void virt_class_init(ObjectClass *oc, const void= *data) MachineClass *mc =3D MACHINE_CLASS(oc); =20 mc->desc =3D "Hexagon Virtual Machine"; + machine_class_set_name(mc, "virt"); mc->init =3D virt_init; mc->default_cpu_type =3D HEXAGON_CPU_TYPE_NAME("v68"); mc->default_ram_size =3D 4 * GiB; diff --git a/include/hw/hexagon/virt.h b/include/hw/hexagon/virt.h index 4ca2f1ef859..523c4858036 100644 --- a/include/hw/hexagon/virt.h +++ b/include/hw/hexagon/virt.h @@ -26,7 +26,7 @@ struct HexagonVirtMachineState { =20 void hexagon_load_fdt(const struct HexagonVirtMachineState *vms); =20 -#define TYPE_HEXAGON_VIRT_MACHINE MACHINE_TYPE_NAME("virt") +#define TYPE_HEXAGON_VIRT_MACHINE MACHINE_TYPE_NAME("hexagon-virt") OBJECT_DECLARE_SIMPLE_TYPE(HexagonVirtMachineState, HEXAGON_VIRT_MACHINE) =20 #endif /* HW_HEXAGONVIRT_H */ --=20 2.52.0.windows.1 From nobody Sat Sep 26 19:16:11 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1790410634; cv=none; d=zohomail.com; s=zohoarc; b=QZWVOrUlcsom/RTzuKqLEs0NrG7ejVDoUbYPwjgJyjwXP0XWFQTs9CiK5lDMRhmSBjwIqJLLzjFQLrkj48VaXkCWqUPDqB5fw82In336UrAWGtdYcXEHJGZZW7loFRyHqH86DW3K8bWVT1ArUfhQSy1TfY2n2zh1CVbCGf9Mmh8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790410634; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=uknfbO5NFvPlVcETkBxAAqtNVMFuW55TRzcH0VjTpx4=; b=SNayoNGKAN4BByzpAvVsCCWSGrSj8UP41nBrrXDu7/vu2kvGCEBVf1c2d3BEMf853iCYvDFFFiSWEs1fBmtQlVXjQxvLTvN6Ygy5icHyUlhLEIyOWibIVL7evwmgVUQ+Fj1I/jD1wPV19uz6PBEVdfgnISUONv3AtqjiLOK0I5U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1790410634646476.5400050953633; Sat, 26 Sep 2026 01:17:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xANaX-0008GT-6m; Sat, 26 Sep 2026 04:16:56 -0400 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 1xANaI-0008FA-Q1 for qemu-devel@nongnu.org; Sat, 26 Sep 2026 04:16:38 -0400 Received: from mail-dy2-x0f.google.com ([2607:f8b0:4864:36::f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1xANaH-0006ps-98 for qemu-devel@nongnu.org; Sat, 26 Sep 2026 04:16:38 -0400 Received: by mail-dy2-x0f.google.com with SMTP id 5a478bee46e88-33c11ef641aso1909442eec.1 for ; Sat, 26 Sep 2026 01:16:36 -0700 (PDT) Received: from WIN-BH9M8FJACR9 ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id 5a478bee46e88-34144f4eb9esm11970568eec.19.2026.09.26.01.16.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Sep 2026 01:16:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790410596; x=1791015396; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=uknfbO5NFvPlVcETkBxAAqtNVMFuW55TRzcH0VjTpx4=; b=NdhfriUrXOWfGeT/Y+jAEINDB4JUjcd3Sc6QgrGFXfUMtILJCyWhp8/Ml6CAgpfOs3 lQU8/udXu+VXYpzoNgNYAACpHmw6jP2aCAQOE+ZdH0+tbRvLN1ts1ScmvUU/jz7NYBbz anlY7UgTnPpjPO82scz5soeD3g/R4TjsVwtVw8XIHSPHddkyFGWQpcGCpBTsR1FvIiZK nB9OtpHFbpVxRVDy+06UqjhCRp0h9vwfDPTsV9KhUMdmpD7m1FoU8igZXpqqYsindUqv 8ai0140vDHvsDyL6b+9ss1h6Ih7G4NVTi4csLp/Y1FuVdKTPryaseG/GzyFjD7am0GWu F1jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790410596; x=1791015396; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=uknfbO5NFvPlVcETkBxAAqtNVMFuW55TRzcH0VjTpx4=; b=TELW8nggJNVaXnXriIYDDhDqybgp3XTewNGX+au+KhPfcTeoNFJd8luGtHFETnAXgV OFDCX1U7BrxXtK/Ojt7xpsQxNNlr8NnQ0AfxOFfyuMPZTn3l9JJV50yUDHOQjgKLP4al SHLIuHrjiMOLKVZZvSXkrSFO0QO6cXylNwDyBEyGD+/ZkGRBXA1hF2UGBMs4odPvKG9t gNg60BB765m89Vw7akCLrC4bNO2lyDLfLlITHo2pfiVBtsV24VXDeMsd0ojGREypyQkZ KdmCwrW1tEI0CBuV7BwnAwHXLzuWQRVd1TljDkC4rmlfWt9sS9NSQH9djdfP/G0o4/zj 4UuA== X-Gm-Message-State: AFuF++mHBhRWbybMwMrqcjF4ir8uQEL0u8cO/cUXc4gxHKR/F0FcJE1h sDs4V7Z+C1mSzUG2S7UB8j5F0VqWDkNiwOvebRhIWO1SFEGH/jmpDxPOaja/DOx2 X-Gm-Gg: AYBFou0rC3EVDsPbPNrVIt+Bh+YePJasjBl/ZqlBfheYG+p9A0zZhdVGSD/SuJiT+NT J1h1mxxxyDA2rdLA2iuX1p9w/tPF8LinjEQbo+9ZyxgycvSm7kqJjPqqSM78nGO7ezwgbSRmhnX 5xDKwDxCnaVopheg0+Z195nxrN5cW3i4lKyy28XOcFPFyXBEUfbEzSOaYh8ilrdd06/YKv9R5gY xE1qRQq5SORLNHlosQ22M6HanHeaUlfENxjTZDYB1UwPaGEgaCIul8mQzCaXbpdVzvYIBOgzlyX DO0xlds9MxdmUrxONPqS959MsOhTr8yA6Ao0ZukUHCXderLs1Y49ZZiQE2rAeTJ19ZU0TWgqQUq YY6Drv7PqO8fp/7UU24OkQGEqD5rE7pq/PHHt8iEMS2IVgWAKmkKkapqvfElw1+Fhj8I0kc1a+W lXDNsug3a4SNrgQ1enlN9xTL/0j68T8QYS+8Q8sBGwOR4zlqa2DxVuvgz/B3FON3SeUK41k4o1s Y3LpNf8MfgZRHxyEk+pHVSUpNZKAnoe X-Received: by 2002:a05:7300:c394:b0:33b:fae8:bbd6 with SMTP id 5a478bee46e88-3426febb742mr2517958eec.2.1790410595291; Sat, 26 Sep 2026 01:16:35 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Cc: Chao Liu , Eric Blake , qemu-arm@nongnu.org, Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Markus Armbruster , Alistair Francis , Brian Cain , Stafford Horne , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Peter Maydell , Jiaxun Yang , Fabiano Rosas , Daniel Henrique Barboza , Pierrick Bouvier , qemu-riscv@nongnu.org, Laurent Vivier , Max Filippov , Song Gao <17746591750@163.com>, Philippe Mathieu-Daude , Palmer Dabbelt , Laurent Vivier , Weiwei Li , Zhao Liu Subject: [PATCH v3 06/10] hw/loongarch/virt: use unique QOM name Date: Sat, 26 Sep 2026 16:15:46 +0800 Message-ID: <20260926081551.29-7-luoyonggang@gmail.com> X-Mailer: git-send-email 2.52.0.windows.1 In-Reply-To: <20260926081551.29-1-luoyonggang@gmail.com> References: <20260926081551.29-1-luoyonggang@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:36::f; envelope-from=luoyonggang@gmail.com; helo=mail-dy2-x0f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, SPF_HELO_NONE=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-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1790410636797158500 Set TYPE_LOONGARCH_VIRT_MACHINE to MACHINE_TYPE_NAME("loongarch-virt") so LoongArch virt no longer collides with other virt-machine types in one process. Keep the -M / help / migration name as virt-* via machine_class_set_name(). Signed-off-by: Yonggang Luo Reviewed-by: Marc-Andr=C3=A9 Lureau --- hw/loongarch/virt.c | 3 ++- include/hw/loongarch/virt.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c index 9c5371af9de..2b003443eb0 100644 --- a/hw/loongarch/virt.c +++ b/hw/loongarch/virt.c @@ -1543,6 +1543,7 @@ static void virt_class_init(ObjectClass *oc, const vo= id *data) MACHINE_VER_SYM(options, virt, __VA_ARGS__)(mc); \ mc->desc =3D "QEMU " MACHINE_VER_STR(__VA_ARGS__) " LoongArch Virt= ual Machine"; \ MACHINE_VER_DEPRECATION(__VA_ARGS__); \ + machine_class_set_name(mc, "virt-" MACHINE_VER_STR(__VA_ARGS__)); \ if (latest) { \ mc->alias =3D "virt"; \ mc->is_default =3D true; \ @@ -1550,7 +1551,7 @@ static void virt_class_init(ObjectClass *oc, const vo= id *data) } \ static const TypeInfo MACHINE_VER_SYM(info, virt, __VA_ARGS__) =3D \ { \ - .name =3D MACHINE_VER_TYPE_NAME("virt", __VA_ARGS__), \ + .name =3D MACHINE_VER_TYPE_NAME("loongarch-virt", __VA_ARGS__), \ .parent =3D TYPE_LOONGARCH_VIRT_MACHINE, \ .class_init =3D MACHINE_VER_SYM(class_init, virt, __VA_ARGS__), \ }; \ diff --git a/include/hw/loongarch/virt.h b/include/hw/loongarch/virt.h index d39a9bbf5dd..09529de48bd 100644 --- a/include/hw/loongarch/virt.h +++ b/include/hw/loongarch/virt.h @@ -130,7 +130,7 @@ struct LoongArchVirtMachineState { bool highmem_mmio; }; =20 -#define TYPE_LOONGARCH_VIRT_MACHINE MACHINE_TYPE_NAME("virt") +#define TYPE_LOONGARCH_VIRT_MACHINE MACHINE_TYPE_NAME("loongarch-virt") OBJECT_DECLARE_SIMPLE_TYPE(LoongArchVirtMachineState, LOONGARCH_VIRT_MACHI= NE) void virt_acpi_setup(LoongArchVirtMachineState *lvms); void virt_fdt_setup(LoongArchVirtMachineState *lvms); --=20 2.52.0.windows.1 From nobody Sat Sep 26 19:16:11 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1790410669; cv=none; d=zohomail.com; s=zohoarc; b=AcPqpBco7ASzb4gvOJQL/rSoeL8EUcLzS5DJUwkSDv/PAzDVbSDW4IYRP1j3yyjJvbD2LnHoWxf4TtzlLj6bzZ7AyPnqZpsS5kjedU8ZS9wl8okUn8+if0zF6QfkgFeSCcct5YxBT/9hQP3gs19dURdi8P1km9/GAsF2Gz6OLfE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790410669; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=p2D6BvndCEnjow47Ybu/EbhOevA9PsUUD7TqVOt/bAI=; b=fNiWGwGdRNAlLOc239HFLY1jg9iUO+8OVzLUVunZ4aKTkIysV8odx0q9b8kYiD/0NxbaEEzL38et/R2mxFS/bJE8+v5fIwmjTEAI4V/l/RBoK9nUHy7RRFNZrG4i6U1R3lulVBWYi1T/dg/2WCdDbj8tl3IdtKadQXQu3yHiP/I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1790410669555986.4686113620943; Sat, 26 Sep 2026 01:17:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xANbK-0000az-Ke; Sat, 26 Sep 2026 04:17:42 -0400 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 1xANaO-0008GV-CM for qemu-devel@nongnu.org; Sat, 26 Sep 2026 04:16:52 -0400 Received: from mail-dy2-x0e.google.com ([2607:f8b0:4864:36::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1xANaM-0006qQ-OR for qemu-devel@nongnu.org; Sat, 26 Sep 2026 04:16:44 -0400 Received: by mail-dy2-x0e.google.com with SMTP id 5a478bee46e88-3429bca3880so957236eec.3 for ; Sat, 26 Sep 2026 01:16:42 -0700 (PDT) Received: from WIN-BH9M8FJACR9 ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id 5a478bee46e88-34144f4eb9esm11970568eec.19.2026.09.26.01.16.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Sep 2026 01:16:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790410601; x=1791015401; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=p2D6BvndCEnjow47Ybu/EbhOevA9PsUUD7TqVOt/bAI=; b=FC4Ga6RfzpaG5IRJojP0sMqblg2DccwtLLBeSP0zHIW8MNNb3LJcGDDF3uJQzjyE+a vK/RDBNbtRwZufRnZP7TCTBmO/fTwX8cIkniU2+d0YhoPjpttM6RLZyVgNmlMiEQn7Ip 5fj7pKsYtRmKMPTYZPyXAc8u2EJfe3JZrtjl1cF0lMEtIE1wwlJHiF7bCscTl9lUTFbV 7HKlDMxwP90ALuJyvY2Mg6SWUoXkmOWKFD4FtlrqB4rZNNQIYgYUc9tdnltVDFiWa1Gi NxZGg0dxR+s29xvjzq0ryLcUgNi+6pBwHCXLfvNvdvucyJY68l1lft2c1S+FqFOMSkBU AItQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790410601; x=1791015401; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=p2D6BvndCEnjow47Ybu/EbhOevA9PsUUD7TqVOt/bAI=; b=i1Zvr5vdpkGO5KKGauWD4YzRJ6XL/EcPDaX+2lQ+9izX8grAF2HHN3FPboMVn6/Mgs GryfhrJR/NtlXinb89g7OVFPR8hR7L4+JgpiD5z35xWg+O4fy8T3C35DdsOTPt0vQw/C KkXVu0TqOFTebvvTqcFF1/D1LoYfySSRrZ/p5BHSROVfo0xSbdiQL0NVjCyA9QP93nCF 9BVDfqxFtnm3OTpLoHt4NPg77XP17oPP2m7KlJy2kMMtIwRfwCn/J8HAMZsZ7WZLq0zf VxZnWL7JDc0YqPLsjntpWIsm4JDtEfvFfFA5QqwoO8oY9RKLHLIPq4/ZT6UnPPFMlVE0 TtMg== X-Gm-Message-State: AFuF++ksBeSrHq1kU6anI3hj2QlNT8rx3WKt7cctmK+OKDQPK7ERE8xV xFPaBUYSed/LpgTD4A0OH0FJl1XXFqZMBclXKLBkhh9CR65f8Si2OmC5njOPLx/+ X-Gm-Gg: AYBFou3V+AhnApgmeui+HtCl6Yb0CzckhttPqNHmsj7KJ5EjYKDc/xHmSxSMh5KAJc7 6BygrCoFr4TbBuBPIreEgg8gnJdrEUckSFu8MnHCZt2l0g4Q7Y4g5lBwKvWikXwvBnCxaPTOmqd WivZ4wBa2tEGXYffqVhZorMJD1a0nZyXYo/aEd3OGDDxQp+qAhF8ASbQMwplfN+4ZvPyrKqeKsK xmAkG5dNaxEkfMl0j5KgmnmCwOVVy9mK1iW1nZ7KgWWNfHbQhzf8nwGMXTkU65JVzAE/P2bwU99 nwfXQnNEP6u1IKhmT08WSuaC1GdC3qjmCuDQjiVAc/4lVaNSiIcnVOOTBLjPiv7KzK9wNGWYMiJ KxaH+IMfD2RZeM1KvtaaljEoPGASK8m5NIoZOY+xnAp29pPoVmDqI7xp0/p1JFylNMwDz/k4F2f 3exvPqFIjgplLPHB3iDlu438dBv6XcxkFqq1l92R4CZ45Rh0Dj/b4UdwG7djSYGo8NXJ0/Z14jt XlBO5NvjDORdw4bh6ZS7SzrpDVXYBpA X-Received: by 2002:a05:7300:c393:b0:341:cbb8:3c0a with SMTP id 5a478bee46e88-3426cfdd59dmr2246804eec.0.1790410601124; Sat, 26 Sep 2026 01:16:41 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Cc: Chao Liu , Eric Blake , qemu-arm@nongnu.org, Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Markus Armbruster , Alistair Francis , Brian Cain , Stafford Horne , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Peter Maydell , Jiaxun Yang , Fabiano Rosas , Daniel Henrique Barboza , Pierrick Bouvier , qemu-riscv@nongnu.org, Laurent Vivier , Max Filippov , Song Gao <17746591750@163.com>, Philippe Mathieu-Daude , Palmer Dabbelt , Laurent Vivier , Weiwei Li , Zhao Liu Subject: [PATCH v3 07/10] hw/m68k/virt: use unique QOM name Date: Sat, 26 Sep 2026 16:15:47 +0800 Message-ID: <20260926081551.29-8-luoyonggang@gmail.com> X-Mailer: git-send-email 2.52.0.windows.1 In-Reply-To: <20260926081551.29-1-luoyonggang@gmail.com> References: <20260926081551.29-1-luoyonggang@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:36::e; envelope-from=luoyonggang@gmail.com; helo=mail-dy2-x0e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=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.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1790410670896158500 Set the parent and versioned QOM types to m68k-virt so M68K virt no longer collides with other virt-machine types in one process. Keep the -M / help / migration name as virt-* via machine_class_set_name(). Signed-off-by: Yonggang Luo Reviewed-by: Marc-Andr=C3=A9 Lureau --- hw/m68k/virt.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c index 274970978ff..1faa178bdfc 100644 --- a/hw/m68k/virt.c +++ b/hw/m68k/virt.c @@ -323,7 +323,7 @@ static void virt_machine_class_init(ObjectClass *oc, co= nst void *data) } =20 static const TypeInfo virt_machine_info =3D { - .name =3D MACHINE_TYPE_NAME("virt"), + .name =3D MACHINE_TYPE_NAME("m68k-virt"), .parent =3D TYPE_MACHINE, .abstract =3D true, .class_init =3D virt_machine_class_init, @@ -345,14 +345,15 @@ type_init(virt_machine_register_types) MACHINE_VER_SYM(options, virt, __VA_ARGS__)(mc); \ mc->desc =3D "QEMU " MACHINE_VER_STR(__VA_ARGS__) " M68K Virtual M= achine"; \ MACHINE_VER_DEPRECATION(__VA_ARGS__); \ + machine_class_set_name(mc, "virt-" MACHINE_VER_STR(__VA_ARGS__)); \ if (latest) { \ mc->alias =3D "virt"; \ } \ } \ static const TypeInfo MACHINE_VER_SYM(info, virt, __VA_ARGS__) =3D \ { \ - .name =3D MACHINE_VER_TYPE_NAME("virt", __VA_ARGS__), \ - .parent =3D MACHINE_TYPE_NAME("virt"), \ + .name =3D MACHINE_VER_TYPE_NAME("m68k-virt", __VA_ARGS__), \ + .parent =3D MACHINE_TYPE_NAME("m68k-virt"), \ .class_init =3D MACHINE_VER_SYM(class_init, virt, __VA_ARGS__), \ }; \ static void MACHINE_VER_SYM(register, virt, __VA_ARGS__)(void) \ --=20 2.52.0.windows.1 From nobody Sat Sep 26 19:16:11 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1790410677; cv=none; d=zohomail.com; s=zohoarc; b=mGkCxEazJ6v5Y91L2Ji2EjqTE7QJuhVxS+L1Dm/puFviMaprY7s7Mcdm3r0k6bpD5JjUdpvHQneDDnSVlyBRhrC0jthF3SyDkmK298O3yBMHCc+avbNhU/EbUjfS1lyItLDkQAhItAPskduuhaMC3A5RLpTdT0y4qS5XOKwv4yo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790410677; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=1l68+yaj46pbRfPOttnQxmh79QuevFDMvi1cBw5cGf4=; b=X0JObNG5tpxMKHpbplH7CEyzF6WPT5cOaCA+1lbi0SBlL7NXROrltrHgIR4PDu2JtqCGHLurxdL0sOL/83baB/jPOYoe7M1vBVba+aMUK66beJe7V8tiHCejTOhQPUOl+r8aP/0PUNoANlc6xjqwcCZLYozIwhzdDKPBrT8xT7Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1790410677739740.8520642217806; Sat, 26 Sep 2026 01:17:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xANbA-0000Gd-Kl; Sat, 26 Sep 2026 04:17:36 -0400 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 1xANaT-0008H7-Fd for qemu-devel@nongnu.org; Sat, 26 Sep 2026 04:16:53 -0400 Received: from mail-dy2-x0e.google.com ([2607:f8b0:4864:36::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1xANaS-0006qv-1d for qemu-devel@nongnu.org; Sat, 26 Sep 2026 04:16:49 -0400 Received: by mail-dy2-x0e.google.com with SMTP id 5a478bee46e88-341d0522b4dso2034702eec.1 for ; Sat, 26 Sep 2026 01:16:47 -0700 (PDT) Received: from WIN-BH9M8FJACR9 ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id 5a478bee46e88-34144f4eb9esm11970568eec.19.2026.09.26.01.16.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Sep 2026 01:16:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790410607; x=1791015407; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=1l68+yaj46pbRfPOttnQxmh79QuevFDMvi1cBw5cGf4=; b=pDtmpz55abABeFn5cgAAHTmRBI3ZgKvsaJbHWtbmjtaxrm3m2TENSGd/ysB3G1q/Xm +aTW0KJh1Tjyda3G9dbt812E7vhnBKjf4e4x2Po4PQ86wn08II8lN5JvSUHympoBLl8H Mw/0VWgmQ4BEesd7uiaW5JkbTQmyaFRba/3Yy6Apbq+/RBAA0igH083D3e9cG9OVZjje vWX5niHg7PaMEqzfHDrl0AN7iKgVGfmkFYJyJ5BZww0lkhfP70Z6nfEv6AtTTZu1I8Pz ZQtsA+Jlqm6BM/AR/wXegaOLgRJYEN5PWpgWjl/CUf+USPRoVFpxXHQAKDOE/TxzRuXG 5n6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790410607; x=1791015407; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=1l68+yaj46pbRfPOttnQxmh79QuevFDMvi1cBw5cGf4=; b=yEwXHN8f0AAsLD+XBvA47vxRKi/g4H4iib+638N0pKyy8B2amd9wSZ5EhNoFpeA7Df Svt0fG1eIaTxiBs/94j1XTl0B8mwwf3e9tIYg+KJKfL+ZIQlf+kW9m9ds5svArf4H8sb e+6EMyS9b93iMKQhYsx1SXx7ftzYEWFVP5lZH/3TG1POL/UGzhOhDF5IcmO4kWQZs3eH tEMHImKPJKmzCqkWmoBxgWyJ6laRO8q9kGKJ1PyOX9NLjPGYY3OVGKtXA/jd5nQP0tW1 cw+KzE9sCZp6vuDAAgHDCN2dZRppLd3l1kSzAxrLs9MdwUIiQSJDI20JMRdjC88IYcvs qbzw== X-Gm-Message-State: AFuF++myY0bvtz+wggMXBEQp5bPvxJpR3X2ssR5FitVMPRF5k5pOqghr YcXVYwgg4RoK5e/iTWQ1bP0LXRfr5TI6aQp12F37xSV4deKNpF80r9zlB/MyEbCu X-Gm-Gg: AYBFou13vURS4wmfhmsoejYMD55jAcRFBdPOw59FwPj7zE2TN5VGDelCBurzAH4dJY6 Kvmprd2HUoVoNuIt1QXP50mkwGSGr2JNLBVsLyMVw6kNwS5UoD6X5mmbeTCQwQEJ6OUtwQ6GAqm h/ITV0zyVLMYhpCN/AEwL08dEViyVgslAvDMkXxvN9ECb8z6b60c/e9Pql/+/FqhRJ/w39W9I6G MAMvT8SAFcjuZPafa3hAwdVpixLR2VUmAiNRN8tZRDjKoyVV0z3ajSeg1RSO5MaDDXxp1vyprU9 9Edf8ZM2DD7+VzeN970gXBUZHMacHBLiyJSDadP6AOLCMOT3LQ0ydFQfwVYegga6+um5dmmF680 vYf8HUIO7USQyO5qvW3V8l6n3bZozpx4dwTaNWEAPMv5nrdMRXTBTFFtj+uiIUmYIa9XzC1waYH pxyICARCsKK0dIuyKrXlADmAdX1nxri/1qqanVygry1fgW7GKXvgVkr5mGp/eAum1wWfohCzdvh SO/Iru02+eBaHQrXpMJ5DK7I7cVcv0= X-Received: by 2002:a05:7301:5804:b0:33b:e3c8:a757 with SMTP id 5a478bee46e88-342705b865cmr3508267eec.1.1790410606665; Sat, 26 Sep 2026 01:16:46 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Cc: Chao Liu , Eric Blake , qemu-arm@nongnu.org, Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Markus Armbruster , Alistair Francis , Brian Cain , Stafford Horne , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Peter Maydell , Jiaxun Yang , Fabiano Rosas , Daniel Henrique Barboza , Pierrick Bouvier , qemu-riscv@nongnu.org, Laurent Vivier , Max Filippov , Song Gao <17746591750@163.com>, Philippe Mathieu-Daude , Palmer Dabbelt , Laurent Vivier , Weiwei Li , Zhao Liu Subject: [PATCH v3 08/10] hw/xtensa/virt: use unique QOM name Date: Sat, 26 Sep 2026 16:15:48 +0800 Message-ID: <20260926081551.29-9-luoyonggang@gmail.com> X-Mailer: git-send-email 2.52.0.windows.1 In-Reply-To: <20260926081551.29-1-luoyonggang@gmail.com> References: <20260926081551.29-1-luoyonggang@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:36::e; envelope-from=luoyonggang@gmail.com; helo=mail-dy2-x0e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=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.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1790410678719158500 Register the board as xtensa-virt so Xtensa virt no longer collides with other virt-machine types in one process. Keep the -M / help / migration name as virt via machine_class_set_name(). Signed-off-by: Yonggang Luo Reviewed-by: Marc-Andr=C3=A9 Lureau --- hw/xtensa/virt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/xtensa/virt.c b/hw/xtensa/virt.c index 271f06e0953..dc5b255b9b1 100644 --- a/hw/xtensa/virt.c +++ b/hw/xtensa/virt.c @@ -118,10 +118,11 @@ static void xtensa_virt_init(MachineState *machine) static void xtensa_virt_machine_init(MachineClass *mc) { mc->desc =3D "virt machine (" XTENSA_DEFAULT_CPU_MODEL ")"; + machine_class_set_name(mc, "virt"); mc->init =3D xtensa_virt_init; mc->max_cpus =3D 32; mc->default_cpu_type =3D XTENSA_DEFAULT_CPU_TYPE; mc->default_nic =3D "virtio-net-pci"; } =20 -DEFINE_MACHINE("virt", xtensa_virt_machine_init) +DEFINE_MACHINE("xtensa-virt", xtensa_virt_machine_init) --=20 2.52.0.windows.1 From nobody Sat Sep 26 19:16:11 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1790410672; cv=none; d=zohomail.com; s=zohoarc; b=k2Twiv7EaIdUqj5tH9ETPgrFUbstvUs5EPKE+umhtBVSpW1z1iIscYEGl2C+QpCv3KMUj5W/h5GqfIIFOsWXV1gpRso/WaoLdw74jNeynA9ak1cDskjC8JjPYf63X3JznVIBNfklDHJRtnitdX/dvXajIL765qLacJIugSTzjbA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790410672; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=bykFcKA6UsA5TmzVTu+04YGJhlxe19nedknbhDiTTcM=; b=U6bfCqKJQEKz/ywbgT7Nv/DzmEPjnvfgR8ltY/sGrs07jmEXmffx6RMmydJX11NE8x1edDW7RcZPfSuN8evnwXAlrIEyzHOGzpXk79r42l9sZCc2bCuQvz/EYTyX4oLzI0UnPwRX+7EHtG2j/PmF2l0eJMhOVU0fKfS93eQSrZA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1790410671994304.18128666628684; Sat, 26 Sep 2026 01:17:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xANbP-0000ti-LC; Sat, 26 Sep 2026 04:17:47 -0400 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 1xANab-0008KI-U8 for qemu-devel@nongnu.org; Sat, 26 Sep 2026 04:17:01 -0400 Received: from mail-dl2-x0e.google.com ([2607:f8b0:4864:38::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1xANaZ-0006rQ-3u for qemu-devel@nongnu.org; Sat, 26 Sep 2026 04:16:57 -0400 Received: by mail-dl2-x0e.google.com with SMTP id a92af1059eb24-144efd1ea76so1013744c88.1 for ; Sat, 26 Sep 2026 01:16:53 -0700 (PDT) Received: from WIN-BH9M8FJACR9 ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id 5a478bee46e88-34144f4eb9esm11970568eec.19.2026.09.26.01.16.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Sep 2026 01:16:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790410612; x=1791015412; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=bykFcKA6UsA5TmzVTu+04YGJhlxe19nedknbhDiTTcM=; b=c2W8u1BXeq5+pvUJDBCX+IVkKRWdYe9YQjwpb2+uCXmYmNa4FiU/8RwCTDvZEh0DFp +tBgWWJLHS7DQQuTkZLlZjRIP6dpeL1w0Hi6POmDmrbLWTm+tShNaythUC7YjTQosxTR RQsYZnXQxRpakZU0WzLGrAMnuebOOT0D9wZ71CC8ptpP+rPGZRtB2nDIUBUrMJjt1fKf ZAeCZcV8hyV7x2o3szQb65bx1902Xy1XxprceGtYJk96Cu4DlU+pBvZR2OtA2AuW7yY5 PMkkNn0t3wR3QKShFSLxHw1+AmelrW7LeuMmdAwL1nlQHVi28pn+wQm7BwV5WE6+QyBn 1RRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790410612; x=1791015412; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=bykFcKA6UsA5TmzVTu+04YGJhlxe19nedknbhDiTTcM=; b=N/XinlWV9lsxc4RO++Fot1uv40SswmVsDvh2gJ7nShByiIhTp7WQawcJa+pIRZ4QY1 VOvrPNQFsUHQoMiziCX5tPyU4BtYpc4oDCHFHJ2HWAw8ewGDiiZ5WqfdwuYX+a9NqqCi PeKWL+xP3SsqNxVQrsvODioUqD06TUuKGNICZGTok8zSRfxOaBqIZ5JtHWVGIDoCcI+6 aBKckFP0cDXkUMTGz08sac0RXu/43sqiUB9lCEMOW+DHWVjc2klYTLOQR+Ak9c0vpGch GWylPgZkM64z0YyXufnQGZlhCH1icVX2qw/Q+ex7xbgeM8ibTfiB2vnoFVyXZyUCCLCr f5nQ== X-Gm-Message-State: AFuF++lUxiz0TiYVo4b3GgLVTw4HEsaPG+1UtN5gasvea0OjNe4BsdkZ 3kh3++N/13YjPu5jMPIoLEm1/FhaKgVrmAoszmCXWQ98+tsHnFqH2RjsyuvcuGDP X-Gm-Gg: AYBFou0S6dLRuQZSK2HBcigG7CQ3OGvGNnQ/hZ+U3B3tcxzc4gfHplhidNotLepbXgF hXdzVB+asjHGe4X3D+kxR0zTl/mvxfFadl2VQHe71IH4vG0s/JxOeZ1joUTKlWXwe/FgBfM+kmr cJB6LTpIpRc9q/SWpJ9ZP8V+gYpPQ2W7Jkfl31trrr/kEH/sNboZG1sWIfJPzaNY2SO+DsBIlCN xAmdtSJhvpPmopHVMlg4tEZ7aIcI1Y9H2W3t4660HuOFoRUv0jsoX0oSNe+RxcqGVbYU5RyfDRV /snyej7TfK246n39SJSYbNaixloGJHmhyl5Xa4DgdvDJecuBuTHBBSNUm620uag4XkGyWnFGovb BVLc8dtPboW4m9tuuCXGQXGDssaahCMdD0Pwssi3MF3uZZXqRNmMNmNtpHpXM4KIRZdKPw8OCdd RBLJuBWNZqKVEDvSNlU2Rv32ZepuXNyeZxe58ZeJkGTNUdyl9GnE+VFWGspCNahE0L2FxwOyMy8 qTy0CfvNko+oCRwcqtfEK6Ef9pdZMk= X-Received: by 2002:a05:7300:a987:b0:341:bcd4:7b6a with SMTP id 5a478bee46e88-3426f8c1dcfmr3183022eec.4.1790410612304; Sat, 26 Sep 2026 01:16:52 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Cc: Chao Liu , Eric Blake , qemu-arm@nongnu.org, Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Markus Armbruster , Alistair Francis , Brian Cain , Stafford Horne , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Peter Maydell , Jiaxun Yang , Fabiano Rosas , Daniel Henrique Barboza , Pierrick Bouvier , qemu-riscv@nongnu.org, Laurent Vivier , Max Filippov , Song Gao <17746591750@163.com>, Philippe Mathieu-Daude , Palmer Dabbelt , Laurent Vivier , Weiwei Li , Zhao Liu Subject: [PATCH v3 09/10] qapi: return MachineInfo typename from query-machines Date: Sat, 26 Sep 2026 16:15:49 +0800 Message-ID: <20260926081551.29-10-luoyonggang@gmail.com> X-Mailer: git-send-email 2.52.0.windows.1 In-Reply-To: <20260926081551.29-1-luoyonggang@gmail.com> References: <20260926081551.29-1-luoyonggang@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:38::e; envelope-from=luoyonggang@gmail.com; helo=mail-dl2-x0e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=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.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1790410674780158500 query-machines returned only the -M name, so management apps inferred the QOM type as that name plus "-machine". A prefixed type such as arm-virt-11.1-machine no longer matches -M virt-11.1. Return the QOM type in MachineInfo typename from object_class_get_name() in qmp_query_machines(). test_query_machines_typename checks that qom-list-properties accepts it. Signed-off-by: Yonggang Luo Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau --- hw/core/machine-qmp-cmds.c | 1 + qapi/machine.json | 6 +++- tests/qtest/qom-test.c | 65 ++++++++++++++++++++++++++++++++++---- 3 files changed, 65 insertions(+), 7 deletions(-) diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c index 9c08b17510a..27ceed54a14 100644 --- a/hw/core/machine-qmp-cmds.c +++ b/hw/core/machine-qmp-cmds.c @@ -116,6 +116,7 @@ MachineInfoList *qmp_query_machines(bool has_compat_pro= ps, bool compat_props, } =20 info->name =3D g_strdup(mc->name); + info->q_typename =3D g_strdup(object_class_get_name(OBJECT_CLASS(m= c))); info->cpu_max =3D !mc->max_cpus ? 1 : mc->max_cpus; info->hotpluggable_cpus =3D mc->has_hotpluggable_cpus; info->numa_mem_supported =3D mc->numa_mem_supported; diff --git a/qapi/machine.json b/qapi/machine.json index b1be5608b61..f5ead98e174 100644 --- a/qapi/machine.json +++ b/qapi/machine.json @@ -168,6 +168,9 @@ # # @name: the name of the machine # +# @typename: QOM type name of the machine, for qom-list-properties +# (since 11.2) +# # @alias: an alias for the machine name # # @is-default: whether the machine is default @@ -208,7 +211,7 @@ # Since: 1.2 ## { 'struct': 'MachineInfo', - 'data': { 'name': 'str', '*alias': 'str', + 'data': { 'name': 'str', 'typename': 'str', '*alias': 'str', '*is-default': 'bool', 'cpu-max': 'int', 'hotpluggable-cpus': 'bool', 'numa-mem-supported': 'bool', 'deprecated': 'bool', '*default-cpu-type': 'str', @@ -238,6 +241,7 @@ # { # "hotpluggable-cpus": true, # "name": "pc-q35-6.2", +# "typename": "pc-q35-6.2-machine", # "compat-props": [ # { # "qom-type": "virtio-mem", diff --git a/tests/qtest/qom-test.c b/tests/qtest/qom-test.c index cf4c6b5add5..4ee95af6d94 100644 --- a/tests/qtest/qom-test.c +++ b/tests/qtest/qom-test.c @@ -200,13 +200,32 @@ static void test_machine(gconstpointer data) =20 if (g_test_slow()) { /* Make sure we can get the machine class properties: */ - g_autofree char *qom_machine =3D g_strdup_printf("%s-machine", mac= hine); - - response =3D qtest_qmp(qts, "{ 'execute': 'qom-list-properties'," - " 'arguments': { 'typename': %s } }", - qom_machine); - g_assert(response); + QList *list; + const QListEntry *p; + bool found =3D false; + + response =3D qtest_qmp(qts, "{ 'execute': 'query-machines' }"); + g_assert(!qdict_haskey(response, "error")); + list =3D qdict_get_qlist(response, "return"); + g_assert(list); + for (p =3D qlist_first(list); p; p =3D qlist_next(p)) { + QDict *minfo =3D qobject_to(QDict, qlist_entry_obj(p)); + QDict *props; + + if (strcmp(qdict_get_str(minfo, "name"), machine)) { + continue; + } + props =3D qtest_qmp(qts, "{ 'execute': 'qom-list-properties'," + " 'arguments': { 'typename': %s } }", + qdict_get_str(minfo, "typename")); + g_assert(!qdict_haskey(props, "error")); + g_assert(qdict_haskey(props, "return")); + qobject_unref(props); + found =3D true; + break; + } qobject_unref(response); + g_assert(found); } =20 test_properties(qts, "/machine", true); @@ -218,6 +237,39 @@ static void test_machine(gconstpointer data) qtest_quit(qts); } =20 +static void test_query_machines_typename(void) +{ + QTestState *qts; + QDict *response; + QList *list; + const QListEntry *p; + bool saw =3D false; + + qts =3D qtest_init("-machine none"); + response =3D qtest_qmp(qts, "{ 'execute': 'query-machines' }"); + g_assert(!qdict_haskey(response, "error")); + list =3D qdict_get_qlist(response, "return"); + g_assert(list); + + for (p =3D qlist_first(list); p; p =3D qlist_next(p)) { + QDict *minfo =3D qobject_to(QDict, qlist_entry_obj(p)); + const char *typename =3D qdict_get_str(minfo, "typename"); + g_autoptr(QDict) props =3D NULL; + + g_assert(g_str_has_suffix(typename, "-machine")); + props =3D qtest_qmp(qts, "{ 'execute': 'qom-list-properties'," + " 'arguments': { 'typename': %s } }", + typename); + g_assert(!qdict_haskey(props, "error")); + g_assert(qdict_haskey(props, "return")); + saw =3D true; + } + + g_assert(saw); + qobject_unref(response); + qtest_quit(qts); +} + static void add_machine_test_case(const char *mname) { char *path; @@ -250,6 +302,7 @@ int main(int argc, char **argv) =20 qtest_cb_for_every_machine(add_machine_test_case, g_test_quick()); qtest_add_func("qom/qom-qtests", test_qom_qtests); + qtest_add_func("qom/machine-typename", test_query_machines_typename); =20 return g_test_run(); } --=20 2.52.0.windows.1 From nobody Sat Sep 26 19:16:11 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1790410749; cv=none; d=zohomail.com; s=zohoarc; b=OXnb+NR/mBnw6x77+Ibwr/ysP7JDvIrNIMpKngjPr8x+imZHZ0lSYFUrOv9ybuhIKbTv4xOnFR4o7Rqx7XcvUN+0Hbf55NToPnYBQyrWrTnGOlQklV0tnWzo6u6Wpm7xendETWpXArx8nCJ+s3UYoOvaPUOIE8BFCJLG+dfcX5s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790410749; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=cCl7EmMMifN3N+FB2ZvvZtho7z8V+PKCogBoxHLSQOM=; b=JIjYO8/4qDKG6u+94uf9zRVYa33JOtC9tQIbPqHFoD73QLu/R7adtUxdLjho/sBekT0sz2Ej3Lny67e7KP4eHOUqL0jrjKVCXp6R0aFio66qIVGE5D5iYvtEdMIwjFSi+OHnbVCtkVWHly25SvD+sx+p+s2nBT0gmLySloVfTys= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1790410749508115.90723042365596; Sat, 26 Sep 2026 01:19:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xANbN-0000jY-1A; Sat, 26 Sep 2026 04:17:45 -0400 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 1xANaf-0008Kn-RB for qemu-devel@nongnu.org; Sat, 26 Sep 2026 04:17:03 -0400 Received: from mail-dy2-x0e.google.com ([2607:f8b0:4864:36::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1xANae-0006s9-7b for qemu-devel@nongnu.org; Sat, 26 Sep 2026 04:17:01 -0400 Received: by mail-dy2-x0e.google.com with SMTP id 5a478bee46e88-341d0522b4dso2034857eec.1 for ; Sat, 26 Sep 2026 01:16:59 -0700 (PDT) Received: from WIN-BH9M8FJACR9 ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id 5a478bee46e88-34144f4eb9esm11970568eec.19.2026.09.26.01.16.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Sep 2026 01:16:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790410618; x=1791015418; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=cCl7EmMMifN3N+FB2ZvvZtho7z8V+PKCogBoxHLSQOM=; b=ewJ3SO1Rgvijo1aJoKbvnzODbCby+SvRcu2Gir5U5946mIdLlWhe489L97BNzCHZv7 JXpIVTO3A/O/fpsV7jip41BYhlmMPoNOTajUEdPxMd36bR+89nmf7lYf8p076G3/9vuP 5McLQfRZOFTZIykrAjhmtpLuQPo28lw/43ozdiyYznqSjzEJZHNdFImDv7Gkvw9RTtA1 z6Aha16hHpWqfeEiBYVJBtSpwFUB6WXZnFAYZE2W8kimHsaC+0VDQVGfHRGSyA60tBW1 kA7HETCjGwPIosU9LiI5QvwQqxvKNrntggxa01GbB3OkLh8jmkHU9G5wYeoVdMub1kZm xOgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790410618; x=1791015418; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=cCl7EmMMifN3N+FB2ZvvZtho7z8V+PKCogBoxHLSQOM=; b=Ik+MIExiWe4Oc13dqm0f4I5zZQRP6mnvBCKMfYqZcCjwD2djW2ozYHe4LcrUqFMeWG Jaad18woM/Q9niuHj4ojSRBumTsQHV09/H2OH2L37WQcmonJnis0Hwz7ksDExafn67FW Ow/DgKBAXGeLQbRM9dVB01wkyw1kVe74MwimcPS+h//H9FNpVz/95kWwRAL7Msv0rdkN RVeIBYEqEiL5OU36NixlFoBiAvBaIKWXRxafnfyI5jSgtg18EQ3HM7NO2VxM95PNNXp4 zSXVeqAQJB0BHCywaKN6g6Atg6HI7IWRdVrQRic2Ykn5AcGiBlUblfhOspSedgRV/b7D Ijmw== X-Gm-Message-State: AFuF++lw/ZozZQXQqlu5RDFVeoe646Hg3hAQxip22fkdGdyYj3TCMAis qjxBe+VWtDEcP0y640/Na5o69fVUQoqXjCDRPuQ0+WVhyHjGAP/+hu6cFSnlchJ6 X-Gm-Gg: AYBFou3MyJOpZp98E9tG5ue9NdmnkQg1Q3vMosF5kkLCjSGHSv2KGbHwvG1+ZfGPnyZ Sa1Ky5iKBPiOaCxtqEUfF6jQU2p7YY/Ludam/gfJwJesg6UYdbxKgwYCH5AJZ6EPz7npPZX6jB9 /HlPPa9zhtA71V8WsXmuACa0FCvvKE+nLyOiHtqQfnkJxC7CN/86Z8zKnhJEcrtQ2KqhmCpjFhD rLsVMBDZ0PcDUgCDu1M03r+2B+X5yRjaYPYymHyolbR/Av1LtlJtuRfm6HB2G2ly+0yPfBowjCm GI65OqXCy4nWeohvzBX71T8FWlOkN0pnW0HGzC+UqRNzpYdNEvPmmpDVGRQVyrsfpfFuMVbJRFe y+sqzqnwSEF1Iq5jh2h8ISf5U2Jp42nKZwSqhwMD97yKctc62ptF353huFCY/0XLj7mFfvoMJDC o1ZCyau6KAUOTks6yNsjOew4sc/M3xqC/dRdf7hUPecaBgJyq+32wbo9qtRd7+iAhKO+gs+H09P i15HK2N332EtZY0ZOLOw735BrSx9BU= X-Received: by 2002:a05:693c:65cd:b0:33f:3878:8e18 with SMTP id 5a478bee46e88-3426c6f4d95mr2251214eec.0.1790410617991; Sat, 26 Sep 2026 01:16:57 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Cc: Chao Liu , Eric Blake , qemu-arm@nongnu.org, Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Markus Armbruster , Alistair Francis , Brian Cain , Stafford Horne , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Peter Maydell , Jiaxun Yang , Fabiano Rosas , Daniel Henrique Barboza , Pierrick Bouvier , qemu-riscv@nongnu.org, Laurent Vivier , Max Filippov , Song Gao <17746591750@163.com>, Philippe Mathieu-Daude , Palmer Dabbelt , Laurent Vivier , Weiwei Li , Zhao Liu Subject: [PATCH v3 10/10] machine: match the versioned virt example to arm virt Date: Sat, 26 Sep 2026 16:15:50 +0800 Message-ID: <20260926081551.29-11-luoyonggang@gmail.com> X-Mailer: git-send-email 2.52.0.windows.1 In-Reply-To: <20260926081551.29-1-luoyonggang@gmail.com> References: <20260926081551.29-1-luoyonggang@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:36::e; envelope-from=luoyonggang@gmail.com; helo=mail-dy2-x0e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, SPF_HELO_NONE=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-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1790410751220158500 Content-Type: text/plain; charset="utf-8" The comment still showed MACHINE_VER_TYPE_NAME("virt") and left out machine_class_set_name(). Show the arm-virt QOM type, keep the -M name as virt-, and name the latest helper DEFINE_VIRT_MACHINE_AS_LATEST. Signed-off-by: Yonggang Luo --- include/hw/core/boards.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/include/hw/core/boards.h b/include/hw/core/boards.h index 851140ad052..8525e1f2288 100644 --- a/include/hw/core/boards.h +++ b/include/hw/core/boards.h @@ -474,21 +474,25 @@ struct MachineState { * For example, a macro that can be used to define versioned * 'virt' machine types would look like: * + * #define TYPE_VIRT_MACHINE MACHINE_TYPE_NAME("arm-virt") + * * #define DEFINE_VIRT_MACHINE_IMPL(latest, ...) \ * static void MACHINE_VER_SYM(class_init, virt, __VA_ARGS__)( \ * ObjectClass *oc, \ - * void *data) \ + * const void *data) \ * { \ * MachineClass *mc =3D MACHINE_CLASS(oc); \ * MACHINE_VER_SYM(options, virt, __VA_ARGS__)(mc); \ - * mc->desc =3D "QEMU " MACHINE_VER_STR(__VA_ARGS__) " Virtual Ma= chine"; \ + * mc->desc =3D "QEMU " MACHINE_VER_STR(__VA_ARGS__) " ARM Virtua= l Machine"; \ * MACHINE_VER_DEPRECATION(__VA_ARGS__); \ + * machine_class_set_name(mc, "virt-" MACHINE_VER_STR(__VA_ARGS__= )); \ * if (latest) { \ * mc->alias =3D "virt"; \ * } \ * } \ - * static const TypeInfo MACHINE_VER_SYM(info, virt, __VA_ARGS__) =3D= { \ - * .name =3D MACHINE_VER_TYPE_NAME("virt", __VA_ARGS__), \ + * static const TypeInfo MACHINE_VER_SYM(info, virt, __VA_ARGS__) =3D= \ + * { \ + * .name =3D MACHINE_VER_TYPE_NAME("arm-virt", __VA_ARGS__), \ * .parent =3D TYPE_VIRT_MACHINE, \ * .class_init =3D MACHINE_VER_SYM(class_init, virt, __VA_ARGS__)= , \ * }; \ @@ -503,7 +507,7 @@ struct MachineState { * whichever scenarios need to be catered for with a machine: * * // Normal 2 digit, marked as latest e.g. 'virt-9.0' - * #define DEFINE_VIRT_MACHINE_LATEST(major, minor) \ + * #define DEFINE_VIRT_MACHINE_AS_LATEST(major, minor) \ * DEFINE_VIRT_MACHINE_IMPL(true, major, minor) * * // Normal 2 digit e.g. 'virt-9.0' --=20 2.52.0.windows.1