From nobody Sat Sep 26 20:52:10 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=1789690147; cv=none; d=zohomail.com; s=zohoarc; b=jDoxFeKnIHgZCd5okUHaaJXkRrlYUogRkaPEhzvM5fN5pvS1we23D0g91gpQ/CaYRYZI48hdHWWj5iaKLzROe+IAa3b1/Lghd+e4aGHv0uH3nLw19KYDr/hRiLVZ6K37CVf2Itl8qu09mKj8aXBF4zMruHTrZZfsGmFOF45ft5Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789690147; 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=qhnt2dJkpAm5GGzTe4QbVNjnCDc43sqrIBCwyZpio2Y=; b=LGolgX9fAQdpZlFmlDr6swkT7bU+VxLjQfEb8xSp/xeqUDIpqFl4h+S/vrUDXP5Uf9+3Kd5HML0I2V3Sp6nwIXBJibaShMX8lGe4tVvnJUKyIhPDH6CE34H7S4/xOVCz4Gr64u9g/cGu9Hdeo2QnzBKyuGaNl7hvNQG/n4gKEOo= 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 1789690147305440.4177533417949; Thu, 17 Sep 2026 17:09:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7M83-0006ck-VU; Thu, 17 Sep 2026 20:06:59 -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 1x7M81-0006cI-Lh for qemu-devel@nongnu.org; Thu, 17 Sep 2026 20:06:57 -0400 Received: from mail-pz2-x0c.google.com ([2607:f8b0:4864:3b::c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1x7M80-0004rW-2n for qemu-devel@nongnu.org; Thu, 17 Sep 2026 20:06:57 -0400 Received: by mail-pz2-x0c.google.com with SMTP id d2e1a72fcca58-8748f34b1f2so220634b3a.0 for ; Thu, 17 Sep 2026 17:06:55 -0700 (PDT) Received: from WIN-BH9M8FJACR9 ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id 5a478bee46e88-33bf5b1d335sm20328212eec.28.2026.09.17.17.06.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Sep 2026 17:06:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789690014; x=1790294814; 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=qhnt2dJkpAm5GGzTe4QbVNjnCDc43sqrIBCwyZpio2Y=; b=lBWvr1Nu8rtsaBvfJryI5Cak1knOPQm+5tecJHcRtcjhsQljc7l+vcPE6hcq7ZpZSK j/mC16lj/cLQSp+MRy55Py96EPods82LlTAhZCVMTa3hoyV4fpIAA+1HH8HNkWptT5Lj eNnFxJD6YoDHrUEdNYtHkKh6210EmaV0atEUHO1//o4NKX7Wokvf4f8kaqjvN08ANlcY 1hn3y/+rjUgTjQiiOKce8jREtepNHEK+1dvxLgOPtxJPASKWOeqCU5IRZVVngaLa5sDE 0GgO2n59Cln4/LsT+LdmLdxevHIYDJDkODa0hCcWKW6ZixoAYcKBo4wvVCDYW8miD4Op kv9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789690014; x=1790294814; 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=qhnt2dJkpAm5GGzTe4QbVNjnCDc43sqrIBCwyZpio2Y=; b=o/qBE7K/fjHMkp9LISWtD9UfnqKMrxPyZkopH6P76cKY2Rr45NgS+QX4vWOISZ3mZo 0uIMVXRJ1Ho5itGo5G2ms05YYTZiRPU8MY2ld3ZXi8jHxcCtLfaev8Fax1EDT+bMacaW d4nv+I4r6pXABCpaitaL1LE3eFf+WN6EQMMLFsvB13ceonF3914OPe3eJvKLtY3P5Rmx utcN+pbnZza3wgvOTFpD3xg6attdV4cGrnvL5RUFpY8zcVUhjY+rAXfH8OEtlMtIGcWm 4RmpaHKAgwgzlkZGiHVJHA8Ma1xy9w95eIrGwxdlMEYaS8AQsNxtPy/uAz03FYJ48J8W ZGOA== X-Gm-Message-State: AFuF++ldQXB+7ZplFPOemUaL1RLNVq+s5KC5BFU+168JFKAUXd1mhcXx kCZKxPjTdeYHHyyLF8QBvhoRnYpyi7Z1nmLgYDVKhSE8XHF22cKL38uMycqqCXtTLcI= X-Gm-Gg: AYBFou2c4fMVdUkI/xq1dNmVPHI2J/JSeW7kHnQlEqBKtnidNK0uDq3ZR7GLfTk+K9f cWXODY+mCNpK/W/qB3I2Xgk49PxDHnIwBN3tBa9L2z1hv/J1JVKXOFmS0mAmGrW+PKNxPUfG9jI i3oyAOMmKmizVAqngYwmSIJJ6BZDIuLQFXoFdnIfTgk9W9vzvxxra4Onz26qMjGBg10Hjsw+WVl kUyWIS99yWus4OdU1Mdfnd27v/wmMf0pvWo12BZh84KhevqDCvLJQbMcscHYwGOAfaQMTzui/bp 9PW2jEokGzotkSLkfuPnb8diT1ZQiNEOkodzVYVVA0yt2JyY+BPusJ4J5+ryDiiP0FeWTsFlsqX PABQ1/8tiSuuq44+lth9DkBKJ4nDxOEJBuDF1d26d3bFx+P9AZO0rQQqIkq5IjSiaMHu+nemPMF ZMK7Sb8DkijGL6Q1RL3DlD4CaAMvWw7upHBCg+PK1E2K8lgKfI5+VKBq3GVY7iPeLRqhlkkLiEK fL84VJPg96BmEnd4w9ARvXw9jf7j8XU X-Received: by 2002:a05:6a21:596:b0:3d1:deec:9265 with SMTP id adf61e73a8af0-3dd8c3f2321mr1152234637.6.1789690014513; Thu, 17 Sep 2026 17:06:54 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Cc: Xianglai Li , Weiwei Li , Alistair Francis , Stafford Horne , qemu-riscv@nongnu.org, qemu-arm@nongnu.org, Jiaxun Yang , Zhao Liu , Brian Cain , Laurent Vivier , Peter Maydell , Pierrick Bouvier , Paolo Bonzini , Song Gao <17746591750@163.com>, Daniel Henrique Barboza , Bibo Mao , Chao Liu , Palmer Dabbelt , Philippe Mathieu-Daude , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Liu Zhiwei , Max Filippov Subject: [PATCH 1/8] machine: allow -M name to differ from QOM type Date: Fri, 18 Sep 2026 08:06:32 +0800 Message-ID: <20260918000640.1001-2-luoyonggang@gmail.com> X-Mailer: git-send-email 2.52.0.windows.1 In-Reply-To: <20260918000640.1001-1-luoyonggang@gmail.com> References: <20260918000640.1001-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:3b::c; envelope-from=luoyonggang@gmail.com; helo=mail-pz2-x0c.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: 1789690148182158500 Content-Type: text/plain; charset="utf-8" - 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 8939ae16666..3cca243c3cb 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 dba465efc2c..d397ffb3c2c 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 9bd7664b85c..456b3a8e10d 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 20:52:10 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=1789690108; cv=none; d=zohomail.com; s=zohoarc; b=XjYi9n00G9DrH0c55f1OX1NUXtdOARuIVPzzc0WNWsDJPVFg3EwNK2JVA2F2jIjiFW9fSdaHq3Cp3lo1qJ7tx9oNoRyMpasZfCzoFV8+fLvAvRNvRmw0MbHrKEdyERfauKWgiVfHPtvyLsu1KOSnTuK+q57x2l21ZZs8TD71W2k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789690108; 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=uW6FZ1Hr/xnFGp6V/UXuRySYDmLzTaOM2yV3AYLNlL4=; b=Es4dc9x3ObObxhVhAvloduMPWn2LuwWuKrGYlDpjtL+YvysuNnWycG20ZZThzFA+Md8mTtqkg/yEm9saalyBsJ2NAteUbL1qtw2l+VafZzzNUflqTJM1QmQBoy+Vio7iOxQnz6MPLTOpn64SmRieSgAZdzplFsph+VKEtKkLqQo= 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 1789690108244790.3492927533599; Thu, 17 Sep 2026 17:08:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7M88-0006e8-NO; Thu, 17 Sep 2026 20:07:04 -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 1x7M86-0006dZ-Mv for qemu-devel@nongnu.org; Thu, 17 Sep 2026 20:07:02 -0400 Received: from mail-pj2-x11.google.com ([2607:f8b0:4864:39::11]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1x7M85-0004s7-4T for qemu-devel@nongnu.org; Thu, 17 Sep 2026 20:07:02 -0400 Received: by mail-pj2-x11.google.com with SMTP id d9443c01a7336-2dd4b43b20bso1011275ad.1 for ; Thu, 17 Sep 2026 17:07:00 -0700 (PDT) Received: from WIN-BH9M8FJACR9 ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id 5a478bee46e88-33bf5b1d335sm20328212eec.28.2026.09.17.17.06.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Sep 2026 17:06:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789690020; x=1790294820; 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=uW6FZ1Hr/xnFGp6V/UXuRySYDmLzTaOM2yV3AYLNlL4=; b=DHgpaMCgl7JO2aeeg8RcrwWhM67S6LouxaP0zonBqZ6eIeTJYSxr9hKpIXkcQlUHeO 8xf20Qbc81ia4AufPlt8NZh7G0qJMTKiFssERUvoQhPxCEKOjSpMbemZGniAeCg5bnd9 S4+GAGbBSicfu1hDp+qXShbpmoaifjPixAu1etODzUb4iMJfCC4IxkKC2o/mh212u4Bs CuJjNPLpguYr7gTViU7SlrOA+2cG8b19pqUcagEJSvnyXKJXAFNxUJ7x/WoIu6IQf0KR grAnzA/iB9E5xsiWj3breJQNOyAT64NoQCt7P5niXXNKFYJKaxuXwBIapODvi/Eci48I Y9DQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789690020; x=1790294820; 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=uW6FZ1Hr/xnFGp6V/UXuRySYDmLzTaOM2yV3AYLNlL4=; b=eS+COGGlngOmB2h7qAgMJ9OahgWmm3LVLoYBNIz//jNVvQiMNPibdtoVNKQuyhd82W 1C8P1RLUdV21mSK9SCLyHuHLhPBkVickcUb2oYNE8aFJB38nZ6jQLnQgZ8uybY8o2EWR NKN5vyoCDE3uHQh0QEZsALxLg82Pc7v7HW8Mkmak1oUbpEuGLOqyliqeG59o94qDrH+I ecE/w6Clb0/HZc7zvsVnQc8XD97EfWz7Iq5wzIm5gWbAOCfSuMwoYLa6QrvxrEgwwodZ FoK6828w15n7MkAwJyW1jNEIBc4vMJMTA2+nA5oJO3jAsOAy56fPr4g+4SimFNImIDmE EXRg== X-Gm-Message-State: AFuF++lNYlG5Bqbk1oJ3At5hMN7GnRzphtfu7wMGDLfl9IIKwZIGzmxJ 0hboCTJioKD0vSlFKHYs4xufR5y8vgluMuVr7QoGq4VWz09tMWLubmWnJbQ1Z9oMKik= X-Gm-Gg: AYBFou2sgz3Mu1brREqM9hwGjqv51qJEh/N3FuicdKv95sNH134htPzJ50Y5trA3zeQ sGsvWFqw/vlXdbXy4djF6hV/dkizessBJ316hjscqFWB7x7L8Ef6TvbxzNz6h9Nz+tY8YYulv+d kz/o1clzVWB/ScWVJDptf7GmBdnN20rb0EREyO+WYwhn9rTs0Y0jIaI/bKJRkyZG/0yj6umvfUA bY3l+aXTUKf1+4tUVZl8hATmwj6HDewp+LP7xz44JusaZ6QVccXQtZm/TnoCYYQlIcZ+JYwvQzM gm9U0iaRywslxNKnwdS17D0S+a3I9EnUY7rU1Up/Gzf8rUYgtOnMUhzC9uVYRynMAVhcL1ImQib lKfifvndsJxnYUOllyPbpylB2Lkfc3TqMweUhYA8dAvpfm7UG2pMlooPtkf3HWJ/T2DMDH5s59M dPWIubAu+4wjnrm84+n3cbULw7bVvOEcGu38E2xkTlEPD4nbE2kyYDm1Wj0ZUIqZaC3roD7VZnX C5i7b9MnqVUKf0QmMcoUSR6nohVyUkBotIa8HXyB70= X-Received: by 2002:a17:902:f690:b0:2c9:c952:6e9 with SMTP id d9443c01a7336-2ddb1ab3becmr16179265ad.2.1789690019662; Thu, 17 Sep 2026 17:06:59 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Cc: Xianglai Li , Weiwei Li , Alistair Francis , Stafford Horne , qemu-riscv@nongnu.org, qemu-arm@nongnu.org, Jiaxun Yang , Zhao Liu , Brian Cain , Laurent Vivier , Peter Maydell , Pierrick Bouvier , Paolo Bonzini , Song Gao <17746591750@163.com>, Daniel Henrique Barboza , Bibo Mao , Chao Liu , Palmer Dabbelt , Philippe Mathieu-Daude , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Liu Zhiwei , Max Filippov Subject: [PATCH 2/8] hw/riscv/virt: use unique QOM name Date: Fri, 18 Sep 2026 08:06:33 +0800 Message-ID: <20260918000640.1001-3-luoyonggang@gmail.com> X-Mailer: git-send-email 2.52.0.windows.1 In-Reply-To: <20260918000640.1001-1-luoyonggang@gmail.com> References: <20260918000640.1001-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:39::11; envelope-from=luoyonggang@gmail.com; helo=mail-pj2-x11.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: 1789690110480158500 Content-Type: text/plain; charset="utf-8" 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 --- 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 20:52:10 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=1789690092; cv=none; d=zohomail.com; s=zohoarc; b=aCjac2xYhnbF6bA9jK19DoYgDaAuy+rpqm2TmdfPchWppi6fKNp4rHmO5aPeeXswEYeAWfwEFQ0LEzlcKkGIaWnJVHZeQiUY+7JgU7LtKuuRr7rpdTmWlM3kShkk+F+vpnTWgKZZNjtHNcKFY/LatLmvx+BU03V6cps8QirYl2U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789690092; 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=ZEMtFIfZNRZAXvmyI7lep73l5ReH37r60zcF9WOmkRg=; b=hdQpgO4YOiJQgr+pKJ3SUPTj2mLlOlzyE9qXlMNWkLRoTiTrMRGW6EuK7+MBoT5Y0uE/sBEFXHG3lZaZGdEGl/t8MV4lx8XcNvZ7JNpKfXQr/o2CXaiHNQcNubpkPZFMTuvWFKT0Cz88FfAM6C9gAxLhysXmsIIgGDEYzf7Q2m4= 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 1789690092314106.31066694302433; Thu, 17 Sep 2026 17:08:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7M8E-0006fD-4D; Thu, 17 Sep 2026 20:07:10 -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 1x7M8C-0006er-1b for qemu-devel@nongnu.org; Thu, 17 Sep 2026 20:07:08 -0400 Received: from mail-pz2-x0f.google.com ([2607:f8b0:4864:3b::f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1x7M8A-0004sp-Fa for qemu-devel@nongnu.org; Thu, 17 Sep 2026 20:07:07 -0400 Received: by mail-pz2-x0f.google.com with SMTP id d2e1a72fcca58-85469d20963so122756b3a.1 for ; Thu, 17 Sep 2026 17:07:06 -0700 (PDT) Received: from WIN-BH9M8FJACR9 ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id 5a478bee46e88-33bf5b1d335sm20328212eec.28.2026.09.17.17.07.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Sep 2026 17:07:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789690025; x=1790294825; 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=ZEMtFIfZNRZAXvmyI7lep73l5ReH37r60zcF9WOmkRg=; b=Q/ix6PlHD7B/0BlftcWMKCVPhBn1Sy3bJB+y695mDs30mjltmJIdkaWLwDFFKntufd hMSAuQu87OODzPUjH5b+BtpwSZZsPFqG78uF7VDub6gUqTvaSBLpWUJaNKarIiOKL63g GgqsgAvZYEY3irLFrNvtEVYfbc104IYqCFGAd6eV0dmg8L03vdIG8PfegnRdptE2Msyo zS6XfRSWG35N+6rsowJuPgVoKKEWtkMUcGWXmBG/oig9iv03MlMOm1VgJ+1f6fEo3cIf dwlZ95h1qOD9iKQcH+Q01Wo/3JCSZTEzscMltIQXHQ6si4nF6/k5majOJSXGmWMQsmzX QPcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789690025; x=1790294825; 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=ZEMtFIfZNRZAXvmyI7lep73l5ReH37r60zcF9WOmkRg=; b=QlCVqEn4IUj63XxmYOX9XSfwnk4viRK1qLzNMwfgpWcI+kBkvhSapLx5RTTBXATz4h IM7YLgEmHQ2emb5aks06Rq22jIhaDhLVT3UWL2rUG54ZchLnDTQt95r7mjg4sCbbGRyk PocWljyLmP1zUi/HAA/tN7TGzkcwLMsIoin21X/7U5+5R9T4/Iu5HAT+ePhOyjTqmyaK pn1yZINJid7bwgU0yOBcN5NmtVCM7qt4DHuCanr2wp/wTFaTrulb0fqVDvfzDg2nVB5e zmig4PuVUl1Afr8Aep7WhTPw8YJtuQAfET0CMd0YrS360KMq1RM75McRy46Ual3utnEn fv0Q== X-Gm-Message-State: AFuF++ll47B/PQ9Trhn65hbcWyB0gW6iaKleZA+7BGw8wt48raU2QQW9 POTFofU60Bh9NuAT6KiRPYX8oY8qT8nDNo75ilMD7zCq+4K39oxKEgVqh1t27nYUmdA= X-Gm-Gg: AYBFou0G8e8TgF0B6CFJRObYGz+1NDCPi1aO/mESWij8oEjTR6vJ3J1RCGZxUUb0XwN 9z7+/whRsBcQwQQFOxjOuOfW4htImC5R+hKuREhfY6sqU0MdAYGSFkW5RD2O3VZIBpE1KrvekJ4 cwuHcb3tjvGDoahlx/0Fngqnm9GFeCcy1kXOUqsxP3UDa9k4wvdJKNv4CgX95iuHQa5r+B8t07c sc0fnMSExxpkk2U8y4JARWG70LS/vnUzBA6oeHaNcqcHUv8JM1kFxaI30fZHYKJ3PH3BAQ20ZhN qR7YJLCJ4SlqyPhtcOY1Yb6glX9lok9yb9yWUUr/6dIResbQ0R/wRKTX8ydw0i/nVTxZ+Z51kJU warQSZoQnuMcT+sV+cjF2xeeXLL4bdoLiAdCwazyT/pwQbqBPYd5hPWOjoExiSCistOeQEbvGOL uj2qycNrQvAB6SB8xIwhnvbbKIcU6dXweBT/bQqfNnqVmHZZ/FqoF/PZPou70D4W06x73h8XMOy cid4jvosfwoin+facmha7mV44U3Ublv1umDvm5Aq5M= X-Received: by 2002:a05:6a20:2d06:b0:3dd:85aa:4524 with SMTP id adf61e73a8af0-3dd8c4f0987mr1362147637.31.1789690025022; Thu, 17 Sep 2026 17:07:05 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Cc: Xianglai Li , Weiwei Li , Alistair Francis , Stafford Horne , qemu-riscv@nongnu.org, qemu-arm@nongnu.org, Jiaxun Yang , Zhao Liu , Brian Cain , Laurent Vivier , Peter Maydell , Pierrick Bouvier , Paolo Bonzini , Song Gao <17746591750@163.com>, Daniel Henrique Barboza , Bibo Mao , Chao Liu , Palmer Dabbelt , Philippe Mathieu-Daude , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Liu Zhiwei , Max Filippov Subject: [PATCH 3/8] hw/arm/virt: use unique QOM name Date: Fri, 18 Sep 2026 08:06:34 +0800 Message-ID: <20260918000640.1001-4-luoyonggang@gmail.com> X-Mailer: git-send-email 2.52.0.windows.1 In-Reply-To: <20260918000640.1001-1-luoyonggang@gmail.com> References: <20260918000640.1001-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:3b::f; envelope-from=luoyonggang@gmail.com; helo=mail-pz2-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: 1789690094496158500 Content-Type: text/plain; charset="utf-8" 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 --- 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 20:52:10 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=1789690105; cv=none; d=zohomail.com; s=zohoarc; b=ZpJBKahV+wydP189MqwBMlj0txYe5aojcBsMiqtA5BJ99N0iRimBcBEih9BLopu9dGQVJTWq61LXgGSq41e+OYxdsHm0yco8AE2kyAl7VgUZ/rU5O97o/eN8UrDH27s+JkEnyvmPR7mUepeMDc2HvUkSyD0IZrAqJSle17qoNh8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789690105; 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=FFu1GWUOTl4gGw9oxLcpuVAdjKyzH7fM1wcdIhlx/50=; b=Ra8aKl3twSYWRsmlYX2GlciUYzyihgP4QBMkuqKbJhsDkpRw5P7TfvV24/GQmv8dU/jlelf5tbV2VA3ZCQQYZBPqUEA3pqwTLeeiFuEkNK2V8adsVToz9cvGoWJ2DHuqRy9pKM1URdrB3HhOG/qaAvlWjXJvNGvP+LrTvTe2u0o= 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 178969010559035.11500634342394; Thu, 17 Sep 2026 17:08:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7M8O-0006gz-QL; Thu, 17 Sep 2026 20:07:20 -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 1x7M8G-0006g5-U4 for qemu-devel@nongnu.org; Thu, 17 Sep 2026 20:07:13 -0400 Received: from mail-pj2-x10.google.com ([2607:f8b0:4864:39::10]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1x7M8F-0004tu-EN for qemu-devel@nongnu.org; Thu, 17 Sep 2026 20:07:12 -0400 Received: by mail-pj2-x10.google.com with SMTP id 98e67ed59e1d1-396ccd4f99dso200380a91.2 for ; Thu, 17 Sep 2026 17:07:11 -0700 (PDT) Received: from WIN-BH9M8FJACR9 ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id 5a478bee46e88-33bf5b1d335sm20328212eec.28.2026.09.17.17.07.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Sep 2026 17:07:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789690030; x=1790294830; 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=FFu1GWUOTl4gGw9oxLcpuVAdjKyzH7fM1wcdIhlx/50=; b=CbirgYWo/IaNM6BqSpiIi2al91SlJlRMMol9gJsHm7A96+QmMsQVD6V/LI537MY31G BEZf3juv52688sY+tkUlc/quCJKuPZpeLTJW0k656iP9mUqq/kEfh51/34okcQjsvJmq gMUreU3TQSLofCADezP8o5FHgxS1co1n+H9kTROHk0aqxIqr5gLlRqaqaNr6zqN/DJPY mGy8UTGf8/dLJK7Nt/WCCw38q7+MoCCnv9qjIkAv1Xd8J3Hqmmp6240X9ckIAS8IaAj9 B+OCJUTVoGkbUpX6cjkIZ4XyCbbtBd6z5PH6sJykmZKsfxl0rqC818l2yOYdWm9J4jhf qrvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789690030; x=1790294830; 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=FFu1GWUOTl4gGw9oxLcpuVAdjKyzH7fM1wcdIhlx/50=; b=xGmAS9L/6YuTK97ua2z/jkxl8I+xqaHEDIoLM5clqyIpXIe8tRsGDD/nfoZK6aMhnr 5PFYlr8yYS9H8cx2S7SP0amPXkyx0YiUStqKAiSgTgyrAYiT1h2Ap/1y5evZV9FR7fLu VcYjJ7ssvxwGYVBd5N1M2sY/KipMPVRI/Se4nRur2k0F7F46OIN+HuyCzlD4B4x+aH5T 9GBgptKMyOU8yjKNMkDfiNotTwR9Wv73nFvje6LJrytxIi3epEJmXgR5x/ihEAHlvmNZ M/KKotUOxvMNFLlJAfKso1NDArnQLq3E+mpgZeZ2cMTf8CQ9jBUpAW9E2PMpFLeyTTRU gYSg== X-Gm-Message-State: AFuF++lGFO6TZd/tcdOK/2y2DIL8/c4WXxGYivxjKo9xs5LIbhUY1u2W 0o2Dy5mTjgYCJwV1HUkR+mevZcoFTeFrBkDsoh0UfxqhjVXt+/IZAqzC3zXtxlPDNxE= X-Gm-Gg: AYBFou0xTX5LT1rn4AWJpkRW6Jh+Gw5oOJuSUFL1N+hgb23MFAtOUP57kWOa3nUbIOZ TxuXaRMWMyTcXD+K9nCTNzxJt8+tYYU5JEOzVh/3rCH5QEfv8IaYz62xsEuEWsSpQHGKTjzb6ka aq7H3qbulGezdKbi3ctwjCuUwOq1HezYQqd4AjCrOr94UxKyGWWLQFiXu8gIarm5te0WQugCMr8 ja8zE1qJA9lGfOMxawlW+cjbkoXqO1+LAB1wfmjV1uPANrJM03ZmPj91euISIkohct2H21jJTFu tPAJ/hc+NE4eA7NZHE1i7KAq3SG85lxABs4zxkbxm6sbRLZZSteKIsDMiRKKEdwywm2enfYfeB4 4obIL+iSz76HEXycD9ORqUmgtOF6gc2M2drAmBYFoFnTO1Az9LvLwkHaRwtV6AcayrKhABtDUyu aCspx7zkmwogeoPkxgnYHv0xTGEk3BJqag+0E3bCm1w9Y5kg3nLv+8pjjAmyWZjCOqHmGRuDHaT h1VLJ0rL5aFlgCwbF7KeAXkFh2biYIwxX/LP7TQyGA= X-Received: by 2002:a17:90b:224a:b0:39e:4c81:6c99 with SMTP id 98e67ed59e1d1-39e54fa5deamr1509803a91.31.1789690030121; Thu, 17 Sep 2026 17:07:10 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Cc: Xianglai Li , Weiwei Li , Alistair Francis , Stafford Horne , qemu-riscv@nongnu.org, qemu-arm@nongnu.org, Jiaxun Yang , Zhao Liu , Brian Cain , Laurent Vivier , Peter Maydell , Pierrick Bouvier , Paolo Bonzini , Song Gao <17746591750@163.com>, Daniel Henrique Barboza , Bibo Mao , Chao Liu , Palmer Dabbelt , Philippe Mathieu-Daude , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Liu Zhiwei , Max Filippov Subject: [PATCH 4/8] hw/or1k/virt: use unique QOM name Date: Fri, 18 Sep 2026 08:06:35 +0800 Message-ID: <20260918000640.1001-5-luoyonggang@gmail.com> X-Mailer: git-send-email 2.52.0.windows.1 In-Reply-To: <20260918000640.1001-1-luoyonggang@gmail.com> References: <20260918000640.1001-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:39::10; envelope-from=luoyonggang@gmail.com; helo=mail-pj2-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, RCVD_IN_DNSWL_NONE=-0.0001, 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: 1789690106209158500 Content-Type: text/plain; charset="utf-8" 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 --- 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 20:52:10 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=1789690122; cv=none; d=zohomail.com; s=zohoarc; b=KZp6ABUX0RQ8jBsIOE+x8K6Eo9tVhw9EtVrNqn10VrLkQW2H28WbvmmVTaX9qmZhmr0RV31YlFD+ZVvClwk8kE2TCT9bHlqvKfj29NBq7r4kpxJ7+OImOoLNCRpNIREadkIhSbHNPnpZN8NqjJS7u5AS15mDRb5ysGNGdxFqA68= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789690122; 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=ir+Amid76CJDBxcDpBtxUQFPmnGvNXoJ4vUbradoghY=; b=YLHbqk55CZKQxrqo8u64OACAlpQu8vaiM7tM+wRMtfFyoAPxj4BO1asfLNOpwBMYwbPX0ESdsPxvMmIi+oR4VaRcAWrO7X27xjq4AvZk2lHxMWN8MTNH9HjSvrhXBOdQP5svRgLodU7bxRmeNqM2THrzkbM/7TB2nwJpSt8k1Oo= 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 1789690122055743.7109252667999; Thu, 17 Sep 2026 17:08:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7M8U-0006lU-8o; Thu, 17 Sep 2026 20:07:27 -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 1x7M8N-0006jg-N5 for qemu-devel@nongnu.org; Thu, 17 Sep 2026 20:07:20 -0400 Received: from mail-pg1-x536.google.com ([2607:f8b0:4864:20::536]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1x7M8K-0004ui-Qn for qemu-devel@nongnu.org; Thu, 17 Sep 2026 20:07:19 -0400 Received: by mail-pg1-x536.google.com with SMTP id 41be03b00d2f7-cbedd5aece4so1047653a12.0 for ; Thu, 17 Sep 2026 17:07:16 -0700 (PDT) Received: from WIN-BH9M8FJACR9 ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id 5a478bee46e88-33bf5b1d335sm20328212eec.28.2026.09.17.17.07.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Sep 2026 17:07:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789690035; x=1790294835; 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=ir+Amid76CJDBxcDpBtxUQFPmnGvNXoJ4vUbradoghY=; b=J6xk+1taRcptJGk1R9ymBHH10pGHOUxRL2qRdlsuOhOQSCkR9umREtzP7gPu7u1vjg gK3aq7KuVoyFlXOqujBZUQahAAUX7Do14nppnYdWgGcHPDfJ7d9UAu7+J8Q05z5iUWF+ 3Mkz8iBTN8IQRygQoyKxUHYhhRrDSMOgPxDc64Apcm4BnrAQHLsOHc6KjfWAjdut+s7P ZvR1dWQ0uqKtdbxrWmdOIQubYYpDC+qo5Xa3Pz3yK5gO841UdIdRaFW6DQvnxvlBsmCP 6kttmuv603H+I4kogSLx1r8BD3wjnlEdSrQMOjqalK0dYNKf8S1mDH8nE827YfYYmDk0 HZfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789690035; x=1790294835; 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=ir+Amid76CJDBxcDpBtxUQFPmnGvNXoJ4vUbradoghY=; b=A+E4I2Xl3NyCcGeWjl1miHdTMB/+6ep6fcgRwh+MV/453FT648L1AhnmFSIr6e1Puc autX+Oe3R5BI8gGyeDE1GKVt2lNNenBuW1BF1qbb/GoEc3pKD5NZTpDXqJG2/RR41sOZ UfASsxIHdMRUCD0J67i5kKIdNHUCoXXItPg4lMWqg8e8M0jsbZbOB3Ax1ZeMe7ZKe+pI rZtzpl8Gtt2OnLwSfMcywhmkEC/3ZKAAxTWgW3dK+fNWKc/bcQmP5uTDzhDQ3PjaZSe8 zvrx6zqJhZXAVQCqTl2D2jw/5QXRMr+cqpj4n9q7TDwlYmGP0hcq3H2V4K1VAM2pBMaQ 33dg== X-Gm-Message-State: AFuF++m8t7ic8c5QNK7tbItkrPBRonlan/4MM+2D/5MqXdVFgirWpevD MsIfU0Ky6fw54Bn9au/gRx+3ZCuoDDaxccT2/S46OusHjOKy9d6SnVocyquxjPMx5xM= X-Gm-Gg: AYBFou3w9NRWYtZ1k1inzjF8xhPP6aDZksNvGDlEJS0IvGTkw9r82NkBKxQenEqXp7t q7LsUaVBK5Itrt8BXG55TmAcTVPRpYOSxASuIQUJuCXN4Xt1/+4vpvgIb/dF8eQQM5y1vNtSTXm JNmFSfVqVX5CbCxAt9/BqC5HffKqumuCCv5wZSBXAUmTtKcjHG95Q6dxT+OTvvbtA6E681+LCBm zGyrmoE84SJEh4JiFnrfznBxWgkEW1bmULMPATSnxGB5s6FQSzKP4h/khBx4ASqkFRyM6NEPyEK RhCdMkVB0eFJMUuSbYDhgR2Y4zJY761/aYTI5MbyVWs91nKubwleze3ykIga8RsdOiwrtxd1YO0 /mE478zHM/mg9jEbRb10KYwUDfKOeh3NVzbO8yZCv3j6TZ8pQlhGdzQ0zuveryIcVlmqxbgjmax /acHHt7xihqRKT/J+4u//fk0PNaF/z56C6MIOdIMK62kbrl1IyJGtru16k/midOw7Za3nqqIXep qOkdsToWJMq2YI9JwK00+irBpEq2JTx X-Received: by 2002:a17:90b:57e6:b0:39e:58d8:f899 with SMTP id 98e67ed59e1d1-39e58d8fa69mr384832a91.35.1789690035270; Thu, 17 Sep 2026 17:07:15 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Cc: Xianglai Li , Weiwei Li , Alistair Francis , Stafford Horne , qemu-riscv@nongnu.org, qemu-arm@nongnu.org, Jiaxun Yang , Zhao Liu , Brian Cain , Laurent Vivier , Peter Maydell , Pierrick Bouvier , Paolo Bonzini , Song Gao <17746591750@163.com>, Daniel Henrique Barboza , Bibo Mao , Chao Liu , Palmer Dabbelt , Philippe Mathieu-Daude , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Liu Zhiwei , Max Filippov Subject: [PATCH 5/8] hw/hexagon/virt: use unique QOM name Date: Fri, 18 Sep 2026 08:06:36 +0800 Message-ID: <20260918000640.1001-6-luoyonggang@gmail.com> X-Mailer: git-send-email 2.52.0.windows.1 In-Reply-To: <20260918000640.1001-1-luoyonggang@gmail.com> References: <20260918000640.1001-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:20::536; envelope-from=luoyonggang@gmail.com; helo=mail-pg1-x536.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, RCVD_IN_DNSWL_NONE=-0.0001, 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: 1789690124098158500 Content-Type: text/plain; charset="utf-8" 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 --- 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 20:52:10 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=1789690119; cv=none; d=zohomail.com; s=zohoarc; b=KeaaBWB0WW/pGx8K0Iy23NN2fm+Uf1fSxvcZN3+bfp8ZEOeYLtkH0/0FVLpdUlEDPxKOvKMlZgfBY32aRmYt7S+oTtbMOCORZlCEsb60V8I6Bsbwf62co2/Y6woHzukTYtgg9goV3xkarrJDgZZShFRUbG3cDK1lArLzDJqLxY8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789690119; 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=YOVPYqT9U27F/5THFDcioiKO/qOfS51eimtoaATVi/U=; b=m19JFgVIJGS+Ly7BtBNpo9Z5NPjun3+o7vhUpJZfs6w0qqqG9BlpVyQj4VP1m6XzwOx7zmwiMdypVqLxrTo834PJhqqYe1mzFC57X+7IV2lGPnx+X9hH3aL86tup1TPGtwP736p4JiOdP2BCVGpTc3B485BkVbulT0HwTPplzW8= 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 1789690119731927.6304160273419; Thu, 17 Sep 2026 17:08:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7M8c-0006rJ-Dr; Thu, 17 Sep 2026 20:07:35 -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 1x7M8T-0006lm-6b for qemu-devel@nongnu.org; Thu, 17 Sep 2026 20:07:26 -0400 Received: from mail-pj2-x0f.google.com ([2607:f8b0:4864:39::f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1x7M8Q-0004w0-AW for qemu-devel@nongnu.org; Thu, 17 Sep 2026 20:07:24 -0400 Received: by mail-pj2-x0f.google.com with SMTP id d9443c01a7336-2d9004a1ac0so956285ad.3 for ; Thu, 17 Sep 2026 17:07:21 -0700 (PDT) Received: from WIN-BH9M8FJACR9 ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id 5a478bee46e88-33bf5b1d335sm20328212eec.28.2026.09.17.17.07.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Sep 2026 17:07:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789690041; x=1790294841; 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=YOVPYqT9U27F/5THFDcioiKO/qOfS51eimtoaATVi/U=; b=FwQnsATnffoylCAb3Nq1868H+d8NzUrO7Y4/wB3FA2VP4+HHXYflwAh6dyKP57Pmpq sxwyfBcK8E8xi4jfNQbwBtiWsY4xUwS/Hn2YXuzEAjv8iJmmIe0Hi1hEt3EjBMMrJsPh KzDAERNA0uy+IWrgWsp7LCKxGDc4htend3ksftICMftz2/3XOGeYF4sZIGXTZhWsysJC jyxQzWYtzcQpeqBG4F6unTMvEvb014dzaLCP1DGeg/DXZs892X6kr8Akt17wGsXeiXtd bGw8FK4ZMfQ+hj3zPq3hv51pxVJHc0LravdnfLMcoQsqjcGSia4B5byqxt+VuqPvhPft jYzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789690041; x=1790294841; 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=YOVPYqT9U27F/5THFDcioiKO/qOfS51eimtoaATVi/U=; b=2RVRdQ+mjMqSjb4wQRt/aGMptdNsgm5+PPr8I/wZPpAkiQq2Rw678Nj1vGkQ6k0DRP 2VgbkKs128I9K8J6gI3oGEBqoJR6+oqlKYfakbVmU+ap70GmW5H8jvRNzkrxbmHwHcUL Jcz+muxsWwXD943tqAjKfwpKU7IVC6L/VbpdhlsBE1zsK5xujp0KCqiGc/5Fr4EDFHCj Hxi0Y1C33lqJYuSC+Jd3Z6xXjoCwYtZA+FUpDOAbpO1v6OiCJda63UFEqBe9KLRAMwV0 aAbG/j8uYTN0KFWbo7XEORZeh/ToXUw2co/ZV2ZOZxOYxcG/vJGVDdyjkvi+5ZhlP5Ff CU5Q== X-Gm-Message-State: AFuF++nCJvoXGObhL8YZMdZFlF/wtlBMrtXmoGy8MWInWa5lohLuMG2U jFizz5zonIQBcGXxNlbKSfglu958DHjXCjohzDxujKQ0iXlsaP5zWCP5G5VHSCNFJLE= X-Gm-Gg: AYBFou10JjGMENtut6W7oeuzJY1bvA0FJKj8dVjI3W0jS2LMfMR9e5NDUHBz8Y/8MT2 yPywAbYMmB1HudMiDruYG/n+FQ1dk3OdQo8l+075uv5Zua6PvcBHDT8up3BJoM6VctGxHmLc9HX wicQu8Uah8KbOzdMYapJFURAK2/VgBX2RwwRgq99nNdiC9E5MTFm8BbNmsdD6hm8ILCsIK0rdb+ yVxESU+CLARKcMReWadpzVRAsTrhxyFOJwfYFwAAMWdj/kx6WjMB6itSmw1mlxHjNIBJi9z8f9G snpn3batrIVNxiqkeC8WzEXKnAOGWFjD7wZGlDGweMZra/znCZSXgd84PwfPMRxpXID+bUr2uSt +sl84JnT+e5bhgqgQH5YuXkwv9EbyE635QmKj3J6TR9viSwAeD9Jga16Y1bhbyvnuRYl0gA574H bigZI0N9YpSTFmConwZKv223A4JFwgZmpkG6P8NYxT+CuG70L9r66tS2oWoLqL+z5SA1nlCT4qu BtXd1f89laqxs2LAsfHdMh1Fz90CNov X-Received: by 2002:a17:903:2f0f:b0:2db:31d5:1448 with SMTP id d9443c01a7336-2ddb1b993d7mr14893815ad.22.1789690040584; Thu, 17 Sep 2026 17:07:20 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Cc: Xianglai Li , Weiwei Li , Alistair Francis , Stafford Horne , qemu-riscv@nongnu.org, qemu-arm@nongnu.org, Jiaxun Yang , Zhao Liu , Brian Cain , Laurent Vivier , Peter Maydell , Pierrick Bouvier , Paolo Bonzini , Song Gao <17746591750@163.com>, Daniel Henrique Barboza , Bibo Mao , Chao Liu , Palmer Dabbelt , Philippe Mathieu-Daude , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Liu Zhiwei , Max Filippov Subject: [PATCH 6/8] hw/loongarch/virt: use unique QOM name Date: Fri, 18 Sep 2026 08:06:37 +0800 Message-ID: <20260918000640.1001-7-luoyonggang@gmail.com> X-Mailer: git-send-email 2.52.0.windows.1 In-Reply-To: <20260918000640.1001-1-luoyonggang@gmail.com> References: <20260918000640.1001-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:39::f; envelope-from=luoyonggang@gmail.com; helo=mail-pj2-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=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: 1789690120120158500 Content-Type: text/plain; charset="utf-8" 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 --- 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 20:52:10 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=1789690119; cv=none; d=zohomail.com; s=zohoarc; b=AzXR5ic1ugTRdkUco/AH4UKl23nTTlqK0OqSvyccvE0XvTsEb7oiuJ2kke+lt53I7AqVTwAPJtnl+R78UXdca1ZAT4+U0pJXEDw3+aJVmkwZTh9fCz3ky6mFoUWEavJiKjlSpr902W7U7k7xZcpG5nHKpFX8exQxKqT6x02r/y0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789690119; 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=2QNZBjooEwaWCMUyoLrrVewBfsIr1xO0E5E0pjxZJzw=; b=fGPqBIF8m6B7nI6ic0FQIHLqmElU0mOZaNlve54cUP84Vwxsu1Eb6AURnOA0EIUyhpXw3gHkL8mQzfm5FMXiw46PtaAktbSjR2zEghsa9P2TDDUhzAOCyiZkh4otDkiFRfeXk0J0iz8q6rPueOP+bXR1agC+S23fA1W5UApU+Ls= 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 1789690119135968.3857367808495; Thu, 17 Sep 2026 17:08:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7M8c-0006rZ-FP; Thu, 17 Sep 2026 20:07:35 -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 1x7M8Y-0006ol-6T for qemu-devel@nongnu.org; Thu, 17 Sep 2026 20:07:31 -0400 Received: from mail-pj2-x0f.google.com ([2607:f8b0:4864:39::f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1x7M8W-0004x6-Bb for qemu-devel@nongnu.org; Thu, 17 Sep 2026 20:07:29 -0400 Received: by mail-pj2-x0f.google.com with SMTP id d9443c01a7336-2d9004a1ac0so956565ad.3 for ; Thu, 17 Sep 2026 17:07:27 -0700 (PDT) Received: from WIN-BH9M8FJACR9 ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id 5a478bee46e88-33bf5b1d335sm20328212eec.28.2026.09.17.17.07.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Sep 2026 17:07:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789690046; x=1790294846; 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=2QNZBjooEwaWCMUyoLrrVewBfsIr1xO0E5E0pjxZJzw=; b=SVSot5PSq62zziBGNgg99RY2Z4BCUPzotCvLZb4cSLIHZfkd537YHAbQsLMq33sF9R /wog6PJR7Es8OE+MCewPiNZbypv7U1eb9EAbQUkzINGltIsMaVJPmeSkwxvWenCHAfgJ i2iCbiF93vDttFlSefZI73YiW7199Q4ZwI9hL4OasmlE2/yqBQf0qhetH1d5TTw1Jlfp mDQJnPN0DbUmNOBfsWEf+dzyQKRaYzCok607jjWJ6KlRlZvnze1I6EjuFEzxcYpIB6x7 fCWO9T0FbJWMMFi4gVwS6+7Lb+lJMKLNEr4O4FIuEzqdOLXAFMm3vKS++WAsJrushuqa uucw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789690046; x=1790294846; 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=2QNZBjooEwaWCMUyoLrrVewBfsIr1xO0E5E0pjxZJzw=; b=ju6g/uo8jD66LTEdHhR/G/pZZVWmz2dA4rI3ticHj99tO81HbrHkV7P5TUUV5oqFOj V94X1aXc3GnDPqX68dUcj+ZwkSxBqSP/MdcKkiYbAeLFpNSRX362UwYR/weseXPx4hm6 gY/1smU+bsEYmbuDVYBbZoEanKXXFIROa+HhG5/CycAronTqHavzTtQHS5jktMThfp/S o6w4NdlVRDmNNkF8MdwvZlkukSezDPewUHgtU1Td/Ybu6+rtG8GDf0CTEPOcA1+Mr1RC Vixc9Dj9cQYchR271ZbO0pal80Raov1aIn2NBiIKipLPTwQlrOG9WgjTLX00zdQ6swDg JLgA== X-Gm-Message-State: AFuF++neRolF00sgCZIk3NYrwS82rQ9cc+ufqZdlI9KEv8Zzh68d+6yY l7SG6PgWjW53PZd7rQ9EhNckzPMTyOqv8aPc+7QpYlIzys4UNSQEGCf2QmSicNQl2TQ= X-Gm-Gg: AYBFou1idtGd1H4H8GYeX41/q//xUTo7mrWhYT1wYfn+Y7ME58XGD4vVi8+MxSHsnUi 6dCIdIdH2phgReFxGWM25udarYVH5xzhP27m8hZDjwiY1wzpPKVXtzl1P0fNNQrqbTQ96yAn0Ta N2sCpmN7DKLL0gehVDa9Tl+/D8VXJ/i88MwfSAl6woCJVbCwuRdok/YFXSEIzfYdxUEDLGasGQ+ L54dPgtM7cXXjCc4r4xo3C9sXU5TwSY2ZiBnFHeK4KLzkQrv10cmmW36luHCDS6MqKJxhiWxtLQ zktntMFLq9YpbY/Vnr5tJAp2Z91AcIRiTGPZ/2vY4Q30dQvv5JKPVwcadHV96dpVjZkylc/Gq2a 7wzVRXRd3r/wIKPrJ6MdvK81CyjvJsccYLEOhNpkCaT12bZHMuIPK6XX0Lw5GLWXXJ1m8Fah7Ne 6isWEhCZwnfzJMv9//w6QU3Ya8iwbeWEQtzRYcxf6dIBb0ncb224rzovEyXNTpwZAq20veWr2oW OrcUkkRYdtUEo/fLoG144ixnT2YGQLI X-Received: by 2002:a17:902:ebc7:b0:2d6:ff5f:eeda with SMTP id d9443c01a7336-2ddb1a90bfcmr16101145ad.6.1789690046041; Thu, 17 Sep 2026 17:07:26 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Cc: Xianglai Li , Weiwei Li , Alistair Francis , Stafford Horne , qemu-riscv@nongnu.org, qemu-arm@nongnu.org, Jiaxun Yang , Zhao Liu , Brian Cain , Laurent Vivier , Peter Maydell , Pierrick Bouvier , Paolo Bonzini , Song Gao <17746591750@163.com>, Daniel Henrique Barboza , Bibo Mao , Chao Liu , Palmer Dabbelt , Philippe Mathieu-Daude , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Liu Zhiwei , Max Filippov Subject: [PATCH 7/8] hw/m68k/virt: use unique QOM name Date: Fri, 18 Sep 2026 08:06:38 +0800 Message-ID: <20260918000640.1001-8-luoyonggang@gmail.com> X-Mailer: git-send-email 2.52.0.windows.1 In-Reply-To: <20260918000640.1001-1-luoyonggang@gmail.com> References: <20260918000640.1001-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:39::f; envelope-from=luoyonggang@gmail.com; helo=mail-pj2-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: 1789690120114158500 Content-Type: text/plain; charset="utf-8" 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 --- 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 20:52:10 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=1789690106; cv=none; d=zohomail.com; s=zohoarc; b=hPM0PAG82NTzbSitYDoKjXCkqK7cxU7YZMFkegMORW38DbnwnGqYSOW91/Fjs5u8Ie6NhFY3KmTF/+cNOBIiOZyFpY7FvgNUileMgXpAZWLcLCBQaq/AuGk/rGlobSy396ysFPmVtdb53rGBmxfZ+UA14TAmDUGwmwQ9V4nHmQA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789690106; 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=oBMRBBSVYhuVagEH9MTyYgooh4obneZYFeG93/UBHbo=; b=fPQmn2y5m/MZHDDepwadViQXySU43E96ofCrOfw+JDyFLBzpswHj3x1hOHh3I4s+IxWFItn7Y5fHuMTz4A4danvd9va7Ed4jzT9IkkGJPZcVO56znNz9eRY7nu5OgTWCWJMNzfboXz2xI+hRe2WeoUGnQLy1nuvagDn8px3aAQg= 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 1789690106030859.5093476648265; Thu, 17 Sep 2026 17:08:26 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7M8i-0006tW-5g; Thu, 17 Sep 2026 20:07: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 1x7M8d-0006rq-3H for qemu-devel@nongnu.org; Thu, 17 Sep 2026 20:07:35 -0400 Received: from mail-pj2-x11.google.com ([2607:f8b0:4864:39::11]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1x7M8a-0004xu-Hy for qemu-devel@nongnu.org; Thu, 17 Sep 2026 20:07:34 -0400 Received: by mail-pj2-x11.google.com with SMTP id d9443c01a7336-2d91ede8035so1899005ad.3 for ; Thu, 17 Sep 2026 17:07:32 -0700 (PDT) Received: from WIN-BH9M8FJACR9 ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id 5a478bee46e88-33bf5b1d335sm20328212eec.28.2026.09.17.17.07.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Sep 2026 17:07:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789690051; x=1790294851; 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=oBMRBBSVYhuVagEH9MTyYgooh4obneZYFeG93/UBHbo=; b=rW7ccpA/QN4Nltt1nREMT98FSfbtUgQD9nvxSE4X5k52xFrL1g4ByTK/ut5arcP1sl Jh5FamRLS5ihaVn8FBJvulYX+JiVm7wL6UHn5K1rjRAqUav6uk2fpuVhbYOUIb7ZGDhe f/HvJJN8cGuGp8EvzR2o82AmmSfiT6wrDQg0YAY0NZNI8kEZjpvAqMw1sChkWjicJRVt D8iTXsKWaMd/EblK8wj1i5uDY5w+0gf4xvnMNyjSxDPRyeDYMK4losVrX6Mo6Odx0QOM M7DbuS0hrkmmrhSa0Lie3json8mNOARqJaBqXgBXZgsldmEJN6fwQZkl8O7RCwGnOI19 7GOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789690051; x=1790294851; 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=oBMRBBSVYhuVagEH9MTyYgooh4obneZYFeG93/UBHbo=; b=I4BwPtbKeRGozJjNMX7EwXMDuZmYBS8EPbbvfwy62IQbbswmX9TvqJfGlqaq58hrsN wcaiZkvtNlDeU1qp9rGEhfDiVMxA/7DYqIoZ9xK7sPeMaMOT2opmZ1Z/mXVvgVdydnwM xsT169p0Qll6LgZjepnZrOhcssX0qrnbF3rWCaO2Ywvzt8ORerRQJ87cZEOd7xh0U2hy ESlUWFatJO7UdDi8H4furg37l5WoindYUFMzKZMhX/nGCgjqmQWQwzm354bIKIJCDSDh /dCnHSiC7sZo25OTfZf1BRphNiGJSqfHf9FTpNzDLzs3LzI19FQkFhGaEBP+hGcRPIC+ 8ikg== X-Gm-Message-State: AFuF++n7zT75QIm0RcT9uNIXk9iLXRSUpECYHwise68xl+aR07MQo9yN RXK7a1k8ig0y2gq5TJij633HyJXzotlXR8OAv+J1bXuueCbuR8ETLgelMFyU6P2RU60= X-Gm-Gg: AYBFou2ID8cbPkh4UTsKewQIiSnDYKN52/KY6qpiSKqcZhsifIPt4e5/6udZtP9n6bb TFaHmoFd6dag6MJt9MFduzooNjXDPmFFn8CvFlP1qJXvq3AlYW4CzJ99J1b3KDNLvOZpu5Kydcm 4eIzcXvshiInWR7QWGy4d5XIHE9oglv0TtACgetdZ9gCXnxeHfMUqhNugaNiPG/SqSmivAWF9MR 4POkRWuPLJD0lz/GJkYznAsGV8qSG3kTU4mMD8I/YpmJ5oEju9GJFKK86cvgpKc6gypiv8LsO3O XWH6AJTPA2YYvh2jZNSwfgmQJvBjj/mpe+Cco+d9+AU3fPYQr8s8lYFt2g+0xbdIGEoKXKQYL02 W0T4Rb9DdJLJti1fVrlM6oMphjUcRLtLze+6gAnR6nGJ3dEMMVtmlzAplTyBOS8JqKsd20dGE34 bvNcnNJADfZgQPcifCY8F11LWQo6f54FnEDjYRHiaRPQHHA6Dot36oBa4Ymt2Z96KrYHtPkE+g7 ELK+ZjzGA3F1bceFWZRU4dLBAiyd3KsglYmuUe+DiM= X-Received: by 2002:a17:903:124c:b0:2dd:ad74:ac84 with SMTP id d9443c01a7336-2ddb1be0d9bmr15362295ad.31.1789690051200; Thu, 17 Sep 2026 17:07:31 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Cc: Xianglai Li , Weiwei Li , Alistair Francis , Stafford Horne , qemu-riscv@nongnu.org, qemu-arm@nongnu.org, Jiaxun Yang , Zhao Liu , Brian Cain , Laurent Vivier , Peter Maydell , Pierrick Bouvier , Paolo Bonzini , Song Gao <17746591750@163.com>, Daniel Henrique Barboza , Bibo Mao , Chao Liu , Palmer Dabbelt , Philippe Mathieu-Daude , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Liu Zhiwei , Max Filippov Subject: [PATCH 8/8] hw/xtensa/virt: use unique QOM name Date: Fri, 18 Sep 2026 08:06:39 +0800 Message-ID: <20260918000640.1001-9-luoyonggang@gmail.com> X-Mailer: git-send-email 2.52.0.windows.1 In-Reply-To: <20260918000640.1001-1-luoyonggang@gmail.com> References: <20260918000640.1001-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:39::11; envelope-from=luoyonggang@gmail.com; helo=mail-pj2-x11.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: 1789690107945158500 Content-Type: text/plain; charset="utf-8" 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 --- 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