From nobody Fri Oct 10 20:25:56 2025 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1677797064; cv=none; d=zohomail.com; s=zohoarc; b=ktFhHKqEc0RXlpkKrri/Eu7tqNyISzfiAy5GuOakG7TG100yZCmmU1qb+mpfNgFxF5bSQsCJHmxrwjoRQviP+ko1IuuRjUqnEn3kkP73tmF/1oxdr7WwAMriYJPkpxc44UcHP9gvUH2E/nhLWv/OgFqQxQyfPNuWbx2DENxQqJk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677797064; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=76WGhaMeuPYXbX/pWJbcrHLrwrtrG1g1D4hmZur00GA=; b=lm3xDiB78GRPoTui3Cx+iCrHnVfJHKZyxiajCsfRUpNCDO2/kb/SDBn6wDSkr+dF0gUk/BXu9MmOWWdw2zCtHTvT4JsO6snqT6ReWs007IqmTioZsC3KZovjIfsN+NmCki7BfpbwXXd84kSxTfac5AcncRJ9/IA66gUzSTvpg3I= 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 lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677797064015871.2623505884266; Thu, 2 Mar 2023 14:44:24 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXre5-0002vr-2C; Thu, 02 Mar 2023 17:43:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pXrdw-0002kR-VR for qemu-devel@nongnu.org; Thu, 02 Mar 2023 17:43:21 -0500 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pXrdt-0000Mb-OQ for qemu-devel@nongnu.org; Thu, 02 Mar 2023 17:43:20 -0500 Received: by mail-wr1-x430.google.com with SMTP id l25so618876wrb.3 for ; Thu, 02 Mar 2023 14:43:17 -0800 (PST) Received: from localhost.localdomain (43.red-95-127-39.staticip.rima-tde.net. [95.127.39.43]) by smtp.gmail.com with ESMTPSA id e15-20020a5d594f000000b002c56046a3b5sm481652wri.53.2023.03.02.14.43.13 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 02 Mar 2023 14:43:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1677796996; 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; bh=76WGhaMeuPYXbX/pWJbcrHLrwrtrG1g1D4hmZur00GA=; b=iZ+l7xfL/1aNIR07/GVT61XLdWOjC9vj9inShnVEGcn2SL8TMzabaUo+q9kls+6Yor upoRAiiycnbd+h8MZJQQAR9Pu0iTaEccnMBa3T4BFoenT+FB7tYJr7Pa86EPOYhs/gh0 TZTsoFy6IYnJC0352DUKIVKExKJijx4G231iO87Ik+yqxrF18FZeFXoMiyWKo0v3q1nf 6P8uLflQcn2DqZRh47b5iE+Nawc5bjSX6One1SHOAE/FDtDQGDSC+3XRSYC8LrdPbSIN aubb0gL2IHevP8Mml1072IZAgnBK/L7zDERaAMkiI+h/BY+knaFBPUDhYGlWC+0esbpH G1Dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677796996; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=76WGhaMeuPYXbX/pWJbcrHLrwrtrG1g1D4hmZur00GA=; b=MOgC3xKq5rZprR6IK1g36e7553diQ6C6WxbbYqTMX4KbFi4T/RCQkGoj2Z9+oS5YYz S3ydfqvh0bJFzIoQyr5yMCGnZGGd5AwAkN8Qgq79fzxHRsHnj8AzDPYt5dNZDbtJqYBx VnT+4PsRo3nd49PTmwQkT97xO9xC0WRHj7gBeVEQhl4MWNmoPO3YXn6AKLmTH9zcAp5/ VA8fGAweB2P6yTzHxhemvArX2c8j0FIYXLyfo2eEfeG41Xo5ERwRrGlmrMRZqS9odOiz OeLrTgRH8T2YqcYmJcic4fOGqRN/Xe2ataXi59BFYi5V7kEcM48HBfaPIoQqR87uNj/n ajxQ== X-Gm-Message-State: AO0yUKU1r8G+ODG649qOoXO4zgwbitj8FOI+TesB9OdFkWqARS9uHdqG qai/QV5As+Yp4HoX69onxnAJE4uTPz9PzIdQ X-Google-Smtp-Source: AK7set/IJYEjq/epgGkE/m9+5/R30RsFhzIsMKPihePS9U+Gd/Zr1KhBpK7/C9/vZr3J5ViJs4g0ng== X-Received: by 2002:adf:f604:0:b0:2cd:8237:345b with SMTP id t4-20020adff604000000b002cd8237345bmr2131316wrp.9.1677796996311; Thu, 02 Mar 2023 14:43:16 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Bernhard Beschow Cc: John Snow , David Woodhouse , BALATON Zoltan , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , qemu-ppc@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" , Marcel Apfelbaum , Aurelien Jarno , Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost Subject: [PATCH v3 18/18] hw/isa/piix: Unify PIIX-ISA QOM type names using qdev aliases Date: Thu, 2 Mar 2023 23:40:58 +0100 Message-Id: <20230302224058.43315-19-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230302224058.43315-1-philmd@linaro.org> References: <20230302224058.43315-1-philmd@linaro.org> 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=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=philmd@linaro.org; helo=mail-wr1-x430.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, 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: 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 @linaro.org) X-ZM-MESSAGEID: 1677797064652100005 Unify PIIX ISA (PCI function #0) as: pci-piix3 -> piix-isa (abstract base class) PIIX3 -> piix3-isa (PIIX3 implementation) PIIX3-xen -> piix3-isa-xen (PIIX3 implementation with Xen extensions) piix4-isa -> piix4-isa (PIIX4 implementation) Alias previous names in the QDevAlias table. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/southbridge/piix.h | 6 +++--- softmmu/qdev-monitor.c | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/hw/southbridge/piix.h b/include/hw/southbridge/piix.h index 71a82ef266..cce65e8f44 100644 --- a/include/hw/southbridge/piix.h +++ b/include/hw/southbridge/piix.h @@ -58,9 +58,9 @@ struct PIIX3State { MemoryRegion rcr_mem; }; =20 -#define TYPE_PIIX_ISA "pci-piix3" -#define TYPE_PIIX3_ISA "PIIX3" -#define TYPE_PIIX3_ISA_XEN "PIIX3-xen" +#define TYPE_PIIX_ISA "piix-isa" +#define TYPE_PIIX3_ISA "piix3-isa" +#define TYPE_PIIX3_ISA_XEN "piix3-isa-xen" #define TYPE_PIIX4_ISA "piix4-isa" =20 OBJECT_DECLARE_SIMPLE_TYPE(PIIX3State, PIIX3_ISA) diff --git a/softmmu/qdev-monitor.c b/softmmu/qdev-monitor.c index b8d2c4dadd..820e7f52ad 100644 --- a/softmmu/qdev-monitor.c +++ b/softmmu/qdev-monitor.c @@ -72,6 +72,9 @@ static const QDevAlias qdev_alias_table[] =3D { { "ES1370", "es1370" }, /* -soundhw name */ { "ich9-ahci", "ahci" }, { "lsi53c895a", "lsi" }, + { "piix-isa", "pci-piix3" }, + { "piix3-isa", "PIIX3" }, + { "piix3-isa-xen", "PIIX3-xen" }, { "virtio-9p-device", "virtio-9p", QEMU_ARCH_VIRTIO_MMIO }, { "virtio-9p-ccw", "virtio-9p", QEMU_ARCH_VIRTIO_CCW }, { "virtio-9p-pci", "virtio-9p", QEMU_ARCH_VIRTIO_PCI }, --=20 2.38.1