From patchwork Thu Oct 12 12:18:49 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: 732469 Delivered-To: patch@linaro.org Received: by 2002:a5d:54d1:0:b0:31d:da82:a3b4 with SMTP id x17csp916666wrv; Thu, 12 Oct 2023 05:20:05 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH/MlgbM/FH0KoXkyzOfdxL8u+Fdv5KI0D4hJ5sxMxqgOd7XoABmvgGUgQVvYfOf90Po8GH X-Received: by 2002:a05:6214:4188:b0:655:d7b5:4728 with SMTP id ld8-20020a056214418800b00655d7b54728mr22944924qvb.54.1697113204708; Thu, 12 Oct 2023 05:20:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697113204; cv=none; d=google.com; s=arc-20160816; b=TsZktFl59RPgQ++a0U1owhCxpW6opV9Nu8AOArEPu9dhy8EBGsmwR3XlSN+PbpdN3Y D+3ShhTqIjhP5hJnTNInzTZXKMRiZ0I1+KNYJMofVA2z6+sdZmsPxyEhM/GNuPIzb65n Ee8/X8F8czBjJupkkSkN/7ctN+azsHHGLMQCOcnqt3qt8D1jL8XaNHapVS0biIkRyNo6 JMYTsjyXX5tv3RcY7Y5jFq8ft0Fz0B8OHlN1HzX4XB4zoZFvkutwQB749xxXfpZ2Q4zv YyIUyYXPCCtOuTal/YCxPBBil6uY/ni5iYSiVVNrq2jw1NIZhNrgqsh/BPdYvtTKi/lN tlDQ== 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=gZd2RKyqgmNmX/QmPgvNjI61C3FFoLBUU4C4GM7tl24=; fh=uMYo3jOuXUsDthaXCE4/M6n3+voY5rtHQA7Grzg1cYU=; b=PrRVTmqNimk7zNOECW7NHfvXDnvSbkfRiB0f5PGJHa9zVJEquP7ldGHVvS8aIbndPg 7BV52cXGjEgwWGE9UrHGLvbdX7wxbFUnB9Vo6hmf8uqH6KEyzEYroRov+XsTc4AQ6ft1 v+d/d6/4hVR5VAc3VqC49/gT1vUQTcFwE+A9dRm7WszeHpWlWoG9jPLoW/IerU5Xc9fg s7044tzgucpj6wovQtAsWmqoDJgnx9lonbhYBQFm++ti/de3JAHLmlvtzw03+LGDlZME Mdxn0ALQtZHGfDYCits7Koi7pQFRe0D81Zyr41DvYMgEm5LCWKayZlzZG/PTsKIV8MJ5 Lvuw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="eT3NCh/S"; 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 bt12-20020ad455cc000000b0066d17fa0648si566125qvb.198.2023.10.12.05.20.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 12 Oct 2023 05:20:04 -0700 (PDT) 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="eT3NCh/S"; 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 1qqueq-0002jt-MY; Thu, 12 Oct 2023 08:19:16 -0400 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 1qquem-0002ia-86 for qemu-devel@nongnu.org; Thu, 12 Oct 2023 08:19:12 -0400 Received: from mail-ej1-x62b.google.com ([2a00:1450:4864:20::62b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qquek-0001kS-8o for qemu-devel@nongnu.org; Thu, 12 Oct 2023 08:19:11 -0400 Received: by mail-ej1-x62b.google.com with SMTP id a640c23a62f3a-9ba1eb73c27so147593666b.3 for ; Thu, 12 Oct 2023 05:19:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697113146; x=1697717946; 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; bh=gZd2RKyqgmNmX/QmPgvNjI61C3FFoLBUU4C4GM7tl24=; b=eT3NCh/ShKWaEteKgQ7VrDKNKDniFaguhQGzEutHeea4RYbG5ZgwLb6vWK4GYeL6FU iHtAzbOrFLnouIqy3ZwJaf+XqS9CvnNNBUb2VvIQuBnFRwuyuX8PMw6Mszfqih5VMfX8 Q0Hx5aNIzd+EjS4idcTim0sefSN8vq7C0gsvrTZez9YQ7XbppT8Sd90ZjuqRXPpticjm PninLPT8YBXm/X1ru3c6TW+j3U/5Mr2AVmPMdhxRE0ZpVuyQEP7oYDIqaYNMyE1pxlTw t+f9auV6KAonL1HumZci1qeeTH0aa4+tYt1aE7XdEx6aTjDx5UpX5uT9JxQC7BzSRXyj bGyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697113146; x=1697717946; 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=gZd2RKyqgmNmX/QmPgvNjI61C3FFoLBUU4C4GM7tl24=; b=NroX5KEfAoF8XOB+ZfYz1afjw+WqDjyAkKmJSx8bjK3ppfTBRwotVQjnTfmpZ0sww8 1HWVFWOoCIWlzUep3Sqt6IH3luqvEj5nsB9ZTS9/mDaulD+lHchK8fb2ip4ZIA2ikPZa 8qGZoeo1pZf++Np4kruVGurL0fSiuH2Djf3aRDs6FOIDWu8udiYHAWoVGPMSriklhdQ1 nx/Hi+yAY2MmOqhzPW55SwsIaNMKX01GMUzbKBZdvRpcBkr10sr7D15VVjKMGmNzU5WS tHlxHHBPctjkvFd6Et5hI+p7gojFp1l2b1Fc+S4mZGGweHvBIm+Wr4BWeUaboMQ5fXsJ IsBQ== X-Gm-Message-State: AOJu0Yzo10zl0LERZwsUMob5M/1ptmvAYv8LRQfeYWUcK5l0g3brl/vl blBqgDz45+dGZrySL10UZZ1Bnq/2JhEX7DwWhQdZ2g== X-Received: by 2002:a17:907:75f7:b0:9ae:658f:a80a with SMTP id jz23-20020a17090775f700b009ae658fa80amr20517353ejc.48.1697113146504; Thu, 12 Oct 2023 05:19:06 -0700 (PDT) Received: from m1x-phil.lan (176-131-211-232.abo.bbox.fr. [176.131.211.232]) by smtp.gmail.com with ESMTPSA id i16-20020a1709064ed000b0099bd0b5a2bcsm11065610ejv.101.2023.10.12.05.19.04 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 12 Oct 2023 05:19:05 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Andrey Smirnov , qemu-arm@nongnu.org, Peter Maydell , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Subject: [PATCH 1/8] hw/pci-host/designware: Declare CPU QOM types using DEFINE_TYPES() macro Date: Thu, 12 Oct 2023 14:18:49 +0200 Message-ID: <20231012121857.31873-2-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231012121857.31873-1-philmd@linaro.org> References: <20231012121857.31873-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62b; envelope-from=philmd@linaro.org; helo=mail-ej1-x62b.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 When multiple QOM types are registered in the same file, it is simpler to use the the DEFINE_TYPES() macro. In particular because type array declared with such macro are easier to review. Remove a pointless structure declaration in "designware.h". Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Peter Maydell --- include/hw/pci-host/designware.h | 2 -- hw/pci-host/designware.c | 39 ++++++++++++++------------------ 2 files changed, 17 insertions(+), 24 deletions(-) diff --git a/include/hw/pci-host/designware.h b/include/hw/pci-host/designware.h index 908f3d946b..c484e377a8 100644 --- a/include/hw/pci-host/designware.h +++ b/include/hw/pci-host/designware.h @@ -31,8 +31,6 @@ OBJECT_DECLARE_SIMPLE_TYPE(DesignwarePCIEHost, DESIGNWARE_PCIE_HOST) #define TYPE_DESIGNWARE_PCIE_ROOT "designware-pcie-root" OBJECT_DECLARE_SIMPLE_TYPE(DesignwarePCIERoot, DESIGNWARE_PCIE_ROOT) -struct DesignwarePCIERoot; - typedef struct DesignwarePCIEViewport { DesignwarePCIERoot *root; diff --git a/hw/pci-host/designware.c b/hw/pci-host/designware.c index 6f5442f108..304eca1b5c 100644 --- a/hw/pci-host/designware.c +++ b/hw/pci-host/designware.c @@ -746,28 +746,23 @@ static void designware_pcie_host_init(Object *obj) qdev_prop_set_bit(DEVICE(root), "multifunction", false); } -static const TypeInfo designware_pcie_root_info = { - .name = TYPE_DESIGNWARE_PCIE_ROOT, - .parent = TYPE_PCI_BRIDGE, - .instance_size = sizeof(DesignwarePCIERoot), - .class_init = designware_pcie_root_class_init, - .interfaces = (InterfaceInfo[]) { - { INTERFACE_PCIE_DEVICE }, - { } +static const TypeInfo designware_pcie_types[] = { + { + .name = TYPE_DESIGNWARE_PCIE_HOST, + .parent = TYPE_PCI_HOST_BRIDGE, + .instance_size = sizeof(DesignwarePCIEHost), + .instance_init = designware_pcie_host_init, + .class_init = designware_pcie_host_class_init, + }, { + .name = TYPE_DESIGNWARE_PCIE_ROOT, + .parent = TYPE_PCI_BRIDGE, + .instance_size = sizeof(DesignwarePCIERoot), + .class_init = designware_pcie_root_class_init, + .interfaces = (InterfaceInfo[]) { + { INTERFACE_PCIE_DEVICE }, + { } + }, }, }; -static const TypeInfo designware_pcie_host_info = { - .name = TYPE_DESIGNWARE_PCIE_HOST, - .parent = TYPE_PCI_HOST_BRIDGE, - .instance_size = sizeof(DesignwarePCIEHost), - .instance_init = designware_pcie_host_init, - .class_init = designware_pcie_host_class_init, -}; - -static void designware_pcie_register(void) -{ - type_register_static(&designware_pcie_root_info); - type_register_static(&designware_pcie_host_info); -} -type_init(designware_pcie_register) +DEFINE_TYPES(designware_pcie_types)