From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1rZrVj-0006pe-1D for mharc-qemu-trivial@gnu.org; Tue, 13 Feb 2024 07:03:39 -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 1rZrUW-0005RO-1O for qemu-trivial@nongnu.org; Tue, 13 Feb 2024 07:02:31 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rZrUL-00017A-Q6 for qemu-trivial@nongnu.org; Tue, 13 Feb 2024 07:02:16 -0500 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-33cda3dfa06so289640f8f.3 for ; Tue, 13 Feb 2024 04:02:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1707825728; x=1708430528; 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=am9vw1W4ncVE3TCNY/MXT9+eSWY4vJNOkE0J8mT4o5M=; b=OLUDVSX1xMUpbWZ9zk/vqfufb+lWJP/Qbox8o1W43BhI2Hplbk3N8wSFAkV2Grf6jY ahP4Ebx9x59w9VE0mSou2Pudlf/ec72/xcPDF95ftx0LflH9foKfdTJfaPoRbHawFMvf gK7vG7Ks3xUx9QnFg7j1/RxfGdljMhjcugKLpr6qbMjVm7CDTrf+QQjhSoZL8ZgClv0J X4bMb4jNA+bJZOCOXPh6YpyKSrsTqM254D/fbvGs1CQVA8E81ASCwvgZe7C38dbAQwEN /GfUJSKzlJWiESvheO1AbFaeFDd2YCZnrDNqYNIJgs3cEfg2sNSFBa+BoV8IEqL/kXKf zVPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707825728; x=1708430528; 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=am9vw1W4ncVE3TCNY/MXT9+eSWY4vJNOkE0J8mT4o5M=; b=sVvHMKgSY5eAUD6d+kLlM3v8fTHE2v3d6grZ6/TfEh2qRvpbJXTea6U2RIAtwEgjKi 2Rp/Jv4JgncTL6C+iVMJcY4n4VaQft0OMpLdbHhtRfr1NWQNGUt+yt8zyX/b2W7oesuj PHxSwLZ9Uc9XOwR+Y7VzEMnvxMRFNzsSIuBYK8rbpI2ABY1ObwafXAMw5Swa8Oe57vb7 NURMLwVaBNdTGK68PWctOiHShUI1Dzk7/z/rBFQl6yzH9g8Hha10PgYmvQLAKZNn0D3V KGKtiYW3wEutjQtAsSgGpzgxwOJDazp1ZpK5My+jbA3+3Gn4TRq07XlYn8RHa/U8iYzn HYdQ== X-Gm-Message-State: AOJu0Yz6mciO8kEqY6zMm41Se5l68wMztW/uCE3pSNoX0yt1TMKaBgE4 vEu8PbGrBONfomOkv6Yjdg8fTdWALgsP68mRtiGcgQUbweTEGPa1NUTLaOBBvZ4= X-Google-Smtp-Source: AGHT+IHy2g/+Ro2LlkPhrmSYGUif5Fn4NIDKPzAknpGOZKfeoAp9Wz7cGPMGGQKGotR5XSIlZPH1jw== X-Received: by 2002:a5d:4f10:0:b0:33c:e2b1:b1e2 with SMTP id c16-20020a5d4f10000000b0033ce2b1b1e2mr194860wru.67.1707825727975; Tue, 13 Feb 2024 04:02:07 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCXHK1yxT4AmZoO1EUrqSSo5e3+Uf+kNrxSXpZbAlqrQDcxJ24bWuYggHvaf8WxCKUGzLMGRyEAJ6TiKiNZI8OF5TB/dg9xvb/EeN8SIKy5CTAowIIkqGqqMK/EkHJ0tcJv/r1fk8IU1+uf3BDY7roMNFrhcLFPGbj+mK58znVtgg3x7xbAKsJgllYr/TWSsqEQsFLQBK79Ry8vq0uwILwo7YIz9hwFQHYi/h/4yaq2TjZvWp51hpswfp8MsfbU+aIJd8YpRY3mH6vcrPm9qA/CKtUuooM4fYZxcJnqPs2H6iM8HlzWTk88PNumBSctavd0weP/Om0c= Received: from m1x-phil.lan ([176.176.128.243]) by smtp.gmail.com with ESMTPSA id r3-20020adfca83000000b0033cdbe335bcsm1266650wrh.71.2024.02.13.04.02.06 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 13 Feb 2024 04:02:07 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Eduardo Habkost , Richard Henderson , Paolo Bonzini , "Michael S. Tsirkin" , Igor Mammedov , Marcel Apfelbaum , Bernhard Beschow , Ani Sinha , qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 2/7] hw/timer: Move HPET_INTCAP definition to "hpet.h" Date: Tue, 13 Feb 2024 13:01:47 +0100 Message-ID: <20240213120153.90930-3-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240213120153.90930-1-philmd@linaro.org> References: <20240213120153.90930-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=philmd@linaro.org; helo=mail-wr1-x42b.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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-trivial@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Feb 2024 12:02:47 -0000 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é --- include/hw/i386/pc.h | 2 -- include/hw/timer/hpet.h | 2 ++ hw/timer/hpet.c | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index ec0e5efcb2..f9fc42c2be 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); 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" -- 2.41.0