From patchwork Mon Oct 14 14:22:46 2019 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: 11188919 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A597D13BD for ; Mon, 14 Oct 2019 14:33:55 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8BDB420854 for ; Mon, 14 Oct 2019 14:33:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8BDB420854 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iK1Os-00025B-EP; Mon, 14 Oct 2019 14:32:42 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iK1Or-00024q-5v for xen-devel@lists.xenproject.org; Mon, 14 Oct 2019 14:32:41 +0000 X-Inumbo-ID: 79e8016a-ee8f-11e9-937f-12813bfff9fa Received: from mx1.redhat.com (unknown [209.132.183.28]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 79e8016a-ee8f-11e9-937f-12813bfff9fa; Mon, 14 Oct 2019 14:32:40 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1372C18C891B; Mon, 14 Oct 2019 14:32:40 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.206.0]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 545AE600CD; Mon, 14 Oct 2019 14:32:16 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Markus Armbruster , qemu-devel@nongnu.org Date: Mon, 14 Oct 2019 16:22:46 +0200 Message-Id: <20191014142246.4538-21-philmd@redhat.com> In-Reply-To: <20191014142246.4538-1-philmd@redhat.com> References: <20191014142246.4538-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.70]); Mon, 14 Oct 2019 14:32:40 +0000 (UTC) Subject: [Xen-devel] [PATCH 20/20] hw/i386/pc: Clean up includes X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Peter Maydell , Matthew Rosato , Paul Durrant , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Gerd Hoffmann , Eric Blake , Stefano Stabellini , qemu-block@nongnu.org, Helge Deller , David Hildenbrand , Halil Pasic , Christian Borntraeger , Marcel Apfelbaum , Anthony Perard , xen-devel@lists.xenproject.org, Andrzej Zaborowski , Eduardo Habkost , Xie Changlong , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, Stefan Hajnoczi , Paolo Bonzini , John Snow , Richard Henderson , Kevin Wolf , Wen Congyang , Cornelia Huck , Max Reitz , "Michael S. Tsirkin" , Igor Mammedov Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" 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 Signed-off-by: Philippe Mathieu-Daudé --- include/hw/i386/pc.h | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 6df4f4b6fb..e5c2dc9081 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -1,21 +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/isa/isa.h" #include "hw/block/fdc.h" #include "hw/block/flash.h" -#include "net/net.h" #include "hw/i386/ioapic.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"