From patchwork Mon Mar 9 15:08:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1251606 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu 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 ozlabs.org (Postfix) with ESMTPS id 48bhkW1B63z9sPK for ; Tue, 10 Mar 2020 02:20:51 +1100 (AEDT) Received: from localhost ([::1]:44730 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jBKD2-00070d-9t for incoming@patchwork.ozlabs.org; Mon, 09 Mar 2020 11:20:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34269) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jBK3D-0000pN-BH for qemu-devel@nongnu.org; Mon, 09 Mar 2020 11:10:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jBK3C-0008Hk-3A for qemu-devel@nongnu.org; Mon, 09 Mar 2020 11:10:39 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:54773) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jBK2w-00082l-PU; Mon, 09 Mar 2020 11:10:23 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MUokB-1ilAKi13Dt-00Qh5L; Mon, 09 Mar 2020 16:09:41 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 25/33] hw/i386/pc: Clean up includes Date: Mon, 9 Mar 2020 16:08:29 +0100 Message-Id: <20200309150837.3193387-26-laurent@vivier.eu> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200309150837.3193387-1-laurent@vivier.eu> References: <20200309150837.3193387-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:ELlgxbZLN6XY/sIJ9/sOXL2kw+iCrvUYX26HkdzVN63MSnFG9dR kiTBIj9Bjznl24O5TFF6LYx1MZpMEU4Ih6wjOLhMT5LS3ct6v+gkHtLTVMl91+SwWBtqVDq ypom+FRfLReSdff6zlQveYXzTENnRdqgqPC/RE7gbQJ7tk+UVrcuNNEydN/+FZpJPADbgba 88q6b5JHmtcBgXA58rpBA== X-UI-Out-Filterresults: notjunk:1; V03:K0:Kjo3KdQiq3M=:Lwea4OC/jBe3UKpAowpHwt sDVUaek9ZRP0mJkBlumXRKRQbNh9H3uKoc+kbKxOHLrHbASGhK1v7Q4jgPbftwc9esKJm5zsc G//XouxcRWMi0tYLPWXI7QQP8gKASbM4nejI9YAuViiZose+ijYyTb2Rg9Z8mNhdqQbl3ZXi4 rRcaTm2ZjfilEsIYFFQfhIAC+Rw8PftbYAqpLEMeEcpgomIu8J/zaSQhZR2jpUi/yFd0cZmiU hlHXY6UmKkWURFiOLDqGwcE9c6nDerJSU8VKesepaSu22wQ6XdKOis6XuHna8skb/dZ8CDsNl VNQZSn1GnQK2MGsoSETnqPLXjKHSYzZYX/bjo2/YGBL7MV/AY+vuC1Bo4U66OGq44AZNSE64M weRR1JnWjF+U6BnUxWcPbvTRZVy6nNqofHwVxH3ekbbcFf9EGAL1YHA0qfbOZE8mtYZQ60NAJ iK6BZsDfIYbP/kWu8adnYMRJvpp0TUuMdBimW1RSzmOFaQB9kTgluPhEXry/rgQiTx3HyZGWv IkKuLV181txzhPNOajpPkGgWGz5aMXbCbaqdS1uhXI7uZzigCS92gRo1vz8W6y9wt0CnJSiy1 CJJFoJqICNRlkm+yv1w1lwrOQK1dQRUJQMTwah9jud0rGW4ZHW/vPbx1E1r9vPcXlTD3QEo6G 4xtu7GaImOxz905M6XX4xmcqj8K1R37bin0OTOUvxDNkyVrg4MXYuKmQlOofOY5btjbJKcVf3 6kjtmC/jAW70gNmruYZ/8a38bn8pmA++gCb3HAGK1L5E/33PQQfQzp2XTiiAJGf5VGAU0YH2T JZosvmCkAiFqs6DHJoH5hJjP75Y3keszRJKUxvULoPnfBjsCg1W9d1CB/8LK5+z9swLMkfy X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.13 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Peter Maydell , Dmitry Fleytman , "Michael S. Tsirkin" , Jason Wang , Christian Schoenebeck , Gerd Hoffmann , "Edgar E. Iglesias" , qemu-block@nongnu.org, qemu-trivial@nongnu.org, Helge Deller , =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Michael Tokarev , Alistair Francis , Richard Henderson , Greg Kurz , "Dr. David Alan Gilbert" , qemu-arm@nongnu.org, Paolo Bonzini , John Snow , Richard Henderson , Kevin Wolf , =?utf-8?q?Daniel_P?= =?utf-8?b?LiBCZXJyYW5nw6k=?= , Igor Mitsyanko , Laurent Vivier , Max Reitz , Aleksandar Markovic , Igor Mammedov , Aurelien Jarno Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Various headers are not required by hw/i386/pc.h: - "qemu/range.h" - "qemu/bitmap.h" - "qemu/module.h" - "exec/memory.h" - "hw/pci/pci.h" - "hw/mem/pc-dimm.h" - "hw/mem/nvdimm.h" - "net/net.h" Remove them. Add 3 headers that were missing: - "hw/hotplug.h" PCMachineState::acpi_dev is of type HotplugHandler - "qemu/notify.h" PCMachineState::machine_done is of type Notifier - "qapi/qapi-types-common.h" PCMachineState::vmport/smm is of type OnOffAuto Acked-by: John Snow Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20200228114649.12818-19-philmd@redhat.com> Signed-off-by: Laurent Vivier --- include/hw/i386/pc.h | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index d5ac76d54e1f..6ab6eda046fd 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -1,20 +1,15 @@ #ifndef HW_PC_H #define HW_PC_H -#include "exec/memory.h" +#include "qemu/notify.h" +#include "qapi/qapi-types-common.h" #include "hw/boards.h" #include "hw/block/fdc.h" #include "hw/block/flash.h" -#include "net/net.h" #include "hw/i386/x86.h" -#include "qemu/range.h" -#include "qemu/bitmap.h" -#include "qemu/module.h" -#include "hw/pci/pci.h" -#include "hw/mem/pc-dimm.h" -#include "hw/mem/nvdimm.h" #include "hw/acpi/acpi_dev_interface.h" +#include "hw/hotplug.h" #define HPET_INTCAP "hpet-intcap"