From patchwork Thu Oct 12 04:12:35 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: 732462 Delivered-To: patch@linaro.org Received: by 2002:a5d:54d1:0:b0:31d:da82:a3b4 with SMTP id x17csp752678wrv; Wed, 11 Oct 2023 21:19:32 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH6oPznPxx6hCj5v3ATCJpWqjbfet56Fb4DLiT5CMOkaFPT6e5Jm88rvBa+hDaYxVxabLvA X-Received: by 2002:a05:620a:4554:b0:775:7d81:f8bb with SMTP id u20-20020a05620a455400b007757d81f8bbmr30425292qkp.11.1697084372149; Wed, 11 Oct 2023 21:19:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697084372; cv=none; d=google.com; s=arc-20160816; b=sSnJJQcgrWrsbnK4rSfANBdunfIrXtPz2q7ZnGlfgPMaQAfXAmRD1nf14p8XqSKRLr LjTUn1bc6KVpZWjQoi6Cg/4iXB1uVkESLeTSCW8/bh617/9TM1P97Jh98fdSDeUYwvRP pPL+igBPjMVsE+WGzuiuUzVTjjxKIlhR4TJOsVlqW57qHdzApXldFYRgbqYyxDlE5hT5 56XrWt/5Z2W+yb6ufhcKQwlUWNjsLTJrviUCemza2U20HvZ0vcBGHXbnVt/jFT54ISrs jaDmTyjcSNxms1hS2hhc81UWs+36CUZRhHBxhM8kEqB/yrxgl/aK3oamKqKWMoyFZvHL znRg== 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=lWNq3KWxwESBCknmH6aQ2YVg3r1DMh4fTWxmynlFDM0=; fh=JC0uePkDNHAC6vZ7v8QWv0c8a4TbaacWMibqgTcw/aQ=; b=Pv0/Lz4F101Iu1/rsUo1tOuYkE1RR+6i81NhcgGBmxx1f/KDKEJbKQ9znnPmXL4eQI CssxZzu62xpzNO4LD4asTkXM0GviyVGAS2pz12f2AV0Pe2VcSBNGIWPeA53E2EA/xIyB a8yUOk8hN9wmbls7Qg4NXTFXRaddJQ1TvNfKnJa8stXugIJzsJcIwetGxokCSvaIsK0t LzeazGDkioRN/afZHLBPKlDd3cXzLqCcUa/GmRA+DshOzNz09M0jugtJJ0t8XqHL+iP2 AwdTB3J94QuyT/iuXWYAT2Wn8gbk4I2e0Qh43WyN1VbfBcgJ/eVw+/m3OhXrsgFI4epr FxTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fGopAv3t; 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 m10-20020a05620a214a00b00775b341e4c3si10163132qkm.103.2023.10.11.21.19.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 11 Oct 2023 21:19:32 -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=fGopAv3t; 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 1qqn47-00034Y-Fw; Thu, 12 Oct 2023 00:12:51 -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 1qqn45-0002y1-GH for qemu-devel@nongnu.org; Thu, 12 Oct 2023 00:12:49 -0400 Received: from mail-ed1-x532.google.com ([2a00:1450:4864:20::532]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qqn43-0002Y2-KA for qemu-devel@nongnu.org; Thu, 12 Oct 2023 00:12:49 -0400 Received: by mail-ed1-x532.google.com with SMTP id 4fb4d7f45d1cf-53de0d1dc46so973552a12.3 for ; Wed, 11 Oct 2023 21:12:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697083965; x=1697688765; 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=lWNq3KWxwESBCknmH6aQ2YVg3r1DMh4fTWxmynlFDM0=; b=fGopAv3tLuaBWtx+fTKUYshtGF3yoVhkRKO0jtTy/3qiEag4PemWkozISdXwtBazIE 4+5izvh9p5it7YhZj6Pit8tj7gP+API7oVmpuJwg2BcF1XhzXVVTr4Bc9EgEu5yK74k/ vIMz2n77abK8NOmFNb8t3GvvcIJdZ+PHdVAz+/GtwpYuuKGE8vvaHieIYYSvG2F/Zrgl 5U59mcLX77PEpOenX0T8qHwX8tfuFARgj940wKJst9J1oEz3I7EHjve/+ljMUgTosuti agWjGRlEAW28qQdUv352gLBQN9Lux3Q8noUYM32wF8un1/tTdz+zrGqsWcloCAHA91/T FfsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697083965; x=1697688765; 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=lWNq3KWxwESBCknmH6aQ2YVg3r1DMh4fTWxmynlFDM0=; b=vy4py0XTMP9YFZFk8WUy1/gcozmPXIBYgdJE6hN9vViMN34K0gl+xxtbXPAfHoNfyW 1UofFd4ndHJbQrwpkNdpSC1ASNPN3oGI1ibyNCMbnd18coWB298hb+Ajtc8RbQ2EKnRO S8Qf0wJwBvL0/Se/h8EanaDNFov8pAA6hKDlypiwLg96NDBJmuV6rvd2aepDbimh46ER Zl9euzh4tQLwiVgCagd++49sgJLwaFYNw9EDX4lGnmc323/tWBcGTQg7X0+e/ftCakrC QBnW+jc5tHJtBTm0k3Kf1nw0CUl9w9Qlwu8AEGcJ1eDMbsdGQ+fGridqKeQVzmAXl7rQ bmaQ== X-Gm-Message-State: AOJu0Yz29Db9sb6EnDt1VVMRCnwYs0PWL1yKTzrtqNkn2NfQHPl6Wmx7 nnoXnmCI9M9uR65umSmikwafe9/WCYAgM1zLtqXjpA== X-Received: by 2002:a05:6402:351:b0:533:87c9:4a83 with SMTP id r17-20020a056402035100b0053387c94a83mr20694022edw.37.1697083965369; Wed, 11 Oct 2023 21:12:45 -0700 (PDT) Received: from m1x-phil.lan (dcs23-h01-176-173-173-31.dsl.sta.abo.bbox.fr. [176.173.173.31]) by smtp.gmail.com with ESMTPSA id dm9-20020a05640222c900b0053db1ca293asm1993649edb.19.2023.10.11.21.12.43 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 11 Oct 2023 21:12:45 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yoshinori Sato , Magnus Damm , qemu-trivial@nongnu.org, =?utf-8?q?Phi?= =?utf-8?q?lippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 1/3] hw/pci-host/sh_pcic: Declare CPU QOM types using DEFINE_TYPES() macro Date: Thu, 12 Oct 2023 06:12:35 +0200 Message-ID: <20231012041237.22281-2-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231012041237.22281-1-philmd@linaro.org> References: <20231012041237.22281-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::532; envelope-from=philmd@linaro.org; helo=mail-ed1-x532.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. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Yoshinori Sato --- hw/pci-host/sh_pci.c | 40 +++++++++++++++++----------------------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/hw/pci-host/sh_pci.c b/hw/pci-host/sh_pci.c index 77e7bbc65f..41aed48c85 100644 --- a/hw/pci-host/sh_pci.c +++ b/hw/pci-host/sh_pci.c @@ -167,17 +167,6 @@ static void sh_pci_host_class_init(ObjectClass *klass, void *data) dc->user_creatable = false; } -static const TypeInfo sh_pci_host_info = { - .name = "sh_pci_host", - .parent = TYPE_PCI_DEVICE, - .instance_size = sizeof(PCIDevice), - .class_init = sh_pci_host_class_init, - .interfaces = (InterfaceInfo[]) { - { INTERFACE_CONVENTIONAL_PCI_DEVICE }, - { }, - }, -}; - static void sh_pci_device_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); @@ -185,17 +174,22 @@ static void sh_pci_device_class_init(ObjectClass *klass, void *data) dc->realize = sh_pci_device_realize; } -static const TypeInfo sh_pci_device_info = { - .name = TYPE_SH_PCI_HOST_BRIDGE, - .parent = TYPE_PCI_HOST_BRIDGE, - .instance_size = sizeof(SHPCIState), - .class_init = sh_pci_device_class_init, +static const TypeInfo sh_pcic_types[] = { + { + .name = TYPE_SH_PCI_HOST_BRIDGE, + .parent = TYPE_PCI_HOST_BRIDGE, + .instance_size = sizeof(SHPCIState), + .class_init = sh_pci_device_class_init, + }, { + .name = "sh_pci_host", + .parent = TYPE_PCI_DEVICE, + .instance_size = sizeof(PCIDevice), + .class_init = sh_pci_host_class_init, + .interfaces = (InterfaceInfo[]) { + { INTERFACE_CONVENTIONAL_PCI_DEVICE }, + { }, + }, + }, }; -static void sh_pci_register_types(void) -{ - type_register_static(&sh_pci_device_info); - type_register_static(&sh_pci_host_info); -} - -type_init(sh_pci_register_types) +DEFINE_TYPES(sh_pcic_types)