From nobody Sat Nov 15 22:25:02 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; 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=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1747211391; cv=none; d=zohomail.com; s=zohoarc; b=X/giBVP74VETUKqE16QgXabhiXhMZzNUKBX4Y5Qg3l4hJas6e1BIOjDGCeCYuXD4hWgVKdwlY7mPjjjTRAnPTdQTOcMklmfRI9Pny95AuI9umr8Q0nndd/HC4ChZzKBVekZfzIP2UlnVVXN2ekg6rDZEqPNz5N2MkK5k+GdBtyI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747211391; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=1l49oiPZr+D7FZqJh9G5VxPO6vhLO82gjTZUxSIns7Q=; b=H2erFYsb4zRmAN4XTpCc6QO50tAKg5iqKRw70n7Ynuo3S4+HRxqNWDWrqILHs88pDSriCfXOkPHaQbOihtEJNJyb8e2gSFIUPeE7Enc8QNkS100v8sH77F5H1yTJoQ5U87CO6kgtLktkM2WERthrrAT/5radJEFwsY53RqGu8aU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; 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 174721139175562.688146001990276; Wed, 14 May 2025 01:29:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uF7UB-0006jC-K3; Wed, 14 May 2025 04:29:07 -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 1uF7U8-0006c4-HH; Wed, 14 May 2025 04:29:04 -0400 Received: from mgamail.intel.com ([198.175.65.10]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uF7U6-0006GC-CJ; Wed, 14 May 2025 04:29:03 -0400 Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 May 2025 01:29:00 -0700 Received: from liuzhao-optiplex-7080.sh.intel.com ([10.239.160.39]) by fmviesa001.fm.intel.com with ESMTP; 14 May 2025 01:28:57 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1747211343; x=1778747343; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=XcfqfXhzwMnZCQ8ssMQpFUaIWpIFYFQwZh6vh4Z+M54=; b=NiO1WSZr7Qd9DYR9LGTEUrF0KvqzzcDDL7GpoxH9pwPKWCvHUk/s9mba c/5oO+MUDkXPmhIODZdnmZhnRFy9Th2A+BKTOSzRUmxm3Key1JZy101tu /iw9ndNzf5pY7l1VckNWFwQ/UVZ+XZKW+g9+R47fTa+EaH9cW8JKMdMbl 2v1df77LBIVfspa+2ZUyssAvdfycwZfnoRaSMtDAYTgRdMDC1KceOsK+E vN0dLAz+JgyuN4MmsFVfMw2TGgfOkwj3SIPOgllNVXO7xZau716FY4XgL j1pze7LJcFuhRpWCP0M+ZcR3wSnlxbEbaIz4WQBCdIMygsI0BIbmiY9V6 A==; X-CSE-ConnectionGUID: rgTAyvQiSwC0rRa3upkV9A== X-CSE-MsgGUID: W/hBv8vmRCifpwJdYCONBQ== X-IronPort-AV: E=McAfee;i="6700,10204,11432"; a="66505579" X-IronPort-AV: E=Sophos;i="6.15,287,1739865600"; d="scan'208";a="66505579" X-CSE-ConnectionGUID: dEgjz3DOSZavm5HX5+IRZA== X-CSE-MsgGUID: mDvUXlf2TZajHn5CvXhD9A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,287,1739865600"; d="scan'208";a="169065815" From: Zhao Liu To: Paolo Bonzini , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Eduardo Habkost Cc: qemu-devel@nongnu.org, qemu-trivial@nongnu.org, Zhao Liu , "Michael S. Tsirkin" , Igor Mammedov , Ani Sinha Subject: [PATCH 3/9] hw/acpi/pci: Consolidate OBJECT_DEFINE_SIMPLE_TYPE_WITH_INTERFACES Date: Wed, 14 May 2025 16:49:51 +0800 Message-Id: <20250514084957.2221975-4-zhao1.liu@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250514084957.2221975-1-zhao1.liu@intel.com> References: <20250514084957.2221975-1-zhao1.liu@intel.com> MIME-Version: 1.0 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=198.175.65.10; envelope-from=zhao1.liu@intel.com; helo=mgamail.intel.com X-Spam_score_int: -58 X-Spam_score: -5.9 X-Spam_bar: ----- X-Spam_report: (-5.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.549, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1747211393406116600 Content-Type: text/plain; charset="utf-8" The QOM types of AcpiGenericInitiator and AcpiGenericPort are declared by OBJECT_DECLARE_SIMPLE_TYPE, which means they don't need the class! Therefore, use OBJECT_DEFINE_SIMPLE_TYPE_WITH_INTERFACES to implement the type, then there's no need for class definition. Cc: "Michael S. Tsirkin" Cc: Igor Mammedov Cc: Ani Sinha Signed-off-by: Zhao Liu Reviewed-by: Ani Sinha --- hw/acpi/pci.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/hw/acpi/pci.c b/hw/acpi/pci.c index d511a8502954..acac6744525e 100644 --- a/hw/acpi/pci.c +++ b/hw/acpi/pci.c @@ -75,16 +75,12 @@ typedef struct AcpiGenericInitiator { uint32_t node; } AcpiGenericInitiator; =20 -typedef struct AcpiGenericInitiatorClass { - ObjectClass parent_class; -} AcpiGenericInitiatorClass; - #define TYPE_ACPI_GENERIC_INITIATOR "acpi-generic-initiator" =20 -OBJECT_DEFINE_TYPE_WITH_INTERFACES(AcpiGenericInitiator, acpi_generic_init= iator, - ACPI_GENERIC_INITIATOR, OBJECT, - { TYPE_USER_CREATABLE }, - { NULL }) +OBJECT_DEFINE_SIMPLE_TYPE_WITH_INTERFACES(AcpiGenericInitiator, acpi_gener= ic_initiator, + ACPI_GENERIC_INITIATOR, OBJECT, + { TYPE_USER_CREATABLE }, + { NULL }) =20 OBJECT_DECLARE_SIMPLE_TYPE(AcpiGenericInitiator, ACPI_GENERIC_INITIATOR) =20 @@ -191,16 +187,12 @@ typedef struct AcpiGenericPort { uint32_t node; } AcpiGenericPort; =20 -typedef struct AcpiGenericPortClass { - ObjectClass parent_class; -} AcpiGenericPortClass; - #define TYPE_ACPI_GENERIC_PORT "acpi-generic-port" =20 -OBJECT_DEFINE_TYPE_WITH_INTERFACES(AcpiGenericPort, acpi_generic_port, - ACPI_GENERIC_PORT, OBJECT, - { TYPE_USER_CREATABLE }, - { NULL }) +OBJECT_DEFINE_SIMPLE_TYPE_WITH_INTERFACES(AcpiGenericPort, acpi_generic_po= rt, + ACPI_GENERIC_PORT, OBJECT, + { TYPE_USER_CREATABLE }, + { NULL }) =20 OBJECT_DECLARE_SIMPLE_TYPE(AcpiGenericPort, ACPI_GENERIC_PORT) =20 --=20 2.34.1