From nobody Sat Sep 26 20:01:49 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=1790114171; cv=none; d=zohomail.com; s=zohoarc; b=m06f5HfBRgIgFBxJWExmGqniWZ/n0wJwIpP5YCw+U+T0QPMmyn4eJWzg1CdPNjFr+Jm9QJ/YRp58FStey+crGyBMTZXGb9Of50wdkhyAQvX7qJQfTncBzIC5l6sxZmqBENoqocs0Mt6I2ac7nQvNN3vsF3j+INoIxVjLEiN7Gpw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790114171; 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=mQMT4+MexeJgKGGfm/52hrJffWgEkaHIwOroNvc7p6IIrohOhsUaJJiDb46XiVpo69MeQ4ek/22H2h3sw4JCuNJrxUgk2iEXqe58ea9XO6W+YcXyI2DqdI8QJ30zuTObbmsmiBBmme/uNm1dRZaa3WD2a+sz8IRMLqAq/3UAmdc= 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 1790114171501358.0044843796061; Tue, 22 Sep 2026 14:56:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x98Sy-0003Bu-Pv; Tue, 22 Sep 2026 17:55: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 1x98Sw-000376-UC for qemu-devel@nongnu.org; Tue, 22 Sep 2026 17:55:54 -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 1x98St-0000uG-Vp for qemu-devel@nongnu.org; Tue, 22 Sep 2026 17:55:54 -0400 Received: by mail-dl2-x10.google.com with SMTP id a92af1059eb24-142dce6e235so212521c88.1 for ; Tue, 22 Sep 2026 14:55:51 -0700 (PDT) Received: from WIN-BH9M8FJACR9 ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id a92af1059eb24-144f949e60dsm1001153c88.2.2026.09.22.14.55.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Sep 2026 14:55:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790114150; x=1790718950; 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=SYfokA+929SbB+XxLm/CsLiCarVBt0rBzH1VI+JpLnfZOlVt2mH+5nUdfGCvvbHeL+ oeibBoF8IbiT1/DsyGBbKplInFssB4M3mhHwHMxlZ1grnXBFvzMjg1Ys4XwtHx1EBj4B nb4gBBjA37wsnY/3gHa8ZCYZkh4KVodC7R4MRJxRoiEE2VFPD814me4oaOOzbv8axok1 uxAGyaSxVSMiv4KwVH10HdSXDMdHVz24Ld2pZybT/z4R2ZkaAIjHagkwyE2MaSz0qS7C QkG9/tut+559Dt+vCn0KEAGh5zQF+hc2hBlvQoytKCOFlIn/WjsJ4rp100U5F56M5HLs WHrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790114150; x=1790718950; 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=VckSh9PBBiFOmo8rmdSX+Xpc6tvFcfTwDnmw4D5xWqaMvMP5ZpKshotWAvozwcIvlT 9M9tpE1kBMWNnAhPuzWtWDGGxxAmdCDhswVutjnUxk7Xi3awDaqf7ivX3zEM1uvZDGq9 XWC7/urznAcOYkia667FqCcSPzeyHgMy4lQWUJx8f0nleT30ewM0MQ9h7Dqb8zZRyEaD 97igITFbWrbY1lCtEt+deAC7ENBdvR8++c1mENtfH7Dn6b5VOIR7VnE7PQK+JDG/CcCh Q5lGySeoaBHsiUFZTys8pU1VMI2X/TA8WfQ4ZKtuRG1mjO2WEn9O0qz92D3fPNLyDRup vcyA== X-Gm-Message-State: AFuF++nzi5Ql1rlBzA9vIPzFL2q6ndpSbRaWCZNboHqAB0Kc0tArDPb5 Z6mj8hRDhE8/bvrqdOA45Kfn8zAXxLWvfhobC/80n4H05iiZlTS5BTHRL7UcQlDR1b4= X-Gm-Gg: AYBFou2JYSj2udm5fZ8i7heSfD8rutPDhMN+qqUjHT5LtJ+obkd+I+uYQsoyDUAZRvq Wf0u+EnPL59QynhKooTYGgMnTrreJgL0WZCK7PFQTGMkkFhHB7yu5/YtL2dzTIJpTZ/rD4t9TWf qCmqImmXH7X3qU84TzLU683BUW9DPXJ8yqocYK44Crxzy7aQXJex5F5yZvEKBZL3NonbMP462Q8 N2Fiw6Ej8h0JKZ/PqX3kYhKH/TN5/mhDlY3wYdUEPpMLTIkX/hIMzn5j2++kYHaMw3onhp30Mf3 bP8SF4VDJTggXVD6B28wtyGlycPuEwmThrhBU4DOXARuQr0s0WVwmdEFgfi5VMzRPBoG+RR8hSO eIK3w3oymf+qQ8cDheKGnSwMAFnSl4doI1uwDje9Sf/Avcrz0zZ7ODZe3Put3HBYUci1Onbs5ih 6aalar57hbWpfxcb8RNX6S37+rzTAGYnBsi6JeMyMaHF8GiRzsdQFshfIMxdBXDHkYQXJhcm/1i w31lc5GvMAtY9Px/hbxcN1XYoSKLORNSX7i/hzwow== X-Received: by 2002:a05:7022:3a08:b0:143:26f8:57e8 with SMTP id a92af1059eb24-144f9193eebmr885797c88.35.1790114150311; Tue, 22 Sep 2026 14:55:50 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Bibo Mao , Xianglai Li , Laurent Vivier , Palmer Dabbelt , Chao Liu , qemu-arm@nongnu.org, Alistair Francis , Laurent Vivier , Pierrick Bouvier , Weiwei Li , Daniel Henrique Barboza , Zhao Liu , Peter Maydell , Fabiano Rosas , Song Gao <17746591750@163.com>, Markus Armbruster , Liu Zhiwei , qemu-riscv@nongnu.org, Stafford Horne , Brian Cain , Jiaxun Yang , Max Filippov , Philippe Mathieu-Daude , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Eric Blake Subject: [PATCH v2 1/9] machine: allow -M name to differ from QOM type Date: Wed, 23 Sep 2026 05:55:24 +0800 Message-ID: <20260922215533.641-2-luoyonggang@gmail.com> X-Mailer: git-send-email 2.52.0.windows.1 In-Reply-To: <20260922215533.641-1-luoyonggang@gmail.com> References: <20260922215533.641-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: 1790114172999158500 - 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 20:01:49 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=1790114196; cv=none; d=zohomail.com; s=zohoarc; b=WtzAogOxFUiAjdxQ19uIswO3BF1uaHalot8fud4LeNHAjjZmogW+20/gK950Qoai8jkaonr1mEI4bC5+RV+yukiM9R+svqRsk1FPGyEIPM4c7W9m0JgboBEiEaxoF1XNPAN6S24VYJbo9tqaCuaq6gz8fPYJ7NtSZ2CI2S9il8A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790114196; 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=kd0agnJzxMl5A7fIS0bJSlhPYq3X5kUcPckhwj+pm0ucgURUMJx5yNMe51tbBySNX0NPu2QUmY0mtZgeWpFGPpUemoOhK3P+wvFRVyUikjnml4WZ5VO1zdHiM576OxdW7Opjw7lNaaLlfR/HNA6o8Zov7+h7kBHfUrb74KZJo10= 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 1790114196696264.62151208844557; Tue, 22 Sep 2026 14:56:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x98TF-0003Iw-Pd; Tue, 22 Sep 2026 17:56: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 1x98T2-0003ED-N4 for qemu-devel@nongnu.org; Tue, 22 Sep 2026 17:56:02 -0400 Received: from mail-dy2-x13.google.com ([2607:f8b0:4864:36::13]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1x98T1-0000v3-3K for qemu-devel@nongnu.org; Tue, 22 Sep 2026 17:56:00 -0400 Received: by mail-dy2-x13.google.com with SMTP id 5a478bee46e88-32dec843c37so427390eec.3 for ; Tue, 22 Sep 2026 14:55:57 -0700 (PDT) Received: from WIN-BH9M8FJACR9 ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id a92af1059eb24-144f949e60dsm1001153c88.2.2026.09.22.14.55.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Sep 2026 14:55:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790114157; x=1790718957; 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=o0YWaVJOTLCEe8y2ytCr4vTvRZfhOIQgJYvw9+iZcUWhPTl4w0tzb0lH/HAJsMhnoa B91HEcChC5khdpZ8R8XYjNK4/3fDZsMM/x7qR7c07rxzhokQ4Xq5yGwC1rxw2SgYnPb6 GYecQE+ypGblA8KH98YSFsppCmQiJl+OZZxL1btIF+dVWKB4OOBVqFvB37GkC2Nwktyv Vv8vOoyTeOGa0YK89rPGDg8iMMTlVwTUoOdlA4q2S/DrdFomv5ZOf3m6l2ShHUrBJ+56 UE2N9jsP8Jv22UvfAheat0ppWNJCsL3xWCPTpMGZQpsBLjwNCjqOpLaYdmRqZGgbjvrC J+mQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790114157; x=1790718957; 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=s5ZQZkD4S0yPrWVgvZSW6dK+YgioDtz6wFAKqK5zjcTNE2mgs8ynrmHRJNz7M5Q2Pz 2uH6TI5R5cBX1O/HJOSO09J7sqXkWRDuyOIzLarx1mGex5QH/S/DoYv/7ayxYj6z4Y46 nXQGcP8fr660V71Mr2NacTduXSccan/rs1u2/7OMf0caXXBzwbZNb0g6BP/lanXi9aZY 5LoTI0HV8hwu+afMwo3cP0ikclmxtcjBGGsfzo9kjh6NhDDU+8mrTsZ4Fh1Y9QZ5Eel9 vYne1eoOh9+iVZtqiHf3auXF9kyUhMu+Q+IM8tU7+lA8BKdllmOWTkFLFF1uhFp0xigJ thVg== X-Gm-Message-State: AFuF++ltIIUI7OfuYd1K4qTJNKV+OCzxJY4/nUOvctZAn80IzyKWBKN9 s5BUdITCQqffPe7+4KcXDu9PwFbbNiMzy3hLAqL1X0ffDboPsIYnhyTp5hR8sxfvt9Y= X-Gm-Gg: AYBFou2TvOEqztksxNMYBCJv17ywvJVe9xxruSGxT+rPvfaiKKKy03BrYpIRz6wC767 RdL0BqZ3O25u3mpYcRy0q56I+ArAZ2HrOjPNYD3DZXstxaHWY9V1b8HX2D0jVyLY3pCxK6f9HSc gxaj+QzuhDSO2yzN39ppTNOtOzlRjjwrj0/PLpZZEhcob6qr/lNTQhGKzVb9O57Eb65KooTh926 x3O7xd9VxXU4t6W/XwI8oCBU/ayMwyxMpM+wn0IksyZaB+B7YE0IJ39xRJkhYw9nGaYUm1duyw4 yc5nyQ4zkdujnflAScTYnMbjprGqutihmZfOGAawqIyLVDBoznRxyOCmPhdJ4ev4SVqKV4nqm3O GtOXgBSfkiJ3meLkLcM1QMa586EZDRoyLDyhIKQqynDAryW0N/qQF+EIJ3ABBpmAFoDgG7CEH3T xYjlOeDoqzLkhrMjf/ptb10ol38ZhXDctK+PoF/NR5pyfd7itywsO8Z7yMgZUB+sSlp+sxgYaD8 PPFrCf63bRk8BIK9YRGRV9huVtRkTuUDlXFs/cURw== X-Received: by 2002:a05:7022:7e02:b0:143:296a:c860 with SMTP id a92af1059eb24-144f92e1efcmr810525c88.26.1790114156590; Tue, 22 Sep 2026 14:55:56 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Bibo Mao , Xianglai Li , Laurent Vivier , Palmer Dabbelt , Chao Liu , qemu-arm@nongnu.org, Alistair Francis , Laurent Vivier , Pierrick Bouvier , Weiwei Li , Daniel Henrique Barboza , Zhao Liu , Peter Maydell , Fabiano Rosas , Song Gao <17746591750@163.com>, Markus Armbruster , Liu Zhiwei , qemu-riscv@nongnu.org, Stafford Horne , Brian Cain , Jiaxun Yang , Max Filippov , Philippe Mathieu-Daude , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Eric Blake Subject: [PATCH v2 2/9] hw/riscv/virt: use unique QOM name Date: Wed, 23 Sep 2026 05:55:25 +0800 Message-ID: <20260922215533.641-3-luoyonggang@gmail.com> X-Mailer: git-send-email 2.52.0.windows.1 In-Reply-To: <20260922215533.641-1-luoyonggang@gmail.com> References: <20260922215533.641-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::13; envelope-from=luoyonggang@gmail.com; helo=mail-dy2-x13.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: 1790114197415158500 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 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 20:01:49 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=1790114287; cv=none; d=zohomail.com; s=zohoarc; b=KNLzGvp2iuRo5fESRxD9Zm0pt8sXA8gIkbBp2iPyyPaK7/gSlsWvx0h/CgF7RoGTkGYr6QVlrFlZD/vmOGK/Lz/oOHnSE5hkk7VTPYlO40/Ek6H0ESYozAoh0R3btwqM7DgObRLYHwXAgTR7baTLv06nkUWLvtA8KlsYsWQi7cQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790114287; 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=HzzhcK7OpLXQlFdThzwI1Nxqp7oaqlD3ud/0DkdxnhR8wEoH3q9z1JCbugOiX9/9hbYctuunOHTsmf4R5EQhGLCi0AZz+0ialk9PP6kTy4R01mXznLfyRiW6JpnHj49/smZAv2tFZeR7GshecIE/BpLeuieJ/3k7C7FfZPpSuLI= 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 1790114287882226.12722578081957; Tue, 22 Sep 2026 14:58:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x98TI-0003M0-O1; Tue, 22 Sep 2026 17:56:16 -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 1x98T8-0003FJ-6y for qemu-devel@nongnu.org; Tue, 22 Sep 2026 17:56:12 -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 1x98T6-0000wB-Dy for qemu-devel@nongnu.org; Tue, 22 Sep 2026 17:56:05 -0400 Received: by mail-dl2-x0e.google.com with SMTP id a92af1059eb24-1437b77c274so166901c88.3 for ; Tue, 22 Sep 2026 14:56:03 -0700 (PDT) Received: from WIN-BH9M8FJACR9 ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id a92af1059eb24-144f949e60dsm1001153c88.2.2026.09.22.14.55.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Sep 2026 14:56:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790114163; x=1790718963; 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=lVh6/5Q/QYPabqCECPPsC6Zmifhk65d1JPZXdfTTy/RAr7BlmXDRV0SE9wtFTvXXVS fz8GnPo6/C+94vdc3iqYZmQXPu8u1hkaJ9LlpR6bPgD9xupV7lePQE5sdHVTc0hCsVjc cbMC6MbOcPXXmyahn+GGNu8PBI0XpnDBlpVprjYNjuFwJSuvszffShfLCxveMfW9IVrl d+o4jPEMf3efS6pSsKviPWQL9Xw54jPYBHlw/H5gto62ors55u+T0zNVae5zzmcwngeO uHPhgSGs6yjWdn6XFUiH6lFE5bTn9/7pGkOOqjjuQFMDxBBOhCD8MJtowiN5RhjPXto7 EnPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790114163; x=1790718963; 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=s13ZO20rbjF5XYelkRKiZGw8Iu4RnnsLqem2R97l/yUQFjiB0pS1TNzFaX36FEAV/y hG5FkqaGMoHKsrowUONA5ixIehEdl6bjyYZT39bS9HQpsSWqSAKs1VpTQWuL1XjcA6Au dF7YJbC/50QiiSLQegHgYT9F2EaYZjN54rYIsGW78NXagN5hFwL+Be7+eA214yjD1ScK OIR4lruZfAO5wHjPCxhdsVIG7ZmjwlYPIJtrsl8tnYYdIjLjvygKz03fOdLi5qq4je9U 8BULN3RCl/SWvL2FFR5xeYL6TuffDu2vEkO+Jw6wCdExWfWdwZYSD9FFT5ZSMUGe3d3i nmfQ== X-Gm-Message-State: AFuF++mGmuYwfELzhMSO3cPnCnGLAVeunnqAy9e2/D9UKWmgYj8DkbkE EOgP/icy3nSlNz8c7pkqZwrXAZ8GO4xGUg9B1wRWcGkwCX90xdbz6/prkm6tLXhxYEE= X-Gm-Gg: AYBFou284Wi1nBaG/qOKetpst9MTiMvn2ul9owF2cI7rpQSaCR3DNRg8kOzWN2Hqzqr 4Et3JaVp/dgft0WyASi7+z7P7wpuPjYb+3OvBR8uuHxGTxntG72oatL2ceXHaYlUs4IBzm6lWeq x9ShI5fcsQyt23qw+BPvCJWASNKuL/rm518thlCABrWrb5eQIvTQ/QuHNRz2nUZKc6b3yAdpKxh EUNCoC/fTy0KRPM52a0EHCK5hZA3To01x2PngVy3h2jVk7BxIm6VG8QHF7Ebh5mDGsAP3Hnptl9 K1TYWMQfDYstamWReD3218VM0ZGK6c7cpdelrECpfuvyQSpWnoXjI11YQYFgPfRUeFkcyi78Baw 8mQzeKygcs6ciSLQOqsZMAsjAuUmTk72WEYhvOHnx/Zvn5gGDj6/dzT7UonFYkLbGGsATgkIhpy MQM3GECdhZioxRwRWvLhNuBvZ1dcRxay6VsuLrVvg8FZTYWjJmdqocyINJUeb6t7NvI5MEu41T/ u712GDrtWYL3uTW1NvkM1YSi9rAiFAd X-Received: by 2002:a05:7022:28e:10b0:143:2967:c0b1 with SMTP id a92af1059eb24-144f9c47315mr621949c88.25.1790114162558; Tue, 22 Sep 2026 14:56:02 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Bibo Mao , Xianglai Li , Laurent Vivier , Palmer Dabbelt , Chao Liu , qemu-arm@nongnu.org, Alistair Francis , Laurent Vivier , Pierrick Bouvier , Weiwei Li , Daniel Henrique Barboza , Zhao Liu , Peter Maydell , Fabiano Rosas , Song Gao <17746591750@163.com>, Markus Armbruster , Liu Zhiwei , qemu-riscv@nongnu.org, Stafford Horne , Brian Cain , Jiaxun Yang , Max Filippov , Philippe Mathieu-Daude , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Eric Blake Subject: [PATCH v2 3/9] hw/arm/virt: use unique QOM name Date: Wed, 23 Sep 2026 05:55:26 +0800 Message-ID: <20260922215533.641-4-luoyonggang@gmail.com> X-Mailer: git-send-email 2.52.0.windows.1 In-Reply-To: <20260922215533.641-1-luoyonggang@gmail.com> References: <20260922215533.641-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: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: 1790114289674158500 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 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 20:01:49 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=1790114266; cv=none; d=zohomail.com; s=zohoarc; b=Xa3IFUBaZaKvpaD9eNNjSdoJ5HaJmNhOcpaz5P6hGWuZAklH/IEVbkL6+mgquvEfK/5b47jfLCMi0OsMLzVTIYkt2Nkp+rbTUZWOSXvEPWqGCDGSDPTZthASz20SnsOAbTpNFG5RYN146CxJmdnamyjXjUNJO+NKOj6ZC0ZON+s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790114266; 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=B5P6/yLZDKYEdRKz/nXsqWlB5hh8svVs+qcLZjq8U7MAVktkpHjr6L6kqwHLqoRgT1VDZyNmJq4AejH2qpfz3CAfDgG0waZqVlsMlx7G9wiEmWCqJH4+wHGQL18J2Ox9XaIJ8Vbqt0dCgg99D2c8MDoKmDnysDWjRaet4UTvSz4= 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 1790114266310727.2568499782418; Tue, 22 Sep 2026 14:57:46 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x98TH-0003KV-4N; Tue, 22 Sep 2026 17:56:15 -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 1x98TE-0003H8-GX for qemu-devel@nongnu.org; Tue, 22 Sep 2026 17:56:13 -0400 Received: from mail-dy2-x10.google.com ([2607:f8b0:4864:36::10]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1x98TC-0000ww-5B for qemu-devel@nongnu.org; Tue, 22 Sep 2026 17:56:12 -0400 Received: by mail-dy2-x10.google.com with SMTP id 5a478bee46e88-328664c2da6so158350eec.1 for ; Tue, 22 Sep 2026 14:56:09 -0700 (PDT) Received: from WIN-BH9M8FJACR9 ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id a92af1059eb24-144f949e60dsm1001153c88.2.2026.09.22.14.56.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Sep 2026 14:56:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790114169; x=1790718969; 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=rL1JGwkfncG8j2h4BX8+L2QbBhlfbLC6A/zEeeXEBU+M9NWrhKjGG4ESkpj/Mm1jwQ XMXcSxpLLfnTM1JgptPjTIoSp+b6wI5SD+dhZDjYaz2c63XgD3Opn0npYGtGeshzS0oc yJjnY/4ravYrn3VbuIZrujjnG6ZINk4C/t2rsE18l5pk7EYABhxWqeVYfigoNNlJOaBV +tEcUJ27A5X5m3P0R3JbF/EmAb/cxNC1m6kGBRyJdA06FgVY9BhZsQmrF1/AxqhnT/Zy 3NUdutUMymccRV631L3sn4A9LpgsJ48aBZk7aGS3Yje7cfPis9bMVZcJ27jLusrflxwX z34Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790114169; x=1790718969; 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=H4xTev1j1rqyLNh+uHHZ1JfsVfilKKGgMm2O0mA/1xxVgBOWo3iE0bZY9uiybWQSMz 5Ri5+mDQGoMEyeD8fYGZudeOenHmmWniJSASY4lHbjuUpo7y3zbkTzNiP21sNJnuDasl OLtuKphg433abzofA0z0qYkGHq4Gi0mtZb9z3Vq89sGy78L1GGT3JJaDt2NSGUgsMepW g4biqsa2FAY6hwdZQEy0guYm1GwdEd8lhKekKv/DwsM92WbC8VDAmRWicuOEP0rHde4n VlnoQHJ7UgNXBucFRQVSe5yKftkrNfDhte20RfkbPHzFjTlm00oeI6ix3QBx3chwk6Nf cJow== X-Gm-Message-State: AFuF++lZE1J66Dig88zTKEoZF4TQUgkf36eXTk0orF6jD+dSrjSzW4kw eippkS5WgCIRNgq0RcIicTfIYpVpZ72UobHBdl90bS2QW7soxgVyQA7ZLwVXY0MWKgo= X-Gm-Gg: AYBFou22iI1sBC+QsX3bpJUw8c2+0S4R1Oxe/7Xxi8oIsaeBsyhOcwFy415cPwh4wy2 tOLQMkB7rQzcs9GwQLzyOfXYWs2/TCMOmz19Rl30c5OIs6c6iW4OwJ50mxCFdu4xU82Der51UVZ xQwa+U7lIuDHn0PnwHpi3IF2rKoV23sLLtl+ZASVxYSatkFKU1zqMQtWXTn1C6t12AZuA2yJh8k UeJ/Bel5v5I3eKBB5J1hAaXk4N8s1+5x4U7h5oJDMwhaWLMzfVf9DwblMZYcjlcEXEftuSNgzrq ZjKYxMBuunD6Wjih4HX0WXiVqm6lgi/wX/fzaolO/qMPL9TsKCby9gswz+0n9AqAyNqIuw7H8M9 6kJC3mmovPfEUbfbz7xlEud0GosS6i0Fs+1lNxfoZUXOtoVAjqHSk0c3Pq0ofD0Elcec0HTwe23 jXeyerjc6O1MBrO9r2mg4vNLjxkhXtEsuPzW29vVSYTFousYC9LqE2IzILdzv0Pk2CVk+HIQ4E/ uxBQtCbIetimnh6q6fVaAHfG1bJXto= X-Received: by 2002:a05:7022:fa9:b0:143:296a:4e57 with SMTP id a92af1059eb24-144f915c8fcmr1037399c88.26.1790114168519; Tue, 22 Sep 2026 14:56:08 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Bibo Mao , Xianglai Li , Laurent Vivier , Palmer Dabbelt , Chao Liu , qemu-arm@nongnu.org, Alistair Francis , Laurent Vivier , Pierrick Bouvier , Weiwei Li , Daniel Henrique Barboza , Zhao Liu , Peter Maydell , Fabiano Rosas , Song Gao <17746591750@163.com>, Markus Armbruster , Liu Zhiwei , qemu-riscv@nongnu.org, Stafford Horne , Brian Cain , Jiaxun Yang , Max Filippov , Philippe Mathieu-Daude , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Eric Blake Subject: [PATCH v2 4/9] hw/or1k/virt: use unique QOM name Date: Wed, 23 Sep 2026 05:55:27 +0800 Message-ID: <20260922215533.641-5-luoyonggang@gmail.com> X-Mailer: git-send-email 2.52.0.windows.1 In-Reply-To: <20260922215533.641-1-luoyonggang@gmail.com> References: <20260922215533.641-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::10; envelope-from=luoyonggang@gmail.com; helo=mail-dy2-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: 1790114267427158500 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 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 20:01:49 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=1790114209; cv=none; d=zohomail.com; s=zohoarc; b=fUO58Wyh3faT0wlUgg8xXWPJHOI0kePsnWWPBIOEyGdbj0aCiReQT9nSTk9WYqyp90+OQvQ1ZDdnXHnAldZqQqJ6l0qJ9c6/tIm6FWoRH2ErsOono53aUmI9rmn6PxZlCtxQMduXU/G7RHNSu65npr1AEIrI4b1n2g1bTwu5pbE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790114209; 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=fpd3U2UtiFM9ji3DP17/LWtV+Urf6yASDV45t5UQm5M=; b=DwtSawzEGo61lh+pmGLhHRzJYkPT/YRxik4j1qqhfeeijVjug7h8dzuZJUYS1LKynZ8YH+LXB9mjuwfaXUMMckFskK0c7Q8im5lmBpscpwMzCdXgg9Ks2Hmt9Eugd0gyK3IT7QuTA95KoKL1pNjZ7g1oB78xp89FQOPlufNSUrs= 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 1790114209163946.8225167238186; Tue, 22 Sep 2026 14:56:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x98TN-0003fe-HU; Tue, 22 Sep 2026 17:56:22 -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 1x98TL-0003XQ-1J for qemu-devel@nongnu.org; Tue, 22 Sep 2026 17:56:19 -0400 Received: from mail-dl2-x0f.google.com ([2607:f8b0:4864:38::f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1x98TI-0000xy-PA for qemu-devel@nongnu.org; Tue, 22 Sep 2026 17:56:18 -0400 Received: by mail-dl2-x0f.google.com with SMTP id a92af1059eb24-142dce6e235so212733c88.1 for ; Tue, 22 Sep 2026 14:56:16 -0700 (PDT) Received: from WIN-BH9M8FJACR9 ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id a92af1059eb24-144f949e60dsm1001153c88.2.2026.09.22.14.56.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Sep 2026 14:56:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790114175; x=1790718975; 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=fpd3U2UtiFM9ji3DP17/LWtV+Urf6yASDV45t5UQm5M=; b=WIoSsrlvUfUCb8wjpRhNTPRwvN37TyTiuFXTeuRWSnkCbTw8AJgcQyhSJeLvoA7ZSb drVozwWEaXkeVFJGq3tn4xeo2q8oiBiYD1Dv7Uw4xIfrR1oOoRSxseWnBjwEf9ISJ4Gd /5fUWK8Fo74L65IMdsVJflR9rfGSEBFesSfi7P2l30GJlU+6668f8dNF77HJXlvpNOh7 /vgaogpTKfkHODf3Jyprge7nBovz+jQy4EYbwbGzxTNY6mLohfcGQsp2CenAlvw1b/cr kPSWyJxheARqxygjMeYjzKjdzQGU7AvXgVSF3aWfWpK5JDa8lqlsaRwumlWg8Z5+NLtt x++w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790114175; x=1790718975; 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=fpd3U2UtiFM9ji3DP17/LWtV+Urf6yASDV45t5UQm5M=; b=NwwyeuUBBdK/6HQcvUXyfdoWK0L8T5tJESbdlXG7i7GeVvPrYPDhIae6x4rnj5nYhd B2lNkrzRJaN5z2jVvEytMsr1RnX+e188QEfYa/CxQUXUfLN7padksdmrkw78zkzytv07 hDUUf1pUjsJ9/OS6hSqKYEVp7zvpQWU2RG6m1Wb6/Kn7+w+cYJDmDyJOs+ipGWC9h0p5 be4J0gNA8ovgrV0hS++0hMFgdDu+FSsMxOrXQwhc+A5g3Dxsx1aUubHiKD61WKhECyiV R6YV2u5kFVbN0000Wqpe182/umJpfj+N0T1zD6myoHdh4Ve5Sa9nCpeOUbwfrj3hmhdH zMKw== X-Gm-Message-State: AFuF++lRvwxGVbDY28ErNhIsi7iOsJwJmR5uu9ezC34vgV2V0zpx1S4N /UQ8Y1WIh1/Cq8Ce1VmTPthbGT2H1LYjkwp/fIaMLufhdYCRyxvaJdPFBI/GD9KexvQ= X-Gm-Gg: AYBFou0avrEwJz9z2J/N2CY9O1xIYjFTfeA4SmbktceD9zhxFMwpbCcryjNlG/YMH3Y m2SHtnvgrClyrOhwLyEDw1A+IS92v13lanOD/B+DS6XOBdia6gWJbEXJP2tFeq/8S8KMHNqPSHm twPsJ84jzy5of3UJGyv7OpSEC2TG/at/s6JSB5iKe+cIou+0Xf1Ka7IEeFzigdj2lMiP4dtfErz QK6qRzdPEC1tFImoEQegRVcqWVdb68A0lQuqtlGpAorfYAqeO7WvCfLQE0jJZlo28oTdUfIWKFy b1hgdqUcDScUXOVa3Ya+I1f1JzBQQBmM+yR8B9nahbTmWgIou4l+61Y2wk25wN5WRzBk1+AfLoL iON1+Hp4SzfIeWh3bpPvXy4auZRv97typRuGll4fmbjOD2M8ncnofV9i/YqjLRaRo/qvkhk68gO PHv/C0pKZZ4H3bgTycbzWJsUUZnMHNzPlps0wP/i5Knb2feu/A2ONKQ14FYVlsT45sKDd97GwWr YjLG6uoRfYKUG6alGAlBsBos+1um2w= X-Received: by 2002:a05:7023:a85:b0:143:3da5:cada with SMTP id a92af1059eb24-144f9195780mr918184c88.37.1790114175240; Tue, 22 Sep 2026 14:56:15 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Bibo Mao , Xianglai Li , Laurent Vivier , Palmer Dabbelt , Chao Liu , qemu-arm@nongnu.org, Alistair Francis , Laurent Vivier , Pierrick Bouvier , Weiwei Li , Daniel Henrique Barboza , Zhao Liu , Peter Maydell , Fabiano Rosas , Song Gao <17746591750@163.com>, Markus Armbruster , Liu Zhiwei , qemu-riscv@nongnu.org, Stafford Horne , Brian Cain , Jiaxun Yang , Max Filippov , Philippe Mathieu-Daude , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Eric Blake Subject: [PATCH v2 5/9] hw/hexagon/virt: use unique QOM name Date: Wed, 23 Sep 2026 05:55:28 +0800 Message-ID: <20260922215533.641-6-luoyonggang@gmail.com> X-Mailer: git-send-email 2.52.0.windows.1 In-Reply-To: <20260922215533.641-1-luoyonggang@gmail.com> References: <20260922215533.641-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:38::f; envelope-from=luoyonggang@gmail.com; helo=mail-dl2-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: 1790114211644158500 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 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 20:01:49 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=1790114220; cv=none; d=zohomail.com; s=zohoarc; b=CuuR/Pf7wxBU25Si2+6CmX7poNswsCsCD5yrhIJTUmGU3CIk4QKGrDnopxeKwFK+6CfYCrUwMvEcmEonp1Xde9SvOL8Sp8cZWfeakHiv6Ocr/MxMr3XXNWmDLOaWVD5+BE/oTRAeNVQ/elKPL4ZMYVmdXeylrNknEz5qEsM95f8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790114220; 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=JKIeo27AfAHxAjCk7WTjLS2slaP0lUZ0agm1exLl6xUUS3nk8PoPg4bdmf9HYR8Ep1b80uYpsj3aDP621LC7bJqUb9mGSjtkrQ7RCVJ3RbB3zdS4y7pbnydfdGhZin44KkOhkSYNO1tgQJj4dSSRe94G4RnEPPZ9WqIZcsycah0= 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 1790114220979379.95900407069985; Tue, 22 Sep 2026 14:57:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x98TS-0003rP-Jo; Tue, 22 Sep 2026 17:56:26 -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 1x98TR-0003l7-8n for qemu-devel@nongnu.org; Tue, 22 Sep 2026 17:56:25 -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 1x98TP-0000yq-PR for qemu-devel@nongnu.org; Tue, 22 Sep 2026 17:56:25 -0400 Received: by mail-dl2-x0e.google.com with SMTP id a92af1059eb24-142dce6e237so218689c88.3 for ; Tue, 22 Sep 2026 14:56:22 -0700 (PDT) Received: from WIN-BH9M8FJACR9 ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id a92af1059eb24-144f949e60dsm1001153c88.2.2026.09.22.14.56.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Sep 2026 14:56:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790114181; x=1790718981; 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=B7SEo/ofovaiBKFaH2N8MMSmVVAwM1QIfJPQ0QOPoKQUQkA+a2dccHv8uC8jA+CCb5 o+ADEE9dyF3msdWf48XRlIXb0AvNrXRbFOUnIH1ciZo3GMQr9zDehqBlcbUeO2jaJ3ZA VISveU7JoRtOlLEUuSC6Y3VdIBC5hdW1E8VIrRY3Y1MSsvukffwc8Tbumjy/T+0DM5YK kFUddTwYAW2/us3h/w+/CIkMrDPAFs3ZqlrtfBLd7S2Hi7LdOaYDV5UzPlGOJexRchwF +S8YKcyqEsvgOIjaX4uEIy93bpknsE8Mrc28gm+P3nCxLnthLSOssGxss9HgppWnWotv lAoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790114181; x=1790718981; 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=ubTTuwP5hJay8uPrzei92Sh+qVvNz4FcebQk58mnLw94EtJTAxHAlaUfNfnjwZZYPB 1k/PjEebSEGMAyAnubiDDLjbKQjzPDjtZJ5TvUxr+eK43ICwmPr+YnFP4YH22G+lMkwU GOf0iwOINZsH/muzfzBtRQu2KJAvsV1J84StQPd1BoR+lh4XbDCw4HTs2Uu2iKaqUBG4 0iSAcAA+OoeiMZqAoAkCst+ky22a48VX/doqkDymUp6eKFL+BM4fvd2XeFbYy32qPOA7 v5GYwFoKqKmSgDhqanzVEluNQH902QwHAkgrPqbLQIhm7nijNZGxuzcaAwOCUDIwko6U g+/w== X-Gm-Message-State: AFuF++nKaTWzyVc4JXGdg4BNKlH2lwIE8GH9sr28AcOjN3NUJQazE5RC WhxpLf4/gSIAGEAewnf5WCghV+V8zlZLaEHgAKAdIHk7Cg+HuRhNcYcFpYtEpEe7R1I= X-Gm-Gg: AYBFou1OilOzJOyvwXT1cFawS8lTbPfaa8fak7zDDvYCwLwOz+y65K3h5m05Y1Wged+ SmE8D4fpagYUhXUCLJeglBqHA5eM2sQDq6JhYARQukQogDr6D9YejJjX1NIHmYiJFBXvO6BakFM 8ADrxiipCFLHqi5rFiMc5s22Wm8Tnr2aVqU7/Kl/s+2/0DGPcKpaPbH+yE+1nf68y84vLFoI7U1 +5Y713+Dvqnp0qXqNdzeCoeiRsZXbnWGwzV9r5p85sqoN1DhBFVzrrm468Ttzmf4RWULStfzRlQ 5MabrNvciuxFCzGK0aezRJlknrm158c5a/weLvqfstdS7WNsn3dGYtityCKqXMVM6N/GWZmBv9g PktDHzrcywpWl8RdhViPP8hecKSjq0nreYULNQqkMv7wSrbmDL5gouxwcCosNJVHUnLBI81EsZp RAvovz3yLf2NHOZN0umQwIAKlGJcfPWmglKqQjXNnkETd1fJtvXR6Z1eEYgFV+pfEf8ZAWabBgw DDqa/W4xcaQS12+fCpmU/2QmwwB83Y= X-Received: by 2002:a05:7022:68b:b0:143:271a:309 with SMTP id a92af1059eb24-144f91bcb4amr1272460c88.47.1790114181227; Tue, 22 Sep 2026 14:56:21 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Bibo Mao , Xianglai Li , Laurent Vivier , Palmer Dabbelt , Chao Liu , qemu-arm@nongnu.org, Alistair Francis , Laurent Vivier , Pierrick Bouvier , Weiwei Li , Daniel Henrique Barboza , Zhao Liu , Peter Maydell , Fabiano Rosas , Song Gao <17746591750@163.com>, Markus Armbruster , Liu Zhiwei , qemu-riscv@nongnu.org, Stafford Horne , Brian Cain , Jiaxun Yang , Max Filippov , Philippe Mathieu-Daude , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Eric Blake Subject: [PATCH v2 6/9] hw/loongarch/virt: use unique QOM name Date: Wed, 23 Sep 2026 05:55:29 +0800 Message-ID: <20260922215533.641-7-luoyonggang@gmail.com> X-Mailer: git-send-email 2.52.0.windows.1 In-Reply-To: <20260922215533.641-1-luoyonggang@gmail.com> References: <20260922215533.641-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: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=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: 1790114221425158500 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 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 20:01:49 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=1790114271; cv=none; d=zohomail.com; s=zohoarc; b=kKZu+y2+jANqokH+xMaBwsny/+r89JdoUs0ymDivOoh5PacHQnpawUkYlJfO/1vKVdHgDBSS6uLY6lN51tdIOJpOF+Pu3vw8rwEsTwnxCL2jTPNdrsY9p+qp5zQRRJMIgGYs3PF7k3tXu0gUEvmGp+zfHPeXTSmgH9VQgAmPTsg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790114271; 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=e+8kCglE0QtqwElv+cmLIyZdzVyYzvnYxm/svrNzcFCAFM2oVtJ8NUFhwkcs+5gR0eKlEK+WrbgflN3N9wWPxSJaNo0Hdclxm4ruuNuNpIDBU+KoylVdXV4inOM//8QAtgUHBIhCP8YidV6otOfCnMyHWDV8U/q+Y/9cCqJpL/4= 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 1790114271342118.61562227105071; Tue, 22 Sep 2026 14:57:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x98TY-0004I7-Ik; Tue, 22 Sep 2026 17:56:32 -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 1x98TX-0004EZ-OP for qemu-devel@nongnu.org; Tue, 22 Sep 2026 17:56:31 -0400 Received: from mail-dl2-x28.google.com ([2607:f8b0:4864:38::28]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1x98TV-0000zk-5B for qemu-devel@nongnu.org; Tue, 22 Sep 2026 17:56:31 -0400 Received: by mail-dl2-x28.google.com with SMTP id a92af1059eb24-14373bcc010so364784c88.1 for ; Tue, 22 Sep 2026 14:56:28 -0700 (PDT) Received: from WIN-BH9M8FJACR9 ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id a92af1059eb24-144f949e60dsm1001153c88.2.2026.09.22.14.56.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Sep 2026 14:56:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790114188; x=1790718988; 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=FBPwzqq6SE7e3gTxtLzDeY3ajqzfPLDJz+OA5sOoNM1DiwT1vKs3abp3qeccc+f50B UhTNBjZZxIrpgoWdFKqWrPvbA8P5AKFl3Mhl/yclN7q3j/plU4NkFpoQPJ7OwSsXAgrA WfTUKB0q0ku1t9ozroCFChQNsR9F4BUSZk1Yl4jqVygbJM2dBcuMdWm8ukmKHld2jaA0 ajj9iSAgqVmQG+fRhkDYN4SvyeKvLkCSBfpS9wltHgcD2MlqsLx1jhfD/4kYOIMwijnK rf2qCeJ4RqbWQlTqXh018N/BbXx9UN+yWxJeM7r32gGR34TOv5tG9pi+4y67Ww9RcQYy gqmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790114188; x=1790718988; 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=zgZ6QHksGSBj0gLxc4aYXIozahvMLoRC4ZmyaRII02eYL7X5/wZInwGDYdP2Pcyra2 8Kr24zvNEik0icDztGUiojVCxoTvLlCewBAkJ6uGXEDaxS4fYVF0oTsJ2mscsQUOqnE2 zzYfhVvS6D8L045w6TRQiiRs7GuMle5YioIt0hwxll8N/gKEX2aEmtldptiBDF2SiuHv aaJ+dMwUtOAWyLsjOCPlHU4WSRU80MA8s8HoScsEZVFW6lrbN+SyT78YmUpGP+fSuTPi IIxxlIln/RBYc1iuO51o9nMxlarjybXXylCvH/QCMjLU+IG+8A3AYYHK/KJ7Vtd/hoH7 5CVA== X-Gm-Message-State: AFuF++mpbRNyA9fMjry6pZlgL8niyq0RL+aDqcmvlt89skO2vpDA7D5j b7Ht3yotroJXeqGf0khkK2fIimYvg4noqfsVtqRy0/OU0Cx5tZxScAjT/ZxeN1uZnaU= X-Gm-Gg: AYBFou1B2otty9sAa0HSxevEM9iVTw6LLC2r/MYNFZSIpG2Nve5s54Vj1MO/287fwHa 3Pdmn44FcvEBRRnYgRhvFfzl87NKKEQ69CMRldq38CpwqyG+BlPkTJ8YWOzRP50tO//vGLpVp0F JhefZ3ERksab01F5/9VpWe2OBwDVBGKrwKMaGLp7C2JQSWMJz1eUjUzu1vxinyK2lPNAR4aL2yc KBN3T/WmuWp6DPZ1axssWPOmcGbIPX0uSead3mFksjGhQDmF91tx8UXLyQY07SJJG0Jg0nHG18c IXHL+dh9cmyv9E5gqbbCgAcKbFsi0oWTZBrQ0RxLbiA529glRQkhWd1wjhAL9+DcO7pmVeIRLxH BsPrUg6Z6KHCERDcx6fsbEm49DYMs0HphAO6qqPRBULjWNYOjMPKJ9UmZ7CewQ/N6EHL46NmQ6J T1pKVnQU/B4ZXNTGc4DVKnVoKNhMV9cs1vemLhNIiwk0bYfGF73P4E+inJ2c5RTk4ugolTB3+ga CmqJkdGWvtrV1CumvLkmQKuPxnynpY= X-Received: by 2002:a05:701b:4591:20b0:144:fa79:174 with SMTP id a92af1059eb24-144fa79031emr374010c88.44.1790114187484; Tue, 22 Sep 2026 14:56:27 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Bibo Mao , Xianglai Li , Laurent Vivier , Palmer Dabbelt , Chao Liu , qemu-arm@nongnu.org, Alistair Francis , Laurent Vivier , Pierrick Bouvier , Weiwei Li , Daniel Henrique Barboza , Zhao Liu , Peter Maydell , Fabiano Rosas , Song Gao <17746591750@163.com>, Markus Armbruster , Liu Zhiwei , qemu-riscv@nongnu.org, Stafford Horne , Brian Cain , Jiaxun Yang , Max Filippov , Philippe Mathieu-Daude , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Eric Blake Subject: [PATCH v2 7/9] hw/m68k/virt: use unique QOM name Date: Wed, 23 Sep 2026 05:55:30 +0800 Message-ID: <20260922215533.641-8-luoyonggang@gmail.com> X-Mailer: git-send-email 2.52.0.windows.1 In-Reply-To: <20260922215533.641-1-luoyonggang@gmail.com> References: <20260922215533.641-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:38::28; envelope-from=luoyonggang@gmail.com; helo=mail-dl2-x28.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: 1790114273461158500 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 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 20:01:49 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=1790114229; cv=none; d=zohomail.com; s=zohoarc; b=YetLNiW+b37yFHPxtMDVKDohXQYbYTDY6wdQLY/obA7zEg8URhEc3LZGdW/0Pz2CwnhH0kR2WMxS0PDnvx2BO1rFajpeayUjxhjGhzIAfuLyMA3nHCyx0TUY9lJGbK00A5cVaNRSI0ASae2jjI55+seJQhtJNTK4WdSUbH/+6g8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790114229; 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=F+Ky3mbKZwkTSuJDqMgNZE1aCpdjXdtLYSQgl2Ra+t3KBocl46Ka88ZkcMDcTFZIvojYD1vZqkiI9dPUuHoF6vz80Ojz9dOIZAewx2O6jao32M7FW+9Xn3HMV7CcEqGsCEO97rIUgwOLMwTOfbO7TvaH6DSADQQyHyrFMpLN0zo= 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 1790114229665465.7494831144219; Tue, 22 Sep 2026 14:57:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x98Tk-0004Um-Mc; Tue, 22 Sep 2026 17:56:44 -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 1x98Td-0004Rb-IT for qemu-devel@nongnu.org; Tue, 22 Sep 2026 17:56:37 -0400 Received: from mail-dl2-x0f.google.com ([2607:f8b0:4864:38::f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1x98Tb-00010N-3j for qemu-devel@nongnu.org; Tue, 22 Sep 2026 17:56:37 -0400 Received: by mail-dl2-x0f.google.com with SMTP id a92af1059eb24-142dd04edb4so296936c88.0 for ; Tue, 22 Sep 2026 14:56:34 -0700 (PDT) Received: from WIN-BH9M8FJACR9 ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id a92af1059eb24-144f949e60dsm1001153c88.2.2026.09.22.14.56.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Sep 2026 14:56:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790114194; x=1790718994; 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=bVxRpQpERLcdEOCnU1xyAW4QzUxzqAnEZMAp0tNAiIkEOZEwYtangHcDWqwMDuZP08 EKAqJEdwMDEiYENWuDT34MgyQNU0OfTYAWEPZEH9KhLBTCWmdwLfo87EHmo3yXdEb7iV kU6T2+zwWjgAydxT0FQpVfv+K2QfTSfVc4m1tHTFv7rdUTJpmAfttRGAoGuV/Hged83l 07hT3XciHpVvJSsBar23+OibW88h7l9lRmiOrL8d8GzMVOQC3gk/OSs4dSwuZ9zjlhVL PICe8gTOHjW0gMfdvvXi7eANibcwST0TW147Pi0kZ1qgQwjiclusfK3dylQb7pb5vOr0 Gm/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790114194; x=1790718994; 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=OAz5tblwrGN1PuhaXEMlAdE8fyQEiBbtdSfUt69eEKjXL5vR/EKm3c3wqB5zvwFQBp uTFLtE8CjHUpaT7JW5TlpE9RwyOP2FY9plW++xrH/Mcv6/S7QAwvgu+VY2tUlNYewRSd TUz/wOghtzdUNmUhbRtGn4tjmNX71sZdoi6tKNooHXZpw0aYYhEJ/IpKLS4Wb/45WXlG g/4l8XmhzIGk1KMc2fzcT3WjL4YIQi2txHrCrOXF4g5lMetsONrYID4AZjYbDonGYWpy ILpKucf3iudEPJGm4XOToNGlbmrkANvLQchwWvDcWqfwSt2kc0VzCtR6ZlfV0etg+Uw2 mztQ== X-Gm-Message-State: AFuF++nNfzaPm9R43teGpZu0s1MVtuzy+KofkOIjwAW0QpWlGZQLf781 dPnOogWETGu5ZDMODO030f3QqMi4dpE08yg/FU/879XcnoKQz5ADGHTxfchNfEkl8Wo= X-Gm-Gg: AYBFou2S5pIdEf+h+39RIbylQebROp/ZdDz8uO3939xeu47YCW9ko3hjgQ9j3eLpZke J8IDW+XhEXgad6ZPn9LAfN9J1dNdUK6QlODWs1oc6T0l+4lES/aDCiC1/ynzbq17c38EBXOnqUK FoVEV+cF96axkErXfGygeqzC+qLD1N31uAmaOpm+Km1qsooefmKSQLdGjzHP9KsKfPHp9spUwHQ axhn294hAfJKu9C3Mlnpi593ciNuc0/PIA/J4keqNtRZA+HXoOOICIUr++lMvte3V7tVyJ8GEH1 M655OARbX6dX9wA6sM1rIdr/6AV9+LrAwPdb6+1OK7nXwgDSmu1EER+0YqO/jRJli65x4HjPccP Bo2LStWqa0YKnr3bZopjrPdYOu69UOSue+bukvMHf0iyCwhN6JRf/AA6hqTAjLmHQHePVe0Ouz2 eZ2/WXSU+0ctS9PSSTIClqNVOxibCwmB/ukp+a62vLBvybgPtibmLo5jjWLvHlyYkh3MhRPPSUL qG1Njx24wBbdXGOfmPvpP0NlEnX4RVryDtrL6s7Gg== X-Received: by 2002:a05:701b:2919:b0:143:57c1:6233 with SMTP id a92af1059eb24-144f9154854mr658595c88.27.1790114193705; Tue, 22 Sep 2026 14:56:33 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Bibo Mao , Xianglai Li , Laurent Vivier , Palmer Dabbelt , Chao Liu , qemu-arm@nongnu.org, Alistair Francis , Laurent Vivier , Pierrick Bouvier , Weiwei Li , Daniel Henrique Barboza , Zhao Liu , Peter Maydell , Fabiano Rosas , Song Gao <17746591750@163.com>, Markus Armbruster , Liu Zhiwei , qemu-riscv@nongnu.org, Stafford Horne , Brian Cain , Jiaxun Yang , Max Filippov , Philippe Mathieu-Daude , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Eric Blake Subject: [PATCH v2 8/9] hw/xtensa/virt: use unique QOM name Date: Wed, 23 Sep 2026 05:55:31 +0800 Message-ID: <20260922215533.641-9-luoyonggang@gmail.com> X-Mailer: git-send-email 2.52.0.windows.1 In-Reply-To: <20260922215533.641-1-luoyonggang@gmail.com> References: <20260922215533.641-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:38::f; envelope-from=luoyonggang@gmail.com; helo=mail-dl2-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: 1790114231311158500 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 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 20:01:49 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=1790114288; cv=none; d=zohomail.com; s=zohoarc; b=WaIM+h7c5H7N2KHmuUlq+i6oKRMzcJQtJIX8DVbJ6Lj1Bj/WDdRFV3xWdiRtt3E5OfeWmCNtxtZNCD+Q9gJX62wzMuRzK+NxH27t/Rgj+J+4DpZVfRZMRpwJ19nUYUqytdPqhM+ecI20/riOXZ/aPn35GavgSVpEYQeZ5thhkek= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790114288; 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=rPXXZSMg3B1e8GVfb4Q4EgRzyMm8fU6LPV9bb/pqSMM=; b=nLwnVdhQgmKZ4bVkDUqtb/EnIhZUxsM15vMWRHeADNWPykmv6GbsbQnihAr0tmeaMd1XfgDPZDp9mNuD96rALKmAIbbWOE+6tf2PYBP67tDPrC46CDnsT0FC+Aqf3T8RE4icscV+qIZwQ2lP07ayR3rVGKEwWpiKlpRTDdCHnzU= 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 1790114288888799.6200833131105; Tue, 22 Sep 2026 14:58:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x98Tn-0004Xh-4C; Tue, 22 Sep 2026 17:56:48 -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 1x98Tj-0004VJ-LM for qemu-devel@nongnu.org; Tue, 22 Sep 2026 17:56:44 -0400 Received: from mail-dl2-x0f.google.com ([2607:f8b0:4864:38::f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1x98Th-00011G-UF for qemu-devel@nongnu.org; Tue, 22 Sep 2026 17:56:43 -0400 Received: by mail-dl2-x0f.google.com with SMTP id a92af1059eb24-1438e88300cso282569c88.0 for ; Tue, 22 Sep 2026 14:56:41 -0700 (PDT) Received: from WIN-BH9M8FJACR9 ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id a92af1059eb24-144f949e60dsm1001153c88.2.2026.09.22.14.56.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Sep 2026 14:56:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790114200; x=1790719000; 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=rPXXZSMg3B1e8GVfb4Q4EgRzyMm8fU6LPV9bb/pqSMM=; b=SBkwiVcN0ukculAteGb0YDZOoC1RPzMWslD0aqkaRbAo2uf6CNhg/OImYUhxiBAS6H zGlix6d5+4vUTuIn670/eEG7aqLSRjIoh6+wEGU6ded+tXUTm9I8WvFbolDtwU+VxUQp Y/vDZ23PIOsLsbrZ9yDwyxZ+DAnoYvU0jgUe9YlRKEHWeyJC5orWqDD86UPrDUXRVka1 rcSDbIr+o1aheW7xwrDfyN0VFV7FKup6sZQ+X58z9JdgIVua/xY7/8bzFl58sesJ2Rao a+zBXi+Dk9UkHGOt8nbG3RjB3VTt+xWMqmhss+Fz/+/hrV6EMZ/tKS576ALouo1LqfS5 RFnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790114200; x=1790719000; 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=rPXXZSMg3B1e8GVfb4Q4EgRzyMm8fU6LPV9bb/pqSMM=; b=ZQgj8EgdlC8rUaEO+s4J+xxSuQddtQzSgwfg5c9B8iBHJ+q+B+E/NM9Z6gtwIHnE5z +CjrmBIAYWMQnjeyhvpih+W4TgvlbXTpie/+NqXiQDd7bp6gere+OovJDaFRmp1dMgjK yF7foFZNr5l/3fXxZq7QhRv7UG/4O6RSkoiKJLba25ZjTS666z2dsQ09yWnofY+CU0bx xt4sX615fBZTKwJeLI9qWTCqt1EhY1tLafnHi7IKDCQNCqgmgfqOMQ/COYVrvcZqgrH7 28fZmButMVn43eCmPcV1et1Gwqth0GpUhofQgSaBi9gCQEsWP2rJxeLS6s7O5t7vETS2 NS9g== X-Gm-Message-State: AFuF++msdNwiltBXwocD2PviiMdH8+jGsEcjUvNPosU/oVf/iGm8CFjN UaJvJnLefTTuEJOV99S6kbBie8UONSCzIaztfi418CKat7nhDt5drhKIdn2hhRPy7mQ= X-Gm-Gg: AYBFou3JjNZNlUn0qpcN0xK8x3Yy+fcF4bgmh1bXq+H/6ociN2yoAba4D7mhTrhZrbR 42tpZWlAePWAC+rjsz5v8d65TjAJSoRq/vXa/vWKG3wc6Z1ubGIt3qpjDtJh15i2CBJ0wAopyRt uMod44kjD6OnaeyYbsWvT/8OMJT51hA4BFtOWEaHBEFcw01c38GEFA9oZsXYgV4l0ipGXTbrqoO Ks7c3g+zr4B7jSvNvBnYnMopKifGtu0mcoMp6fLDkP9u/XHNOUV00JIiCxG6SQw1H2ZP0Q/C4nh Wdp09GEJTSvAKXZPTT+lhDWqh5mOz/W4AUdoCylkH2w4/Zduc94dD0Ix3jXyzZ+nuAcB/rEoD2H B/U+/nwLxEjkSTvuKGdVDIE5ZiCAQX213GX0EDRXvgDI9V/ismc1pEEe44GmJ49oVLnY5J5CuLX eQzmiGqIvIwQLAZNNabzobZymMsqb/y7LMyUYXpQ7kE0OLD6T0r+a5t5W0g0hdMvXW+D647+r+G RaeMdlSqkG9/rxGvxynd7mZoTolaAE= X-Received: by 2002:a05:701b:2304:b0:143:8865:cca with SMTP id a92af1059eb24-144f91cb678mr718145c88.22.1790114199904; Tue, 22 Sep 2026 14:56:39 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Bibo Mao , Xianglai Li , Laurent Vivier , Palmer Dabbelt , Chao Liu , qemu-arm@nongnu.org, Alistair Francis , Laurent Vivier , Pierrick Bouvier , Weiwei Li , Daniel Henrique Barboza , Zhao Liu , Peter Maydell , Fabiano Rosas , Song Gao <17746591750@163.com>, Markus Armbruster , Liu Zhiwei , qemu-riscv@nongnu.org, Stafford Horne , Brian Cain , Jiaxun Yang , Max Filippov , Philippe Mathieu-Daude , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Eric Blake Subject: [PATCH v2 9/9] qapi: return MachineInfo typename from query-machines Date: Wed, 23 Sep 2026 05:55:32 +0800 Message-ID: <20260922215533.641-10-luoyonggang@gmail.com> X-Mailer: git-send-email 2.52.0.windows.1 In-Reply-To: <20260922215533.641-1-luoyonggang@gmail.com> References: <20260922215533.641-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:38::f; envelope-from=luoyonggang@gmail.com; helo=mail-dl2-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: 1790114289713158500 Content-Type: text/plain; charset="utf-8" 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