From patchwork Tue Feb 13 12:01:46 2024 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: 13555055 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3D4F4C48BC4 for ; Tue, 13 Feb 2024 12:03:19 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZrV9-0005dJ-4h; Tue, 13 Feb 2024 07:03:04 -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 1rZrUL-0005Qx-UI for qemu-devel@nongnu.org; Tue, 13 Feb 2024 07:02:24 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rZrUC-00016Y-4n for qemu-devel@nongnu.org; Tue, 13 Feb 2024 07:02:06 -0500 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-33cd57b7eabso351909f8f.2 for ; Tue, 13 Feb 2024 04:02:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1707825722; x=1708430522; 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=URWCcZelwghQnfWxClC3fdOHYZqhuz4D09m5EBaU2Y0=; b=nvkG3L+QIISU3vsWPbtSiUZY1QS1tgQIL4B+kQZJcuzci5bMsL4lLLTkg4nyXvoV6x QYwBmTWHqwkBc9ckeAF9p2qVkjRSvRJgHgN0SQPurBTK73TrzJA3xUmP0uzBTxvR6Ax8 gFi7Dh/2i7VNLIR8+isRWdpEUJtF1/w3oXAFvqUQE5toHV/pVdeQ2a8tYgOfihbsGFaM z2tXCJpl316ztukpnGzE9ZgtGTDlt3wJkvugZKxk/jZl4z3USz5klJOiWwjUB/F6oIUd 6AxZZpX4PRHzEKRxC03O7LXwOcUuMcZ00knUx6Nh79S1YE2XA0kHFfbbFTm6NaqCXmAp XULw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707825722; x=1708430522; 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=URWCcZelwghQnfWxClC3fdOHYZqhuz4D09m5EBaU2Y0=; b=YN14susGcH+J5HSrUCff95JrNGSNiTZhSf1dcwOsi4vj2W0V0CApt680qfNcoqzSOb 4nTMMJuKoK7oX4Ni8THUaZov4gqVaLCEkdvF8hz98hgE3U2NF3OpuchsjmiUTHE88mlm mUiR0LmTG9fRtjaKFHcIEd3cKPEjVS+Jt8NAv43/DCeHEMmdhxZejnfMpwyJgRWYNEwP N76AGUd6qFqCRCZXnLez/9HrFGtYmEP8ypZQ9G6JNG3obxuJBQq7iG+xBOkfIVy4mzgE jwzWkxsU1BB5vlzY/ouzFYDdSt2u0QjfFX/NqkVR6907VoFVaGIWtcx/LgC1Or3QkwJH kiXQ== X-Gm-Message-State: AOJu0YxOqmaF5/x5JggbL0hRm9CMT621Pek+HKGZU32pqiMG2v3bkquL K/jJ85qPFDVDjz9QNYyfjvMnG6YTXqKZV1gBcuZHgSVJapMo/b9fAQAQDfd4kbvfVRODXf3YcsH w X-Google-Smtp-Source: AGHT+IFBcIQsCryECxDeQiGV9eyJexKjlZYijw8go/anuC35ucjcIWQtOlbMH7CWAwWkkNcHNV3ZKw== X-Received: by 2002:adf:e6c9:0:b0:33b:136a:95a3 with SMTP id y9-20020adfe6c9000000b0033b136a95a3mr5609270wrm.28.1707825722071; Tue, 13 Feb 2024 04:02:02 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCXbkIZh6v+HCmpi5EqEkJ4qcPlvBQ+Rs3VISy+9MCtlJcac5fq/U7utL/DUwjfg88aCf2IvuKpveB1wwHbWjR1bHsv1aQ09lKlY7tc3z1XTKUFjiwK6/WUFXCwb669LCmDAVPgX8hd8JW0EnVSzh/YiNzQxZWK2Y3llzfyvEkPsyjJkxDpj4DPJsaAvMrSFAg79Uo0kpypaPjYIAHV5W+AcuWsPyvHMgU+g5S0Vpwf5HS+vytXbqiAaAoIog1aRqOdUA3FGDcRcHlybMiSwPd9oXCOb+meozxMwfe81AhtHOCAjNJwenx7RKXaXEFw64VA16ZkHxXI= Received: from m1x-phil.lan ([176.176.128.243]) by smtp.gmail.com with ESMTPSA id bs25-20020a056000071900b0033b45bdb2a1sm9556186wrb.4.2024.02.13.04.02.00 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 13 Feb 2024 04:02:01 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-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_Mathieu-Daud=C3=A9?= Subject: [PATCH 1/7] target/i386/monitor: Remove unused 'hw/i386/pc.h' header Date: Tue, 13 Feb 2024 13:01:46 +0100 Message-ID: <20240213120153.90930-2-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 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=philmd@linaro.org; helo=mail-wr1-x42e.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=unavailable 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Signed-off-by: Philippe Mathieu-Daudé --- target/i386/monitor.c | 1 - 1 file changed, 1 deletion(-) diff --git a/target/i386/monitor.c b/target/i386/monitor.c index 950ff9ccbc..3a281dab02 100644 --- a/target/i386/monitor.c +++ b/target/i386/monitor.c @@ -33,7 +33,6 @@ #include "qapi/error.h" #include "qapi/qapi-commands-misc-target.h" #include "qapi/qapi-commands-misc.h" -#include "hw/i386/pc.h" /* Perform linear address sign extension */ static hwaddr addr_canonical(CPUArchState *env, hwaddr addr) From patchwork Tue Feb 13 12:01:47 2024 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: 13555060 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 32EC2C48260 for ; Tue, 13 Feb 2024 12:05:02 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZrVM-00061G-Cr; Tue, 13 Feb 2024 07:03:19 -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-0005Rj-7h for qemu-devel@nongnu.org; Tue, 13 Feb 2024 07:02:37 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rZrUN-00017F-RQ for qemu-devel@nongnu.org; Tue, 13 Feb 2024 07:02:19 -0500 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-33ce2d1882fso31452f8f.2 for ; Tue, 13 Feb 2024 04:02:09 -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=wsu7QVO/2GMUCXrpKFKX2RdvVOGky2erCso7cW9Tr0hzdC6dlhrih6EkrxDL5GxMWX arzPgBCkBjh9DOmpR6Q50oREVO581RpLxJvp0QwcPhX+V+OTABeGMa/6IZdTJjbE5XQl +Cdk0P6VHOitwxADGvIsXr6uAaT19sU619GolkmtbwdQaCnOCHI5GQiJS+vgAvmETBDQ LanGXDmHsoCeijW0iO8KXWE5EBG8iZ1oZgD8VNeIwW5GdHu4VLwzstCkc+EuoA33AkTk kEVbtpHvE7coh9U646Ym84VdOob2LUK42rdy+HeFPaMOsj6Y75dOzduE/GAqngYi2Kyd 5OyQ== X-Gm-Message-State: AOJu0Ywzf5qm8l3FrL3j8RwV1up8/k19UYeFiHS+YSsL/R6I8rgqqk+Y CkTnBe0U0H47+LejILf9ekN0OCnvcjH0LuupIncf7dTX7a5194Wt1EPiS+/zD8m38rMJHYKDS+x 5 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_Mathieu-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_Mathieu-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 Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=philmd@linaro.org; helo=mail-wr1-x434.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=unavailable 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org 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" From patchwork Tue Feb 13 12:01:48 2024 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: 13555062 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C1E72C48260 for ; Tue, 13 Feb 2024 12:05:26 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZrW8-0007gG-UD; Tue, 13 Feb 2024 07:04:05 -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 1rZrUb-0005Uj-UC for qemu-devel@nongnu.org; Tue, 13 Feb 2024 07:02:41 -0500 Received: from mail-lj1-x234.google.com ([2a00:1450:4864:20::234]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rZrUQ-00017s-LU for qemu-devel@nongnu.org; Tue, 13 Feb 2024 07:02:24 -0500 Received: by mail-lj1-x234.google.com with SMTP id 38308e7fff4ca-2d10f52e7d8so805941fa.3 for ; Tue, 13 Feb 2024 04:02:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1707825734; x=1708430534; 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=NDuO1yoG1D7/XJGzTiSB0HfRJ9/QIMB6S76Ai8lLnLY=; b=Xwd7CsZ2LXPgiUYLjX4Gu9GzmkYhbQmmiqmpYpul+aF2aINR5J1o+nVrypTe/EqqZD +ETFJZN6N7RVrwwDLGIDpOv5BkoTlarBmbYSKW4nuNMTXhME6iCSpKIGQ4r3+zVox4bo EAr4DzQmjcQvOPFIsop+szK3bOO8BsP9T/5ege35MKa02vGE/tYYfITbwwsR6AsIbLNq PZv8yblFJFpcTeDleKNGgVF5DP8K4ZewQfSyxKTCrZGP6+13+UG07CjbusaVkX8tPpT+ zdPfYptIsoIoVJj78JHXxGj7RZcvQ8SWgN29auSGosoj+u1MsPcK24d7Yo4SLhGvctv0 Xspg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707825734; x=1708430534; 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=NDuO1yoG1D7/XJGzTiSB0HfRJ9/QIMB6S76Ai8lLnLY=; b=TydIFF+05gi1J2nWGlaKg/tnWkENM70UOVixORohil9+4HDFkA2+6WNFYvtBWI26Sr XZqEX7/nQzp76DBgWb1Ng+rfRPO1HCeYBwujEjAqa71Q5Pf84jykPZ+3r+Wo7QXceXvv 7181FEVoVfDjcpQ5OqX/feI2nZs2SlOVj3OwqYidy5csqjVfpnzQ4TJ5UZdNWNXOccFd fwlPPnvwQBADwgI9z4SKi5+ET+1Vwu9v4u4I6ZTVDjGNw+NMyNlAa9Nwm6i61+i2gzuZ hLKGsXFsigREA+APY65ORhmGOgGG89Dy/zm0YVBhLhWRDw07lfqIRl/8qMBTKzQZo567 ZwmQ== X-Gm-Message-State: AOJu0YxLqAwrYAANsYDCqilU6a/y+Gzt5IjQP+zhNFLAG1nlcgFgZKKf zwb4DVANz+GSbT5S2UDWRsOlXXjY6O+DpjzQZgIgY7tOwV8XkmbpnqUJGO2Z7eKM78RVAhtVhup f X-Google-Smtp-Source: AGHT+IGur+wbZD2yUeBm3JhLiO1/vzzkr/lKJUPMzoRfq4ekHVogWhm8LpJQvHMql0zFWfd3MIprsA== X-Received: by 2002:a2e:7803:0:b0:2d0:a52d:5510 with SMTP id t3-20020a2e7803000000b002d0a52d5510mr6549932ljc.39.1707825733823; Tue, 13 Feb 2024 04:02:13 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCXR6e91YgO3aY37n7c6JtVojful7CgVRLHd4R9TIyxDwLJPl4v0EruBsCz0hJsqCtf3ksdsJKSPl3zN0MVjWAq6GR6H8DbFS2rJ0+Rhzz1HT2+VbytjguDSiVYv/yIhCL/of32ZNabJarCFUB9i+OJFwtsAo0OGmkDEEgQko/s8jYAlD9oGnsU3HNIXy++9EdxqeYjmWCx8SRNyUxCVk6egUbo+88ZMaKFTvzxOJY0U1FcHaVJc0xJ1b8omteLYrQPypUP2LcBxpxnuhFzvitDPVJo3sTJHoawudODm6u9AEvPh7q5Gl961SHqb/iVoY/VSbG4njmY= Received: from m1x-phil.lan ([176.176.128.243]) by smtp.gmail.com with ESMTPSA id y19-20020a05600c20d300b00410e8ef51cbsm4525823wmm.31.2024.02.13.04.02.12 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 13 Feb 2024 04:02:13 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-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_Mathieu-Daud=C3=A9?= Subject: [PATCH 3/7] hw/isa/lpc_ich9: Remove unused 'hw/i386/pc.h' Date: Tue, 13 Feb 2024 13:01:48 +0100 Message-ID: <20240213120153.90930-4-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 Received-SPF: pass client-ip=2a00:1450:4864:20::234; envelope-from=philmd@linaro.org; helo=mail-lj1-x234.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=unavailable 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Commit c461f3e382 ("hw/acpi/acpi_dev_interface: Remove now unused madt_cpu virtual method") removed the need for "hw/i386/pc.h". Signed-off-by: Philippe Mathieu-Daudé --- hw/isa/lpc_ich9.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c index 3924eec483..b39d840ccd 100644 --- a/hw/isa/lpc_ich9.c +++ b/hw/isa/lpc_ich9.c @@ -41,7 +41,6 @@ #include "hw/isa/apm.h" #include "hw/pci/pci.h" #include "hw/southbridge/ich9.h" -#include "hw/i386/pc.h" #include "hw/acpi/acpi.h" #include "hw/acpi/ich9.h" #include "hw/pci/pci_bus.h" From patchwork Tue Feb 13 12:01:49 2024 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: 13555058 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3F4D4C4829A for ; Tue, 13 Feb 2024 12:04:59 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZrW9-0007hZ-00; Tue, 13 Feb 2024 07:04:05 -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 1rZrUt-0005YI-0l for qemu-devel@nongnu.org; Tue, 13 Feb 2024 07:02:49 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rZrUg-00018N-1P for qemu-devel@nongnu.org; Tue, 13 Feb 2024 07:02:46 -0500 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-33b4e6972f6so2268602f8f.2 for ; Tue, 13 Feb 2024 04:02:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1707825739; x=1708430539; 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=iSiHu0C9dIi1NiXQI0bkwiZLyOTky1dJTMwQJyq+dek=; b=ahliYT/rNp0t/q9usd10ezajfH4A+vYglkTzuz0aea03Iz5uoRBiZ+fjYeyLHoQtjh mzdh4IrM+eRL16bbTUaoaADsJV8BC3KQ6MU/Q7vOlPxbnrNr4HBkvDMRiHQrug5y8C7A vwoQNK/tsqEmsg/Ws1wtmG7aU9Zxx9SyVlyvQEcNUNuE90d5he4hy7j7lcwltFEyLE0Z H5l2fomXCrB27dFL+VbyEjqlnTW9kx9C+o0sJN75kWzPmGopwQxryzl5Pe4wql50xtGR /D9RhY8SjVo4VtCvKhMSoTBO6fJbzFLby4+smR5C6jtXrlC6E0ObkWbqL/O5YnMDvZtb vzTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707825740; x=1708430540; 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=iSiHu0C9dIi1NiXQI0bkwiZLyOTky1dJTMwQJyq+dek=; b=WajWJqJNeZvfUPYRmOcc8TOgcHVbiSuHMjg5BjnkFExzsf3xeb6NGpHm8ftKnCeZ8m fPCcwhoDgekXSqqk4mcldVIi1GBvTe84WMuySpN3UgmwnPGh2/j4KYTX5jx24jZ8JUP6 eHl/mHCwLA8ExWj0+408QHfJfKZH+s2kwtmI3NBL2k4C2Av/aWNHC4LG8na7SHUUAFRA MDHg84kW2d/mKs5HSa7t8fgnY+57s2Jy3SaqLmWXgNbnSQ9vTeS0hpjZfMOpKOuItEW/ P+Ev9HcwZVD2SSG8CDjqbnCeL0XNJzWm8V93+qTnCEAWDuxj/Zs8vOKF2kqgBVgG0BWf inBA== X-Gm-Message-State: AOJu0YxZNkMNWoTLo5NyWDKcoBwKksBzG4dos8MTdlm0L2dESe020Bta ovb6XNagAtnOuR/hkocRd73cVsIF8xZzctGCniBT7ECrJ+45uax+fSUpUKNwF5LkSHLqVegybiA 4 X-Google-Smtp-Source: AGHT+IGAQCiDsIxeY1VWXFGXt44SCk2WBSDXytr/c1oFpUbBy8hwOMhYnPd951f+JsXeRt0+qDqJvg== X-Received: by 2002:a05:6000:1acb:b0:33a:eb5b:f8cd with SMTP id i11-20020a0560001acb00b0033aeb5bf8cdmr8971657wry.7.1707825739759; Tue, 13 Feb 2024 04:02:19 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCXIpLe52WvVWm13e8JKcSmsu8NeWvHMYrrVrNdWwmz4zloLQ/wedUmFH/AqALXCWvRRkkxHKXrrB6nXXCnv2t2ntTfMXShtBL+D/VEpNHiNZCpf6jwwE8zETAxSC4j1j+Xgobk1cB6AKs8tH90dH3gqHkgz1bNJhHL+sViOOm5HfSlWI05eKDlid7GzTpfUbDDfkB8d/JxzOYX8lGZh0Nd6pv1RVBxDMsLwhet1/G2xyiR7gL7lHxbTpJ8iI2t4QAZ3pnFCIGZOS7o4StFtKyaztW7IPLP4yEsKI0ussmmYenDxmOOdpme9XX0czfLl/W9BxQZl4fc= Received: from m1x-phil.lan ([176.176.128.243]) by smtp.gmail.com with ESMTPSA id x10-20020adfcc0a000000b0033cd1959681sm1816333wrh.112.2024.02.13.04.02.18 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 13 Feb 2024 04:02:19 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-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_Mathieu-Daud=C3=A9?= Subject: [PATCH 4/7] hw/i386/acpi: Declare pc_madt_cpu_entry() in 'acpi-common.h' Date: Tue, 13 Feb 2024 13:01:49 +0100 Message-ID: <20240213120153.90930-5-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 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=philmd@linaro.org; helo=mail-wr1-x42d.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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Since pc_madt_cpu_entry() is only used by: - hw/i386/acpi-build.c // single call - hw/i386/acpi-common.c // definition there is no need to expose it outside of hw/i386/. Declare it in "acpi-common.h". acpi-build.c doesn't need "hw/i386/pc.h" anymore. Signed-off-by: Philippe Mathieu-Daudé --- hw/i386/acpi-common.h | 3 +++ include/hw/i386/pc.h | 4 ---- hw/i386/acpi-common.c | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/hw/i386/acpi-common.h b/hw/i386/acpi-common.h index b3c56ee014..e305aaac15 100644 --- a/hw/i386/acpi-common.h +++ b/hw/i386/acpi-common.h @@ -1,12 +1,15 @@ #ifndef HW_I386_ACPI_COMMON_H #define HW_I386_ACPI_COMMON_H +#include "hw/boards.h" #include "hw/acpi/bios-linker-loader.h" #include "hw/i386/x86.h" /* Default IOAPIC ID */ #define ACPI_BUILD_IOAPIC_ID 0x0 +void pc_madt_cpu_entry(int uid, const CPUArchIdList *apic_ids, + GArray *entry, bool force_enabled); void acpi_build_madt(GArray *table_data, BIOSLinker *linker, X86MachineState *x86ms, const char *oem_id, const char *oem_table_id); diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index f9fc42c2be..ce442372ac 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -199,10 +199,6 @@ bool pc_system_ovmf_table_find(const char *entry, uint8_t **data, int *data_len); void pc_system_parse_ovmf_flash(uint8_t *flash_ptr, size_t flash_size); -/* hw/i386/acpi-common.c */ -void pc_madt_cpu_entry(int uid, const CPUArchIdList *apic_ids, - GArray *entry, bool force_enabled); - /* sgx.c */ void pc_machine_init_sgx_epc(PCMachineState *pcms); diff --git a/hw/i386/acpi-common.c b/hw/i386/acpi-common.c index 43dc23f7e0..f1a11f833a 100644 --- a/hw/i386/acpi-common.c +++ b/hw/i386/acpi-common.c @@ -27,7 +27,6 @@ #include "hw/acpi/acpi.h" #include "hw/acpi/aml-build.h" #include "hw/acpi/utils.h" -#include "hw/i386/pc.h" #include "target/i386/cpu.h" #include "acpi-build.h" From patchwork Tue Feb 13 12:01:50 2024 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: 13555059 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 424F4C48BC4 for ; Tue, 13 Feb 2024 12:05:00 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZrW4-0007PK-HW; Tue, 13 Feb 2024 07:04:00 -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 1rZrUh-0005WP-66 for qemu-devel@nongnu.org; Tue, 13 Feb 2024 07:02:44 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rZrUb-00018y-Ru for qemu-devel@nongnu.org; Tue, 13 Feb 2024 07:02:33 -0500 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-410ed9f8621so13076845e9.1 for ; Tue, 13 Feb 2024 04:02:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1707825745; x=1708430545; 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=Ayrp4O65NFcTDb1yTi4BL/BlCGOiYywukaah937eUcY=; b=HiV6BISjM+zoVA8SKp6gxi8xRAFvar/AkpFSrgnoC3exQpi3nWVyc6Q2SRBiZDfXcd nAqIANlZr+xG1gz92noBInKeUlsuAn3Xr0ohG3txe6vRDz6xgZw4hKMSCHG/46kzNPV1 grJ9tLesbiDgTvkHn0v/HxI3PlLIN8JxN97W9Kzy6b3UtKhcjXN+cSt0oe1m0S7uiXgn VMFGSHDiMs4KoZNvy89g/GcMG+aqgFwWA5V60//I7mMQ7l4ILVuy9Wsg6fajCFE8clf0 VsQSzhNpoeq4OCG2ZPGOqnPqA6se3W8H2xj56Z5lyElj/Q5Jz/Mq1xBpopK7Bpc5eLeL DI0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707825745; x=1708430545; 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=Ayrp4O65NFcTDb1yTi4BL/BlCGOiYywukaah937eUcY=; b=GZvCYREKYU+3SKLCquNTGl56jrMVxyOsp0q+yw+7hCSPYlS8aSwsDzjUwe24tJFVCw ngtmQBHNGSd5Sfbi0ZHQU624NXS2b8UOui9ggWHE5AGdItKEqD7wtx1K1y5XDOMvo5a/ cgUd9PjqapooBjoG+LbyjsKUN5d4eEQBNubAq7r3TpUdGtBj9MttD+XdfS/C5Keuk7Na hYniIqiyrGGsqOqUdN9ocI29SzW9V+QQt5B3DaYlB8t9jI1If2T6EAvjc3KeHUhr58bX 9hYODvVztEzhThOeegvLZuNIfSU71DNOzlaGtgXOzOYI07hRmxO8vR0i4YiNi0mxo8tF iuaA== X-Gm-Message-State: AOJu0Yz9hbP8tTOo/PM2mgvFhTN8JoKq401UwD2gHRoklBR+0/WLhe1J UlXmyPif3vIJ49lQawRMmytTW+A2ZivHHlag0aOPTs06jDHNDOlwdf/zaEuA1+kYnGFXxNcWIRr 8 X-Google-Smtp-Source: AGHT+IEhgXxFSfF5jytNoRCpqYbguZHENlv19t38CTxp68Q/OiCRo3pOp4kKAzjLLdHZodrBuQPPHg== X-Received: by 2002:a05:600c:1e29:b0:411:d253:55dd with SMTP id ay41-20020a05600c1e2900b00411d25355ddmr48957wmb.8.1707825745599; Tue, 13 Feb 2024 04:02:25 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCWvSyhAoTvZy/VW8haaGsPIaOu52Ie3GGnfaR0VW8l/5EuaRxD6uoSfmvQ46/aENAJ4TwJTQG6qB9x5jXpCS/JDB7SazEVUTwoQy/Gssz0tC2tAp0C7QeSjIjjSGotUQu4St0POXPYMplr8b3rqT9JNMrIEyeZpacm/3E6yzKk9laVlj8xmmrZkr/iPEKL4vU2e1IScsi9+0Bjtk97loZNjKa2gCjvi7E197LzutuJnDpT8LhfGLAN+5gC5zrZF6uq9Piymm0cnPBk6pHMuUf4KqLzEKYcw1Z9msDOqS+lZavvUyxbDaR4fbTh0vs5WVkPSGftz2FU= Received: from m1x-phil.lan ([176.176.128.243]) by smtp.gmail.com with ESMTPSA id jg8-20020a05600ca00800b00410820995dcsm10995292wmb.23.2024.02.13.04.02.24 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 13 Feb 2024 04:02:25 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-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_Mathieu-Daud=C3=A9?= Subject: [PATCH 5/7] hw/i386/port92: Add missing 'hw/isa/isa.h' header Date: Tue, 13 Feb 2024 13:01:50 +0100 Message-ID: <20240213120153.90930-6-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 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.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=unavailable 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org TYPE_PORT92 inherits TYPE_ISA_DEVICE, so need to include "hw/isa/isa.h" to get its declarations (currently we indirectly include this header via "hw/i386/pc.h"). Signed-off-by: Philippe Mathieu-Daudé --- hw/i386/port92.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/i386/port92.c b/hw/i386/port92.c index 1070bfbf36..b25157f6e4 100644 --- a/hw/i386/port92.c +++ b/hw/i386/port92.c @@ -10,6 +10,7 @@ #include "sysemu/runstate.h" #include "migration/vmstate.h" #include "hw/irq.h" +#include "hw/isa/isa.h" #include "hw/i386/pc.h" #include "trace.h" #include "qom/object.h" From patchwork Tue Feb 13 12:01:51 2024 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: 13555061 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A3F21C4829A for ; Tue, 13 Feb 2024 12:05:07 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZrWD-00081l-2s; Tue, 13 Feb 2024 07:04:09 -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 1rZrUr-0005Xs-Bi for qemu-devel@nongnu.org; Tue, 13 Feb 2024 07:02:49 -0500 Received: from mail-lj1-x22e.google.com ([2a00:1450:4864:20::22e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rZrUi-0001B5-VT for qemu-devel@nongnu.org; Tue, 13 Feb 2024 07:02:45 -0500 Received: by mail-lj1-x22e.google.com with SMTP id 38308e7fff4ca-2d09bdddfc9so56623291fa.2 for ; Tue, 13 Feb 2024 04:02:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1707825751; x=1708430551; 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=7DXeUhNBegKLVEEbNriXP0M30d34qp+psgJeRCEwOUo=; b=jvw0ArXVumvgMukunOELYqOpZTZG7ErChIPmdbM7QcYz5OdfO6pIG+5OKMIKqsJlVU tS+Zhxk3gSJSjcAeMy/j9uhfgeaesSu/RTrMw675AuaLaHJG5KIQtRxfwn40m6DWLCvD Wl8ZOS32cS6r/hImmf6ZeiFQRZ+h/oZ20ZvW1MXyJg1akKMW3zqrbIG/ZT+JSbf8+Jlm R/VyPjQN8weP8RVIrE3axX/qXMj4PO+Tgp+ZOpLnWoW6iS+C/BaiMXP2C4h5svDny63x f4/9ndpWckVFpPvnWqvpLMVHXOsb3vXj9PLafXEY6DN2Ull8y6kp3icb2qQPHNTIqEzP h/qQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707825751; x=1708430551; 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=7DXeUhNBegKLVEEbNriXP0M30d34qp+psgJeRCEwOUo=; b=m9DCfMvSezB6K6180QeHx5s8LwFeHhxie3ub2zqfuwf/JbpBXNpH7igjguJLXLxxeq pJGsRfn1e6vF01HFrFCsIIzw8bn2wagM/xta4iqNqyN9Ep3wtH0uOlrDNNy+OF2Szx1i RNenm9vygK7NNFjRZzb9PT1xjkzRHnao133ePfxhb66YlOt+786o5nS7LhkVEZjplw6l 6qqy22TpE9Y6cz8kkN4UegaqyqIxmKokBwa6GOKBS3zdsPfWKilaVNrXnMkg+YN/iMEB EekgabOdKZMyawyNHvDOzqaXs7336DpqN3I3wF09hK3BT7ydCdIO85cvQB+MPOUx/aXn h6Xg== X-Gm-Message-State: AOJu0YxBjrF1cayQ2gzQnDmpbBppB4DYUcLoGrYNXqyWTy9nWA8LyQSQ B36bBsrE1KNrDcV+JorYUD52BcJGk+KeZYiajduDpdufOSi4IBHzEOVBfvFHoQLGPEY4/eLX1CM X X-Google-Smtp-Source: AGHT+IHU2nOZBzOJiiwvB4NLtKxJFoQG8yRn3Zk8ihyzp3dcyIZLSsiUYCqCOQ4Gbk30iS91t9p+Ew== X-Received: by 2002:a2e:a6a6:0:b0:2d0:e730:b7d5 with SMTP id q38-20020a2ea6a6000000b002d0e730b7d5mr4714847lje.1.1707825751449; Tue, 13 Feb 2024 04:02:31 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCUTgHRHVSpaiDt7jfmm6dHijKIlCbBc00EwR+Ml31drXthLr324tmsGVqDKspuzIeOLhckqnDgE4QeC9IMSZl0a4DwrcJSzhzf6PU2oiEp52SQ8cHBxZ47ZtDrmpEIscHUaj2E8ZQSNEEDY3cF1gGVk8y+NNx7vUBDlXasXcz5N1XiRz5QectFlfeGP9wnrzc1I3sg0pIWuWI1FpqgwxWJfN+McHEMSLIO1MfWqNncZXWdgs9zMXn0FueDwN/N4Su0I+GDmBBZdLSRwp+vpy//nWHJ5oDaOvHA7zsFMW8vqzJp0j7xoHsTW5U0i18yq3Zo8zBvuzHo= Received: from m1x-phil.lan ([176.176.128.243]) by smtp.gmail.com with ESMTPSA id o39-20020a05600c512700b00411c3c2fc55sm1308184wms.45.2024.02.13.04.02.29 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 13 Feb 2024 04:02:31 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-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_Mathieu-Daud=C3=A9?= Subject: [PATCH 6/7] hw/acpi/cpu_hotplug: Include 'pci_device.h' instead of 'pci.h' Date: Tue, 13 Feb 2024 13:01:51 +0100 Message-ID: <20240213120153.90930-7-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 Received-SPF: pass client-ip=2a00:1450:4864:20::22e; envelope-from=philmd@linaro.org; helo=mail-lj1-x22e.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=unavailable 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org cpu_hotplug.c only needs the PCI *device* definitions. Signed-off-by: Philippe Mathieu-Daudé --- hw/acpi/cpu_hotplug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/acpi/cpu_hotplug.c b/hw/acpi/cpu_hotplug.c index 6f78db0ccb..f7fe905e0a 100644 --- a/hw/acpi/cpu_hotplug.c +++ b/hw/acpi/cpu_hotplug.c @@ -14,7 +14,7 @@ #include "qapi/error.h" #include "hw/core/cpu.h" #include "hw/i386/pc.h" -#include "hw/pci/pci.h" +#include "hw/pci/pci_device.h" #include "qemu/error-report.h" #define CPU_EJECT_METHOD "CPEJ" From patchwork Tue Feb 13 12:01:52 2024 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: 13555057 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D5BD3C4829A for ; Tue, 13 Feb 2024 12:04:52 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZrW4-0007Ms-EL; Tue, 13 Feb 2024 07:04:00 -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 1rZrUs-0005Xu-Lk for qemu-devel@nongnu.org; Tue, 13 Feb 2024 07:02:49 -0500 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rZrUp-0001Bb-VJ for qemu-devel@nongnu.org; Tue, 13 Feb 2024 07:02:46 -0500 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-33ce0730e25so164268f8f.1 for ; Tue, 13 Feb 2024 04:02:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1707825757; x=1708430557; 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=gT9BnHhKSLeB6DLDQir0eTSYCNcWVKYuyB5YSaZzw1E=; b=G7SLVMm4HvokZLenrM6EJSDGuHSUroDT1JnLGFBYdako26hjR0IeAUmOwFropKRruu GiT0wnpXjAtZKQbJLrzN18OMqEcVi0MaSCKdarjAhCcL0DXSlNbofafen2lRu//HRVQP o/mpgkhOY/AX0Ff3w8yvvvfUtTzNnj70UDL2HYoRxkFmUHBc99LUXji8V+dPyduQsJG1 pwF8dJMwd9jFmFI10iejYLMJM6MTYhiH+8nH540rwdIkT+7hoz7pdAhAlh6Bu6f8fBuz gpicj+yfFovBZrLBv9GX/mboSCMaUUekwSiNP4pMuaF04FjCDeOnmMp3+FQNp6z9c6GC MDIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707825757; x=1708430557; 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=gT9BnHhKSLeB6DLDQir0eTSYCNcWVKYuyB5YSaZzw1E=; b=oolwoH80k8HwMGog74BP0etgms5vIuPNzlYG2iKePQHA0p59Ps4m1u5r7uAjGFNFhn SL8QgOQoFHxngtmXVfXel0kAuZO2F0zDM/wzOGLksE5wHsFRkHJJor5Jk+A0hkJSQevU m1pneFDVwFGrmFQIqNlSDif7TA6jNPxjSIfpnfu44r40sereD8gxgy/6APtl59Vr0fea YW8wUDCNa7jsFQK55ENnm7M3YEb22J3ddsC+P6COkvWa2vNDNdWQjR42MAlwk7xDScSI zdCfsdWLiDu3Na0d3wiuTDabBaMfChwkGBbk5JRM0y62EVDxvW9OR8Fl5syBrN2h6NZm S9Mg== X-Gm-Message-State: AOJu0Yy6DTkbZWls0UXB99UzWgd+iu4iVXE8w3xiHL1BhylwkLJmO6Ee 5a2jDAVPDZ7SfrkCKekHBlDhYvbKtQC+i8p6cxSR63lGI3t6iBJ7XTtxVn+jDnklQe15Y2qLHLf I X-Google-Smtp-Source: AGHT+IE8MDoV5cIX2X0Dc1lxcmlHUOvaNY8mOvWh4DnxUxe81R2VyTR1wl9guqz9Q6362FGOSkHjPg== X-Received: by 2002:a5d:53c4:0:b0:33a:ff66:fecc with SMTP id a4-20020a5d53c4000000b0033aff66feccmr6807597wrw.26.1707825757405; Tue, 13 Feb 2024 04:02:37 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCVzfaonjkPEG9PV7JWli6v5BbF0tH/XSyuuag8oYSXFoTChnej/5IGDw4e18Ej+suIobhUpbtacqoJXowBVDwjQ75gn09cJVfX/vbiYwdujQuOTyrBX0iYix94AsVHz4IqYnjKkMghjteCIf6lLhmLF7d1iThf9ScYfzYzT8GcOJE3iwtdmYiRU5SH/AoqYXVPOB8qXm6ygJczbL5l7NCu5JG7Hkd7KNxRfkqAAUaudN27SzAr01eHhzPupS9UE3ah6jy4PPu2Ja3H2TE3G+yHILl884ac8xDn1wCvZaFwhFeDOD16cQiV77ilrkvzKGIntrx5th10= Received: from m1x-phil.lan ([176.176.128.243]) by smtp.gmail.com with ESMTPSA id l1-20020a5d4bc1000000b0033ce214a97csm331838wrt.17.2024.02.13.04.02.36 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 13 Feb 2024 04:02:37 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-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_Mathieu-Daud=C3=A9?= Subject: [PATCH 7/7] hw/acpi/cpu_hotplug: Include 'x86.h' instead of 'pc.h' Date: Tue, 13 Feb 2024 13:01:52 +0100 Message-ID: <20240213120153.90930-8-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 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=philmd@linaro.org; helo=mail-wr1-x436.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=unavailable 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org X86 CPU hotplug isn't specific to PC machines. Signed-off-by: Philippe Mathieu-Daudé --- hw/acpi/cpu_hotplug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/acpi/cpu_hotplug.c b/hw/acpi/cpu_hotplug.c index f7fe905e0a..83b8bc5deb 100644 --- a/hw/acpi/cpu_hotplug.c +++ b/hw/acpi/cpu_hotplug.c @@ -13,7 +13,7 @@ #include "hw/acpi/cpu_hotplug.h" #include "qapi/error.h" #include "hw/core/cpu.h" -#include "hw/i386/pc.h" +#include "hw/i386/x86.h" #include "hw/pci/pci_device.h" #include "qemu/error-report.h"