From patchwork Thu Mar 2 22:40:55 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: 658168 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp145492wrb; Thu, 2 Mar 2023 14:44:14 -0800 (PST) X-Google-Smtp-Source: AK7set/+uNXlzTIsBnL3itbdR5b3J4xigYGqmMobMhHPv3zysr/OgAQ1hkRj8plInn2UsqUj7mYy X-Received: by 2002:a05:622a:13d3:b0:3bd:d2f:8de4 with SMTP id p19-20020a05622a13d300b003bd0d2f8de4mr6407581qtk.15.1677797053813; Thu, 02 Mar 2023 14:44:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677797053; cv=none; d=google.com; s=arc-20160816; b=trMeS/Ll+YJQMEIfwrc0PJrcSNnLYU4syBukcNqMKhoaC4W6v4NuJW2cYk5fVxVK9k /o1yA6wjXncb2m2qeN+mwShffnJar6+xMx2wOY5fBJmK/8iPor32W/WFeN/gVaoqyiL3 aLG5LW2VOsxNeqmI55d8KtBUpCdj4iYbf7cr2Le7aJvpzYmBSDytt+CCUei0ctafjjQV Lf8qZa476WByxoIwPqaRKmqiSQyL5D2ju2e3kHdJWFLrxASq3ntn4j9tQBsv3HGwLbgl UdPGKd1YrDRztw6HlsHkpyXvuYLUHwxF63XIh2r50952S3VQ6zRx0C0Rmo3kTqzZJjPm JPrQ== 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=Bd1OtqBygG3Ey4k52ycKQXbZ8TYrh9zI9oYB+ByJfKQ=; b=TANYjWRrwajHKdmFzXQbmo/ezTPHpe8lFOPCCK52Mc+AxKKQ901CFHZV60I4UoeAUT ffPcXEUNq2PtTIvNmNe1Xl4Ns1ZepYFbi3z3WTdKZ1pdHRQkI57ZC1rhaEKqTl54QeVO gUPCPDmydFVtsRQBu0T3uuVlXhcyKIxBzomg8xL4Wr/oA5mTWDHRcSzxhc8XkShtNc71 /mqcXu7NZNDpFmjtissMSU6oDtUYuYcGGHMi5jKH7pYbV7WsfaIdgoD3PDxoD0UHfxnA mQ93TE6HwiRTqangnu/MmT/5khIz/fE1ZUyBfawNxvqKmoCQ0cqpiowBL+IMLftQdxym z+Tg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CrJZMr7N; 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 t2-20020a05622a01c200b003b9b98b50dfsi659906qtw.185.2023.03.02.14.44.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 02 Mar 2023 14:44:13 -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=CrJZMr7N; 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 1pXrdY-0001Pi-SE; Thu, 02 Mar 2023 17:42:56 -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 1pXrdX-0001LR-QZ for qemu-devel@nongnu.org; Thu, 02 Mar 2023 17:42:55 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pXrdW-0000Ea-7D for qemu-devel@nongnu.org; Thu, 02 Mar 2023 17:42:55 -0500 Received: by mail-wm1-x32e.google.com with SMTP id p16so560253wmq.5 for ; Thu, 02 Mar 2023 14:42:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1677796973; 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=Bd1OtqBygG3Ey4k52ycKQXbZ8TYrh9zI9oYB+ByJfKQ=; b=CrJZMr7NS+K1QFqpo31b6xY5hqthq8dEBov+MA1lV2MpErknHKeDWvcWwB+0go9Mtx 9SdneTw2a3YbL0Km/+r3ve0MLPsYkdX3tDY3Zu+PfJnJm/WebLC4OV+EwYEBbeSK9qxy 3HsNloyEwb2rGPIFbRqX63jngRYf5nowJnSjXwZYoHMIJRrrZn5AbRzWHzbxCi5y5UAj VLH295r57xm5jSiMhzBpJzmZcuR3XJk9SITV2TC9M3o2i+PMeziwpFoVovFwYLJ7hGsR bEJaXbu/lfuZj9Xa86LkuOUzxIHU48swjyo4DBdfNRH7db2MuOiybI/5B/g5cQF8b0bg yPZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677796973; 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=Bd1OtqBygG3Ey4k52ycKQXbZ8TYrh9zI9oYB+ByJfKQ=; b=duFopnm0f0/nB6kyPJYdhLa43WiyknQV6uP68LsJKT3LvdcuRyQ4Yh3rpL9sAxfvrs HfqGRFGRngupHTW9XmAOefqPxWhX/Eo4Dqah8aHjpXoBDE5tu/z63rynJndJG6YJ3wdO CPk2CyfsP834zj1AmZ5KxPM8HfjgBf7XsFPFFsthF1/1klt2yqzh3S3z56czpP1LbuPL wNXBX/9KSErFQYDNWAtdXueJq16UiyzSVolL8WPjl4IzE0PnWpO7+QmCv+oLeAzPTbJp RXaEdPUDq8/5xPRdNYrDHni9DMKsKhWpO+uqO35DU0nuNCdl1e1kXV4zocOvsc7t2pYE +C8Q== X-Gm-Message-State: AO0yUKXv6m51Y4A21slNWTUMCGDoqj1Z+8Hgmd9OeJsfi2a7NNFmI4wQ 1P/+x1q4xsslsJBejpRCy1vJB2REDLxYFVG9 X-Received: by 2002:a05:600c:181d:b0:3ea:f6c4:5f2a with SMTP id n29-20020a05600c181d00b003eaf6c45f2amr8904936wmp.17.1677796973389; Thu, 02 Mar 2023 14:42:53 -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 k8-20020a5d66c8000000b002c573a6216fsm500468wrw.37.2023.03.02.14.42.51 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 02 Mar 2023 14:42:53 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Bernhard Beschow Cc: John Snow , David Woodhouse , BALATON Zoltan , =?utf-8?q?Herv=C3=A9_Poussineau?= , qemu-ppc@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aurelien Jarno , "Michael S. Tsirkin" , Marcel Apfelbaum Subject: [PATCH v3 15/18] hw/southbridge/piix: Use OBJECT_DECLARE_SIMPLE_TYPE() macro Date: Thu, 2 Mar 2023 23:40:55 +0100 Message-Id: <20230302224058.43315-16-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 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.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 Manually convert to OBJECT_DECLARE_SIMPLE_TYPE() macro, similarly to automatic conversion from commit 8063396bf3 ("Use OBJECT_DECLARE_SIMPLE_TYPE when possible"). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Mark Cave-Ayland --- include/hw/southbridge/piix.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/include/hw/southbridge/piix.h b/include/hw/southbridge/piix.h index 0bf48e936d..a58bf13a41 100644 --- a/include/hw/southbridge/piix.h +++ b/include/hw/southbridge/piix.h @@ -29,7 +29,7 @@ #define PIIX_NUM_PIC_IRQS 16 /* i8259 * 2 */ #define PIIX_NUM_PIRQS 4ULL /* PIRQ[A-D] */ -struct PIIXState { +struct PIIX3State { PCIDevice dev; /* @@ -57,14 +57,12 @@ struct PIIXState { /* IO memory region for Reset Control Register (PIIX_RCR_IOPORT) */ MemoryRegion rcr_mem; }; -typedef struct PIIXState PIIX3State; #define TYPE_PIIX3_PCI_DEVICE "pci-piix3" -DECLARE_INSTANCE_CHECKER(PIIX3State, PIIX3_PCI_DEVICE, - TYPE_PIIX3_PCI_DEVICE) - #define TYPE_PIIX3_DEVICE "PIIX3" #define TYPE_PIIX3_XEN_DEVICE "PIIX3-xen" #define TYPE_PIIX4_PCI_DEVICE "piix4-isa" +OBJECT_DECLARE_SIMPLE_TYPE(PIIX3State, PIIX3_PCI_DEVICE) + #endif