From patchwork Thu Feb 22 11:25:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 774851 Delivered-To: patch@linaro.org Received: by 2002:a5d:6ac2:0:b0:33b:4db1:f5b3 with SMTP id u2csp716087wrw; Thu, 22 Feb 2024 03:30:52 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWhZleD+qjCk6B38cS7S3csEot6HK81XNKwxI7N10ReAgA2NTu1DhhUQA+aXV359Dh93yjGPJDDC+RHvxBwdyPj X-Google-Smtp-Source: AGHT+IHfKewU4Lw+WO6dEUWKy6xRKsmRepRJCT72ZXmWWlls1KSgkNVj0qxPr3W87H1TUQtJHPKT X-Received: by 2002:a05:620a:4013:b0:787:2851:e7ec with SMTP id h19-20020a05620a401300b007872851e7ecmr28831780qko.4.1708601451846; Thu, 22 Feb 2024 03:30:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708601451; cv=none; d=google.com; s=arc-20160816; b=pLXyEeTCxiP2+sMiI1MSyn2QvijMAdgHIw0FcEqBDWTVbBSCwpYmz9UH/VN4Bkfr+n NXqyKiDUynD97tcN4G7+zKqv1l/2y4uxcQ4W1cWCrbSdJOV+XognN4rW5+xqfeV9ypzA nrIDBb1qIYuiuCMTljqy1P87G6Zr1+XxFRcoOIU6XCIwi/xpc8yyYq4vN7n1WOouzMGx WDOVNkVWzQUNyZxgPPAP1fEgpMpI64JhxQQJrDcCI5cfeLfUA3k9Y4juEPv5NIvItAoP TM6jKQwMWL9Vpf28I0NRgKNrbqaUIhVMZCYjlKQjqMNcBLBggj6iGEr7ImcC9OJ0wEpL 4QgA== 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; bh=3COKMyWQFecWz7OG7W3zLhCaEMzw/4DklyhNX9Rz4gs=; fh=IMXbw0xx+6Q/2UEl1nyvDi1qBBGGml6rPCVUBtTSKyg=; b=Lw3z4GfleFQmsuaWaq9pmBbsHThWgvOTV+gqggM0Gvdf6W/VUi2mOZSv76rTLqEu4N xrVpqrkIVOEB8fSTH+FSV2NjCLK1++EHS0sKBIJjBXxmK6M8jfHwqBGnk+18NEYIzX3B Wj6LbyGroHzvTFGmw7iIGoNzzW6MWOwKnlT//oBb96zqZvlN3kF7Njicrg5SwchAHLbH 3qeh5cDRFDnW10/Wf1Ouaq76PqgyAbdy/HrWza+oOetW2y1VBkh/npe4nnoHiSSISrB8 zelssMxx1tVGBEE993v/bmEDu9uQOiXyJPBbGo40NdFGsslHVQ/emzXHXeNX4Z2FMBqu 567Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id qp17-20020a05620a389100b00787317ae356si12368705qkn.466.2024.02.22.03.30.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 22 Feb 2024 03:30:51 -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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rd7E3-0008AH-4J; Thu, 22 Feb 2024 06:26:51 -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 1rd7Dg-00085u-94; Thu, 22 Feb 2024 06:26:28 -0500 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rd7Dd-0004um-HJ; Thu, 22 Feb 2024 06:26:27 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id BAC284FB48; Thu, 22 Feb 2024 14:26:25 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 4123B87174; Thu, 22 Feb 2024 14:26:02 +0300 (MSK) Received: (nullmailer pid 2526158 invoked by uid 1000); Thu, 22 Feb 2024 11:26:01 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-trivial@nongnu.org, Michael Tokarev Subject: [PULL 06/34] hw/timer: Move HPET_INTCAP definition to "hpet.h" Date: Thu, 22 Feb 2024 14:25:33 +0300 Message-Id: <20240222112601.2526057-7-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240222112601.2526057-1-mjt@tls.msk.ru> References: <20240222112601.2526057-1-mjt@tls.msk.ru> MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 From: Philippe Mathieu-Daudé HPET_INTCAP is specific to TYPE_HPET, so define it there. hpet.c doesn't need to include "hw/i386/pc.h" anymore. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Michael Tokarev Reviewed-by: Luc Michel Signed-off-by: Michael Tokarev --- hw/timer/hpet.c | 1 - include/hw/i386/pc.h | 2 -- include/hw/timer/hpet.h | 2 ++ 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c index 1672faa4f2..01efe4885d 100644 --- a/hw/timer/hpet.c +++ b/hw/timer/hpet.c @@ -25,7 +25,6 @@ */ #include "qemu/osdep.h" -#include "hw/i386/pc.h" #include "hw/irq.h" #include "qapi/error.h" #include "qemu/error-report.h" diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 02a0deedd3..c0e6c43fbd 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -15,8 +15,6 @@ #include "hw/firmware/smbios.h" #include "hw/cxl/cxl.h" -#define HPET_INTCAP "hpet-intcap" - /** * PCMachineState: * @acpi_dev: link to ACPI PM device that performs ACPI hotplug handling diff --git a/include/hw/timer/hpet.h b/include/hw/timer/hpet.h index f04c4d3238..d17a8d4319 100644 --- a/include/hw/timer/hpet.h +++ b/include/hw/timer/hpet.h @@ -78,6 +78,8 @@ extern struct hpet_fw_config hpet_cfg; #define TYPE_HPET "hpet" +#define HPET_INTCAP "hpet-intcap" + static inline bool hpet_find(void) { return object_resolve_path_type("", TYPE_HPET, NULL);