From patchwork Fri Feb 10 16:57:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 652357 Delivered-To: patch@linaro.org Received: by 2002:adf:f90f:0:0:0:0:0 with SMTP id b15csp1070460wrr; Fri, 10 Feb 2023 08:59:23 -0800 (PST) X-Google-Smtp-Source: AK7set+U0Jt2iftcFhoVcvii9dTEnJrzHebNjKIpveCYWW2aAneBP20JBQDvalotc0eXrBEYzhA9 X-Received: by 2002:a05:6214:27e1:b0:539:45bd:5b73 with SMTP id jt1-20020a05621427e100b0053945bd5b73mr22480721qvb.52.1676048363676; Fri, 10 Feb 2023 08:59:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676048363; cv=none; d=google.com; s=arc-20160816; b=VzbsfHu23jgrYs2YSpbVsv3gUih/pRrvxpLJLNVa77NP4/0KI3+sVcgxJ4e2oh5WRk sjfw6EZVaBCiuJ20bTXtEv/g+nIvptH0Jpc/NcqiDcstWF/XjCRqdMpbg6EAAv6whzzl 6HV2N2w2tKv4CXsS/qFyLz07AbESvcWDhtFN9D/caRcc0C8PfL07jys0Esf5OicM0iZL nPakfDySzL9R+vknJH63n4hLSHShGe+baYGmi/oHQpLe0iERHGUCGz4upm7Vdk1cu8kI Vsx4Tw/gMjzinwR/JRk9tt3aUaa+Vj40T0ck7qJS1NrWKNTVnUEzUlfcMuSAhauFgALo hyXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=76WGhaMeuPYXbX/pWJbcrHLrwrtrG1g1D4hmZur00GA=; b=vIbmDNkkXuhLeLk1bJS04Mca4/BBquiirsuwX0PDLa9x23A8FjGPKmxNhEi3PxKvxy EUnReghwNAjIzls7h3WbBZoksI2ZGfSnQZYhwrFgXPTwdOr2Y/MaTUb/FdD316LZiSsk svjudPnoS9mS2BLEMeenZ95kgCCWdYH2UOcCv+0ShkRr0NEvlxSNaz1r7FgPTbaSmNhB vEWv/bRqNRa54haEKQe/rdp6U5HEBYhByhfzogPGWfqoYbmn9ucK+uc4IN5tvHu4+Rqb KWrIoI2Y+r5zFio2ZlZSc7yRWBoslIfCxITMM5unl9kjsduJ5JX+MRDAN8/d8v+J6yNe +G6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qWkoEjoO; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d15-20020a0ce44f000000b005542726b064si3897283qvm.434.2023.02.10.08.59.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 10 Feb 2023 08:59:23 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qWkoEjoO; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQWj6-0003Yu-Kl; Fri, 10 Feb 2023 11:58:20 -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 1pQWj5-0003Yi-8c for qemu-devel@nongnu.org; Fri, 10 Feb 2023 11:58:19 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pQWj3-0003zc-IE for qemu-devel@nongnu.org; Fri, 10 Feb 2023 11:58:18 -0500 Received: by mail-wm1-x333.google.com with SMTP id z13so4286078wmp.2 for ; Fri, 10 Feb 2023 08:58:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=qWkoEjoOVmCqr1OiTv613fwL4i8yn6qDJ3BoIC2oamGES+NCsMCI0XZHfy3bQYqdya +ccw38zjVDi3QnECFPfE29HG36boSUEXSOdroeZM9pjZKxvOCtGyYGc9y4PsE7JZgh+2 OuAYUqCQSO8qDbK/AcGzZBfRSa2RHRiKAe6zGUiaCi8ZG8VfFxasAqNIEVMIDEF/5CVt uoVqXbIbm/+a1G07m7Yyv+z0ad5R8ykSJ7ehGpKG+xCQUzBm4WuzO0XHlVS1/LDiL9IC uJiC9uboEtxeD58PAXvP+kGKsUxLOvF6QJwLeaDZoKX7YnhhCIaCFWFeCMEbzBkvitLf 5jXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=fPYmk6TVpveoMUqRmjYIMlwhSCVeP/q+sFYpEAwsVy4CGsB6xYPiaoxQYhazwUhQTL AqBJ/fwhlWOOlEZf5fI5XQQREKhIcfI53p3+LPwHUH6GF6dppooyIMMQdTHOstWfMuFW K698CiSjTo0aqNHAKXcG3LK6u25tiU5hZwDS8/g77Bc6dYZUX1tNg9B+812mhLGoX2Hk gk+lXb2bDUAjrzds+is9W9mi/doRQ7yYOhRdaMPBgRncVoIJzWbDAQ6B9y32qTURtpEJ tHS66OjmLbM8ZCPOLQDzZfyWgUkj6elYUYT0lFjZm9EYGXi8e+wI3eDjf7hwr955Uyy9 EBzg== X-Gm-Message-State: AO0yUKU6wPpw+AM9+ZqQEuj7hFwFok0N0q8NV9NuPsp1opBlLw178sTI SLwbTSBi3vHoemYAw4sFOR4U8oh5r0UU54st X-Received: by 2002:a05:600c:331a:b0:3dd:f286:5ae9 with SMTP id q26-20020a05600c331a00b003ddf2865ae9mr13493365wmp.9.1676048296006; Fri, 10 Feb 2023 08:58:16 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id b39-20020a05600c4aa700b003dc433bb5e1sm5519466wmp.9.2023.02.10.08.58.14 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 10 Feb 2023 08:58:15 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Eduardo Habkost , Thomas Huth , "Michael S. Tsirkin" , Richard Henderson , =?utf-8?q?Herv=C3=A9_Pous?= =?utf-8?q?sineau?= , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Aurelien Jarno , Marcel Apfelbaum , Paolo Bonzini , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= Subject: [PATCH 4/4] hw/isa/piix: Unify PIIX-ISA QOM type names using qdev aliases Date: Fri, 10 Feb 2023 17:57:54 +0100 Message-Id: <20230210165754.34342-5-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230210165754.34342-1-philmd@linaro.org> References: <20230210165754.34342-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.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=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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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é --- 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; }; -#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" 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[] = { { "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 },