From patchwork Mon Oct 14 14:22:27 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: 1176402 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=fail (p=none dis=none) header.from=redhat.com 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 46sLRx6RCgz9sPK for ; Tue, 15 Oct 2019 01:25:01 +1100 (AEDT) Received: from localhost ([::1]:50364 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iK1HO-0005ro-6Q for incoming@patchwork.ozlabs.org; Mon, 14 Oct 2019 10:24:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48398) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iK1GS-0005na-75 for qemu-devel@nongnu.org; Mon, 14 Oct 2019 10:24:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iK1GN-00006E-C0 for qemu-devel@nongnu.org; Mon, 14 Oct 2019 10:24:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55636) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iK1GD-0008Tu-Ba; Mon, 14 Oct 2019 10:23:45 -0400 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 2E2BB3086228; Mon, 14 Oct 2019 14:23:43 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.206.0]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A45FB600CD; Mon, 14 Oct 2019 14:23:14 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Markus Armbruster , qemu-devel@nongnu.org Subject: [PATCH 01/20] vl: Add missing "hw/boards.h" include Date: Mon, 14 Oct 2019 16:22:27 +0200 Message-Id: <20191014142246.4538-2-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.5.16 (mx1.redhat.com [10.5.110.42]); Mon, 14 Oct 2019 14:23:43 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 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 , Matthew Rosato , Paul Durrant , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Gerd Hoffmann , Stefano Stabellini , qemu-block@nongnu.org, Helge Deller , David Hildenbrand , Halil Pasic , Christian Borntraeger , Anthony Perard , xen-devel@lists.xenproject.org, 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: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" vl.c calls machine_usb() declared in "hw/boards.h". Include it. This fixes (when modifying unrelated headers): vl.c:1283:10: error: implicit declaration of function 'machine_usb' is invalid in C99 [-Werror,-Wimplicit-function-declaration] if (!machine_usb(current_machine)) { ^ vl.c:1283:10: error: this function declaration is not a prototype [-Werror,-Wstrict-prototypes] vl.c:1283:22: error: use of undeclared identifier 'current_machine' if (!machine_usb(current_machine)) { ^ Signed-off-by: Philippe Mathieu-Daudé --- vl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/vl.c b/vl.c index 002bf4919e..e85b31df1b 100644 --- a/vl.c +++ b/vl.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "qemu/units.h" +#include "hw/boards.h" #include "hw/qdev-properties.h" #include "qapi/error.h" #include "qemu-version.h" From patchwork Mon Oct 14 14:22:28 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: 1176408 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=fail (p=none dis=none) header.from=redhat.com 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 46sLdX4LDhz9sPZ for ; Tue, 15 Oct 2019 01:33:20 +1100 (AEDT) Received: from localhost ([::1]:50600 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iK1PR-000653-Je for incoming@patchwork.ozlabs.org; Mon, 14 Oct 2019 10:33:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48482) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iK1Gg-0006DD-JG for qemu-devel@nongnu.org; Mon, 14 Oct 2019 10:24:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iK1Gf-0000BP-Eb for qemu-devel@nongnu.org; Mon, 14 Oct 2019 10:24:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55832) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iK1Gb-00009x-29; Mon, 14 Oct 2019 10:24:09 -0400 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 112BA3086228; Mon, 14 Oct 2019 14:24:08 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.206.0]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B130D600CD; Mon, 14 Oct 2019 14:23:43 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Markus Armbruster , qemu-devel@nongnu.org Subject: [PATCH 02/20] hw/southbridge/ich9: Removed unused headers Date: Mon, 14 Oct 2019 16:22:28 +0200 Message-Id: <20191014142246.4538-3-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.5.16 (mx1.redhat.com [10.5.110.42]); Mon, 14 Oct 2019 14:24:08 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 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 , Matthew Rosato , Paul Durrant , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Gerd Hoffmann , Stefano Stabellini , qemu-block@nongnu.org, Helge Deller , David Hildenbrand , Halil Pasic , Christian Borntraeger , Anthony Perard , xen-devel@lists.xenproject.org, 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: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The ICH9 chipset is not X86/PC specific. These files don't use anything declared by the "hw/i386/pc.h" or "hw/i386/ioapic.h" headers. Remove them. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: John Snow --- hw/acpi/ich9.c | 1 - hw/isa/lpc_ich9.c | 2 -- include/hw/i386/ich9.h | 1 - 3 files changed, 4 deletions(-) diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c index 2034dd749e..fdd0a6c79e 100644 --- a/hw/acpi/ich9.c +++ b/hw/acpi/ich9.c @@ -27,7 +27,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qapi/visitor.h" -#include "hw/i386/pc.h" #include "hw/pci/pci.h" #include "migration/vmstate.h" #include "qemu/timer.h" diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c index 17c292e306..61cee2ae3a 100644 --- a/hw/isa/lpc_ich9.c +++ b/hw/isa/lpc_ich9.c @@ -35,10 +35,8 @@ #include "hw/isa/isa.h" #include "hw/sysbus.h" #include "migration/vmstate.h" -#include "hw/i386/pc.h" #include "hw/irq.h" #include "hw/isa/apm.h" -#include "hw/i386/ioapic.h" #include "hw/pci/pci.h" #include "hw/pci/pci_bridge.h" #include "hw/i386/ich9.h" diff --git a/include/hw/i386/ich9.h b/include/hw/i386/ich9.h index 72e803f6e2..a98d10b252 100644 --- a/include/hw/i386/ich9.h +++ b/include/hw/i386/ich9.h @@ -5,7 +5,6 @@ #include "hw/sysbus.h" #include "hw/i386/pc.h" #include "hw/isa/apm.h" -#include "hw/i386/ioapic.h" #include "hw/pci/pci.h" #include "hw/pci/pcie_host.h" #include "hw/pci/pci_bridge.h" From patchwork Mon Oct 14 14:22:29 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: 1176406 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=fail (p=none dis=none) header.from=redhat.com 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 46sLX43bmHz9sPK for ; Tue, 15 Oct 2019 01:28:36 +1100 (AEDT) Received: from localhost ([::1]:50476 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iK1Kr-0001f5-HJ for incoming@patchwork.ozlabs.org; Mon, 14 Oct 2019 10:28:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48560) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iK1H3-0006ey-KM for qemu-devel@nongnu.org; Mon, 14 Oct 2019 10:24:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iK1H2-0000JY-Kj for qemu-devel@nongnu.org; Mon, 14 Oct 2019 10:24:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56127) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iK1Gy-0000Hs-Hn; Mon, 14 Oct 2019 10:24:32 -0400 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 992A210B78; Mon, 14 Oct 2019 14:24:31 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.206.0]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CE463600CD; Mon, 14 Oct 2019 14:24:08 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Markus Armbruster , qemu-devel@nongnu.org Subject: [PATCH 03/20] hw/input/pckbd: Remove unused "hw/i386/pc.h" header Date: Mon, 14 Oct 2019 16:22:29 +0200 Message-Id: <20191014142246.4538-4-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.5.16 (mx1.redhat.com [10.5.110.39]); Mon, 14 Oct 2019 14:24:31 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 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 , Matthew Rosato , Paul Durrant , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Gerd Hoffmann , Stefano Stabellini , qemu-block@nongnu.org, Helge Deller , David Hildenbrand , Halil Pasic , Christian Borntraeger , Anthony Perard , xen-devel@lists.xenproject.org, 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: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The keyboard controller model don't need anything from "hw/i386/pc.h". Remove it. Signed-off-by: Philippe Mathieu-Daudé --- hw/input/pckbd.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c index f0acfd86f7..2f09f780ba 100644 --- a/hw/input/pckbd.c +++ b/hw/input/pckbd.c @@ -26,7 +26,6 @@ #include "qemu/log.h" #include "hw/isa/isa.h" #include "migration/vmstate.h" -#include "hw/i386/pc.h" #include "hw/input/ps2.h" #include "hw/irq.h" #include "hw/input/i8042.h" From patchwork Mon Oct 14 14:22:30 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: 1176403 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=fail (p=none dis=none) header.from=redhat.com 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 46sLT459h8z9sPK for ; Tue, 15 Oct 2019 01:26:00 +1100 (AEDT) Received: from localhost ([::1]:50406 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iK1IM-00074r-3r for incoming@patchwork.ozlabs.org; Mon, 14 Oct 2019 10:25:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48653) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iK1HV-00070j-Eg for qemu-devel@nongnu.org; Mon, 14 Oct 2019 10:25:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iK1HU-0000X4-E3 for qemu-devel@nongnu.org; Mon, 14 Oct 2019 10:25:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59486) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iK1HP-0000V4-VQ; Mon, 14 Oct 2019 10:25:00 -0400 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 06D467FDFC; Mon, 14 Oct 2019 14:24:58 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.206.0]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2E544600CD; Mon, 14 Oct 2019 14:24:31 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Markus Armbruster , qemu-devel@nongnu.org Subject: [PATCH 04/20] hw/i386/ioapic_internal: Remove unused "hw/i386/ioapic.h" header Date: Mon, 14 Oct 2019 16:22:30 +0200 Message-Id: <20191014142246.4538-5-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.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 14 Oct 2019 14:24:58 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 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 , Matthew Rosato , Paul Durrant , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Gerd Hoffmann , Stefano Stabellini , qemu-block@nongnu.org, Helge Deller , David Hildenbrand , Halil Pasic , Christian Borntraeger , Anthony Perard , xen-devel@lists.xenproject.org, 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: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The "ioapic_internal.h" does not use anything from "hw/i386/ioapic.h", remove it. Signed-off-by: Philippe Mathieu-Daudé --- include/hw/i386/ioapic_internal.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/hw/i386/ioapic_internal.h b/include/hw/i386/ioapic_internal.h index d46c87c510..fe06938bda 100644 --- a/include/hw/i386/ioapic_internal.h +++ b/include/hw/i386/ioapic_internal.h @@ -23,7 +23,6 @@ #define QEMU_IOAPIC_INTERNAL_H #include "exec/memory.h" -#include "hw/i386/ioapic.h" #include "hw/sysbus.h" #include "qemu/notify.h" From patchwork Mon Oct 14 14:22:31 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: 1176407 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=fail (p=none dis=none) header.from=redhat.com 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 46sLY74B2pz9sPK for ; Tue, 15 Oct 2019 01:29:31 +1100 (AEDT) Received: from localhost ([::1]:50500 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iK1Ll-0002WX-37 for incoming@patchwork.ozlabs.org; Mon, 14 Oct 2019 10:29:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48739) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iK1Hu-0007mL-D0 for qemu-devel@nongnu.org; Mon, 14 Oct 2019 10:25:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iK1Ht-0000fD-88 for qemu-devel@nongnu.org; Mon, 14 Oct 2019 10:25:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51474) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iK1Ho-0000aa-LL; Mon, 14 Oct 2019 10:25:24 -0400 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 AAB8044BCF; Mon, 14 Oct 2019 14:25:23 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.206.0]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AD8DF600CD; Mon, 14 Oct 2019 14:24:58 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Markus Armbruster , qemu-devel@nongnu.org Subject: [PATCH 05/20] hw/timer: Remove unused "ui/console.h" header Date: Mon, 14 Oct 2019 16:22:31 +0200 Message-Id: <20191014142246.4538-6-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.5.16 (mx1.redhat.com [10.5.110.30]); Mon, 14 Oct 2019 14:25:23 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 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 , Matthew Rosato , Paul Durrant , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Gerd Hoffmann , Stefano Stabellini , qemu-block@nongnu.org, Helge Deller , David Hildenbrand , Halil Pasic , Christian Borntraeger , Anthony Perard , xen-devel@lists.xenproject.org, 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: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The timer models don't need anything from "ui/console.h". Remove it. Signed-off-by: Philippe Mathieu-Daudé --- hw/timer/hpet.c | 1 - hw/timer/twl92230.c | 1 - 2 files changed, 2 deletions(-) diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c index 1ddae4e7d7..4772cccfe3 100644 --- a/hw/timer/hpet.c +++ b/hw/timer/hpet.c @@ -27,7 +27,6 @@ #include "qemu/osdep.h" #include "hw/i386/pc.h" #include "hw/irq.h" -#include "ui/console.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/timer.h" diff --git a/hw/timer/twl92230.c b/hw/timer/twl92230.c index 63bd13d2ca..d0011be89e 100644 --- a/hw/timer/twl92230.c +++ b/hw/timer/twl92230.c @@ -27,7 +27,6 @@ #include "migration/qemu-file-types.h" #include "migration/vmstate.h" #include "sysemu/sysemu.h" -#include "ui/console.h" #include "qemu/bcd.h" #include "qemu/module.h" From patchwork Mon Oct 14 14:22:32 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: 1176405 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=fail (p=none dis=none) header.from=redhat.com 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 46sLVt14Yrz9sPZ for ; Tue, 15 Oct 2019 01:27:34 +1100 (AEDT) Received: from localhost ([::1]:50446 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iK1Jq-0000XL-Oe for incoming@patchwork.ozlabs.org; Mon, 14 Oct 2019 10:27:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48914) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iK1IU-00006J-Q4 for qemu-devel@nongnu.org; Mon, 14 Oct 2019 10:26:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iK1IT-0000v4-Pb for qemu-devel@nongnu.org; Mon, 14 Oct 2019 10:26:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46678) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iK1IP-0000sh-EU; Mon, 14 Oct 2019 10:26:01 -0400 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 7A91418C4274; Mon, 14 Oct 2019 14:26:00 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.206.0]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 28E6D60126; Mon, 14 Oct 2019 14:25:23 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Markus Armbruster , qemu-devel@nongnu.org Subject: [PATCH 06/20] hw/usb/dev-storage: Remove unused "ui/console.h" header Date: Mon, 14 Oct 2019 16:22:32 +0200 Message-Id: <20191014142246.4538-7-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.62]); Mon, 14 Oct 2019 14:26:00 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 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 , Matthew Rosato , Paul Durrant , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Gerd Hoffmann , Stefano Stabellini , qemu-block@nongnu.org, Helge Deller , David Hildenbrand , Halil Pasic , Christian Borntraeger , Anthony Perard , xen-devel@lists.xenproject.org, 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: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The USB models related to storage don't need anything from "ui/console.h". Remove it. Signed-off-by: Philippe Mathieu-Daudé --- hw/usb/dev-storage.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c index 8545193488..a2ff52d3e5 100644 --- a/hw/usb/dev-storage.c +++ b/hw/usb/dev-storage.c @@ -17,7 +17,6 @@ #include "desc.h" #include "hw/qdev-properties.h" #include "hw/scsi/scsi.h" -#include "ui/console.h" #include "migration/vmstate.h" #include "monitor/monitor.h" #include "sysemu/sysemu.h" From patchwork Mon Oct 14 14:22:33 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: 1176409 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=fail (p=none dis=none) header.from=redhat.com 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 46sLdn3GcFz9sPZ for ; Tue, 15 Oct 2019 01:33:33 +1100 (AEDT) Received: from localhost ([::1]:50612 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iK1Pe-0006LH-HP for incoming@patchwork.ozlabs.org; Mon, 14 Oct 2019 10:33:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49131) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iK1JN-00010o-7X for qemu-devel@nongnu.org; Mon, 14 Oct 2019 10:27:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iK1JM-000191-5J for qemu-devel@nongnu.org; Mon, 14 Oct 2019 10:27:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39382) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iK1JC-00015l-Ci; Mon, 14 Oct 2019 10:26:50 -0400 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 CB60176521; Mon, 14 Oct 2019 14:26:48 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.206.0]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 48B6261379; Mon, 14 Oct 2019 14:26:00 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Markus Armbruster , qemu-devel@nongnu.org Subject: [PATCH 07/20] hw/i386/intel_iommu: Remove unused includes Date: Mon, 14 Oct 2019 16:22:33 +0200 Message-Id: <20191014142246.4538-8-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.5.16 (mx1.redhat.com [10.5.110.26]); Mon, 14 Oct 2019 14:26:49 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 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 , Matthew Rosato , Paul Durrant , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Gerd Hoffmann , Stefano Stabellini , qemu-block@nongnu.org, Helge Deller , David Hildenbrand , Halil Pasic , Christian Borntraeger , Anthony Perard , xen-devel@lists.xenproject.org, 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: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" intel_iommu.h does not use any of these includes, remove them. Signed-off-by: Philippe Mathieu-Daudé --- include/hw/i386/intel_iommu.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/include/hw/i386/intel_iommu.h b/include/hw/i386/intel_iommu.h index 66b931e526..a1c4afcda5 100644 --- a/include/hw/i386/intel_iommu.h +++ b/include/hw/i386/intel_iommu.h @@ -22,11 +22,7 @@ #ifndef INTEL_IOMMU_H #define INTEL_IOMMU_H -#include "sysemu/dma.h" #include "hw/i386/x86-iommu.h" -#include "hw/i386/ioapic.h" -#include "hw/pci/msi.h" -#include "hw/sysbus.h" #include "qemu/iova-tree.h" #define TYPE_INTEL_IOMMU_DEVICE "intel-iommu" From patchwork Mon Oct 14 14:22:34 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: 1176411 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=fail (p=none dis=none) header.from=redhat.com 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 46sLhH03T9z9sPZ for ; Tue, 15 Oct 2019 01:35:43 +1100 (AEDT) Received: from localhost ([::1]:50662 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iK1Rk-0000aX-8K for incoming@patchwork.ozlabs.org; Mon, 14 Oct 2019 10:35:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49229) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iK1Jg-0001P4-6m for qemu-devel@nongnu.org; Mon, 14 Oct 2019 10:27:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iK1Jf-0001Dx-6y for qemu-devel@nongnu.org; Mon, 14 Oct 2019 10:27:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:32804) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iK1Ja-0001D2-QZ; Mon, 14 Oct 2019 10:27:14 -0400 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 C82C969061; Mon, 14 Oct 2019 14:27:13 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.206.0]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 70211600CD; Mon, 14 Oct 2019 14:26:49 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Markus Armbruster , qemu-devel@nongnu.org Subject: [PATCH 08/20] hw/xen/xen_pt_load_rom: Remove unused includes Date: Mon, 14 Oct 2019 16:22:34 +0200 Message-Id: <20191014142246.4538-9-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.5.16 (mx1.redhat.com [10.5.110.28]); Mon, 14 Oct 2019 14:27:14 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 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 , Matthew Rosato , Paul Durrant , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Gerd Hoffmann , Stefano Stabellini , qemu-block@nongnu.org, Helge Deller , David Hildenbrand , Halil Pasic , Christian Borntraeger , Anthony Perard , xen-devel@lists.xenproject.org, 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: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" xen_pt_load_rom.c does not use any of these includes, remove them. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Paul Durrant --- hw/xen/xen_pt_load_rom.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/hw/xen/xen_pt_load_rom.c b/hw/xen/xen_pt_load_rom.c index 307a5c93e2..a50a80837e 100644 --- a/hw/xen/xen_pt_load_rom.c +++ b/hw/xen/xen_pt_load_rom.c @@ -3,12 +3,8 @@ */ #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/i386/pc.h" #include "qemu/error-report.h" -#include "ui/console.h" #include "hw/loader.h" -#include "monitor/monitor.h" -#include "qemu/range.h" #include "hw/pci/pci.h" #include "xen_pt.h" From patchwork Mon Oct 14 14:22:35 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: 1176414 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=fail (p=none dis=none) header.from=redhat.com 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 46sLlm5BP5z9sPK for ; Tue, 15 Oct 2019 01:38:44 +1100 (AEDT) Received: from localhost ([::1]:50726 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iK1Ug-0004ar-7n for incoming@patchwork.ozlabs.org; Mon, 14 Oct 2019 10:38:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49334) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iK1K5-0001yp-Lw for qemu-devel@nongnu.org; Mon, 14 Oct 2019 10:27:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iK1K4-0001Oj-5a for qemu-devel@nongnu.org; Mon, 14 Oct 2019 10:27:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47452) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iK1K0-0001NU-67; Mon, 14 Oct 2019 10:27:40 -0400 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 3584A12BE; Mon, 14 Oct 2019 14:27:39 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.206.0]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 47CE1600CD; Mon, 14 Oct 2019 14:27:14 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Markus Armbruster , qemu-devel@nongnu.org Subject: [PATCH 09/20] hw/alpha/alpha_sys: Remove unused "hw/ide.h" header Date: Mon, 14 Oct 2019 16:22:35 +0200 Message-Id: <20191014142246.4538-10-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.5.16 (mx1.redhat.com [10.5.110.29]); Mon, 14 Oct 2019 14:27:39 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 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 , Matthew Rosato , Paul Durrant , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Gerd Hoffmann , Stefano Stabellini , qemu-block@nongnu.org, Helge Deller , David Hildenbrand , Halil Pasic , Christian Borntraeger , Anthony Perard , xen-devel@lists.xenproject.org, 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: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" alpha_sys.h does not use anything from the "hw/ide.h" header. Remove it. Signed-off-by: Philippe Mathieu-Daudé --- hw/alpha/alpha_sys.h | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/alpha/alpha_sys.h b/hw/alpha/alpha_sys.h index 4e127a6de8..9991535c0d 100644 --- a/hw/alpha/alpha_sys.h +++ b/hw/alpha/alpha_sys.h @@ -6,7 +6,6 @@ #include "target/alpha/cpu-qom.h" #include "hw/pci/pci.h" #include "hw/pci/pci_host.h" -#include "hw/ide.h" #include "hw/i386/pc.h" From patchwork Mon Oct 14 14:22:36 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: 1176416 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=fail (p=none dis=none) header.from=redhat.com 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 46sLqG5HQnz9sPZ for ; Tue, 15 Oct 2019 01:41:46 +1100 (AEDT) Received: from localhost ([::1]:50802 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iK1Xc-0008DT-JR for incoming@patchwork.ozlabs.org; Mon, 14 Oct 2019 10:41:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49433) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iK1KY-0002LF-S0 for qemu-devel@nongnu.org; Mon, 14 Oct 2019 10:28:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iK1KX-0001XV-LM for qemu-devel@nongnu.org; Mon, 14 Oct 2019 10:28:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53480) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iK1KQ-0001TQ-KT; Mon, 14 Oct 2019 10:28:07 -0400 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 F33301017C0F; Mon, 14 Oct 2019 14:28:03 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.206.0]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BB003600CD; Mon, 14 Oct 2019 14:27:39 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Markus Armbruster , qemu-devel@nongnu.org Subject: [PATCH 10/20] hw/alpha/dp264: Include "net/net.h" Date: Mon, 14 Oct 2019 16:22:36 +0200 Message-Id: <20191014142246.4538-11-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.64]); Mon, 14 Oct 2019 14:28:04 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 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 , Matthew Rosato , Paul Durrant , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Gerd Hoffmann , Stefano Stabellini , qemu-block@nongnu.org, Helge Deller , David Hildenbrand , Halil Pasic , Christian Borntraeger , Anthony Perard , xen-devel@lists.xenproject.org, 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: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" hw/alpha/dp264.c uses NICInfo variables which are declared in "net/net.h". Include it. This fixes (when modifying unrelated headers): hw/alpha/dp264.c:89:21: error: use of undeclared identifier 'nb_nics' for (i = 0; i < nb_nics; i++) { ^ hw/alpha/dp264.c:90:30: error: use of undeclared identifier 'nd_table' pci_nic_init_nofail(&nd_table[i], pci_bus, "e1000", NULL); ^ Signed-off-by: Philippe Mathieu-Daudé --- hw/alpha/dp264.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c index 51feee8558..013a9d3510 100644 --- a/hw/alpha/dp264.c +++ b/hw/alpha/dp264.c @@ -20,6 +20,7 @@ #include "hw/isa/superio.h" #include "hw/dma/i8257.h" #include "qemu/cutils.h" +#include "net/net.h" #define MAX_IDE_BUS 2 From patchwork Mon Oct 14 14:22:37 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: 1176412 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=fail (p=none dis=none) header.from=redhat.com 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 46sLjy41gjz9sPK for ; Tue, 15 Oct 2019 01:37:09 +1100 (AEDT) Received: from localhost ([::1]:50684 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iK1T8-0002Hd-ND for incoming@patchwork.ozlabs.org; Mon, 14 Oct 2019 10:37:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49504) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iK1Kz-0002yH-IJ for qemu-devel@nongnu.org; Mon, 14 Oct 2019 10:28:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iK1Ky-0001nQ-II for qemu-devel@nongnu.org; Mon, 14 Oct 2019 10:28:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:14148) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iK1Ku-0001k3-2V; Mon, 14 Oct 2019 10:28:36 -0400 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 052D510F2E89; Mon, 14 Oct 2019 14:28:35 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.206.0]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6F361600CD; Mon, 14 Oct 2019 14:28:04 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Markus Armbruster , qemu-devel@nongnu.org Subject: [PATCH 11/20] hw/hppa/machine: Include "net/net.h" Date: Mon, 14 Oct 2019 16:22:37 +0200 Message-Id: <20191014142246.4538-12-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.66]); Mon, 14 Oct 2019 14:28:35 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 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 , Matthew Rosato , Paul Durrant , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Gerd Hoffmann , Stefano Stabellini , qemu-block@nongnu.org, Helge Deller , David Hildenbrand , Halil Pasic , Christian Borntraeger , Anthony Perard , xen-devel@lists.xenproject.org, 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: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" hw/hppa/machine.c uses NICInfo variables which are declared in "net/net.h". Include it. This fixes (when modifying unrelated headers): hw/hppa/machine.c:126:21: error: use of undeclared identifier 'nb_nics' for (i = 0; i < nb_nics; i++) { ^ hw/hppa/machine.c:127:30: error: use of undeclared identifier 'nd_table' pci_nic_init_nofail(&nd_table[i], pci_bus, "e1000", NULL); ^ Signed-off-by: Philippe Mathieu-Daudé --- hw/hppa/machine.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index 7e23675429..6c55ed0af1 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -20,6 +20,7 @@ #include "qemu/units.h" #include "qapi/error.h" #include "qemu/log.h" +#include "net/net.h" #define MAX_IDE_BUS 2 From patchwork Mon Oct 14 14:22:38 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: 1176415 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=fail (p=none dis=none) header.from=redhat.com 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 46sLn530LGz9sPK for ; Tue, 15 Oct 2019 01:39:53 +1100 (AEDT) Received: from localhost ([::1]:50756 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iK1Vm-0006En-VB for incoming@patchwork.ozlabs.org; Mon, 14 Oct 2019 10:39:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49579) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iK1Lg-0003Yk-BY for qemu-devel@nongnu.org; Mon, 14 Oct 2019 10:29:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iK1Lf-0001tX-BD for qemu-devel@nongnu.org; Mon, 14 Oct 2019 10:29:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49286) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iK1La-0001sc-Oo; Mon, 14 Oct 2019 10:29:18 -0400 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 B16E7190C018; Mon, 14 Oct 2019 14:29:17 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.206.0]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AC02E600CD; Mon, 14 Oct 2019 14:28:35 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Markus Armbruster , qemu-devel@nongnu.org Subject: [PATCH 12/20] hw/acpi/cpu_hotplug: Include "hw/pci/pci.h" Date: Mon, 14 Oct 2019 16:22:38 +0200 Message-Id: <20191014142246.4538-13-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:29:18 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 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 , Matthew Rosato , Paul Durrant , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Gerd Hoffmann , Stefano Stabellini , qemu-block@nongnu.org, Helge Deller , David Hildenbrand , Halil Pasic , Christian Borntraeger , Anthony Perard , xen-devel@lists.xenproject.org, 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: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" hw/acpi/cpu_hotplug.c calls pci_address_space_io(). Include "hw/pci/pci.h" which declares it. This fixes (when modifying unrelated headers): hw/acpi/cpu_hotplug.c:103:28: error: implicit declaration of function 'pci_address_space_io' is invalid in C99 [-Werror,-Wimplicit-function-declaration] MemoryRegion *parent = pci_address_space_io(PCI_DEVICE(gpe_cpu->device)); ^ Signed-off-by: Philippe Mathieu-Daudé --- hw/acpi/cpu_hotplug.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/acpi/cpu_hotplug.c b/hw/acpi/cpu_hotplug.c index 6e8293aac9..7fb65d9065 100644 --- a/hw/acpi/cpu_hotplug.c +++ b/hw/acpi/cpu_hotplug.c @@ -14,6 +14,7 @@ #include "qapi/error.h" #include "hw/core/cpu.h" #include "hw/i386/pc.h" +#include "hw/pci/pci.h" #include "qemu/error-report.h" #define CPU_EJECT_METHOD "CPEJ" From patchwork Mon Oct 14 14:22:39 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: 1176417 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=fail (p=none dis=none) header.from=redhat.com 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 46sLqz04rzz9sPK for ; Tue, 15 Oct 2019 01:42:22 +1100 (AEDT) Received: from localhost ([::1]:50830 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iK1YC-0000zP-NG for incoming@patchwork.ozlabs.org; Mon, 14 Oct 2019 10:42:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49693) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iK1ML-00046b-2w for qemu-devel@nongnu.org; Mon, 14 Oct 2019 10:30:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iK1MG-00022o-Ow for qemu-devel@nongnu.org; Mon, 14 Oct 2019 10:30:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40244) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iK1M0-00020O-VR; Mon, 14 Oct 2019 10:29:45 -0400 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 168D7300BEAF; Mon, 14 Oct 2019 14:29:42 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.206.0]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 28912600CD; Mon, 14 Oct 2019 14:29:17 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Markus Armbruster , qemu-devel@nongnu.org Subject: [PATCH 13/20] hw/timer/hpet: Include "exec/address-spaces.h" Date: Mon, 14 Oct 2019 16:22:39 +0200 Message-Id: <20191014142246.4538-14-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.5.16 (mx1.redhat.com [10.5.110.40]); Mon, 14 Oct 2019 14:29:42 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 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 , Matthew Rosato , Paul Durrant , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Gerd Hoffmann , Stefano Stabellini , qemu-block@nongnu.org, Helge Deller , David Hildenbrand , Halil Pasic , Christian Borntraeger , Anthony Perard , xen-devel@lists.xenproject.org, 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: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" hw/timer/hpet.c calls address_space_stl_le() declared in "exec/address-spaces.h". Include it. This fixes (when modifying unrelated headers): hw/timer/hpet.c:210:31: error: use of undeclared identifier 'address_space_memory' address_space_stl_le(&address_space_memory, timer->fsb >> 32, ^~~~~~~~~~~~~~~~~~~~ Signed-off-by: Philippe Mathieu-Daudé --- hw/timer/hpet.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c index 4772cccfe3..6589d63ebb 100644 --- a/hw/timer/hpet.c +++ b/hw/timer/hpet.c @@ -35,6 +35,7 @@ #include "hw/timer/mc146818rtc.h" #include "migration/vmstate.h" #include "hw/timer/i8254.h" +#include "exec/address-spaces.h" //#define HPET_DEBUG #ifdef HPET_DEBUG From patchwork Mon Oct 14 14:22:40 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: 1176418 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=fail (p=none dis=none) header.from=redhat.com 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 46sLsg1Yxwz9sPK for ; Tue, 15 Oct 2019 01:43:50 +1100 (AEDT) Received: from localhost ([::1]:50858 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iK1Zc-0002TL-OF for incoming@patchwork.ozlabs.org; Mon, 14 Oct 2019 10:43:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49801) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iK1MV-0004Im-Ox for qemu-devel@nongnu.org; Mon, 14 Oct 2019 10:30:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iK1MU-0002DJ-Mz for qemu-devel@nongnu.org; Mon, 14 Oct 2019 10:30:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45148) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iK1MQ-00028r-FI; Mon, 14 Oct 2019 10:30:10 -0400 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 546E62108; Mon, 14 Oct 2019 14:30:09 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.206.0]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D59E0600CD; Mon, 14 Oct 2019 14:29:42 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Markus Armbruster , qemu-devel@nongnu.org Subject: [PATCH 14/20] hw/pci-host/q35: Include "qemu/range.h" Date: Mon, 14 Oct 2019 16:22:40 +0200 Message-Id: <20191014142246.4538-15-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.71]); Mon, 14 Oct 2019 14:30:09 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 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 , Matthew Rosato , Paul Durrant , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Gerd Hoffmann , Stefano Stabellini , qemu-block@nongnu.org, Helge Deller , David Hildenbrand , Halil Pasic , Christian Borntraeger , Anthony Perard , xen-devel@lists.xenproject.org, 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: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The MCHPCIState structure uses the Range type which is declared in "qemu/range.h". Include it. This fixes (when modifying unrelated headers): In file included from hw/pci-host/q35.c:32: include/hw/pci-host/q35.h:57:11: error: field has incomplete type 'Range' (aka 'struct Range') Range pci_hole; ^ include/qemu/typedefs.h:116:16: note: forward declaration of 'struct Range' typedef struct Range Range; ^ Signed-off-by: Philippe Mathieu-Daudé --- include/hw/pci-host/q35.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/hw/pci-host/q35.h b/include/hw/pci-host/q35.h index b3bcf2e632..79a88d67b1 100644 --- a/include/hw/pci-host/q35.h +++ b/include/hw/pci-host/q35.h @@ -32,6 +32,7 @@ #include "hw/acpi/ich9.h" #include "hw/pci-host/pam.h" #include "hw/i386/intel_iommu.h" +#include "qemu/range.h" #define TYPE_Q35_HOST_DEVICE "q35-pcihost" #define Q35_HOST_DEVICE(obj) \ From patchwork Mon Oct 14 14:22:41 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: 1176410 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=fail (p=none dis=none) header.from=redhat.com 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 46sLhG51M8z9sPK for ; Tue, 15 Oct 2019 01:35:42 +1100 (AEDT) Received: from localhost ([::1]:50664 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iK1Rj-0000dg-V5 for incoming@patchwork.ozlabs.org; Mon, 14 Oct 2019 10:35:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49886) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iK1Mv-0004cL-4D for qemu-devel@nongnu.org; Mon, 14 Oct 2019 10:30:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iK1Mu-0002KM-24 for qemu-devel@nongnu.org; Mon, 14 Oct 2019 10:30:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38336) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iK1Mo-0002Hn-KB; Mon, 14 Oct 2019 10:30:34 -0400 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 478AE3CA06; Mon, 14 Oct 2019 14:30:33 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.206.0]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BDDF3600CD; Mon, 14 Oct 2019 14:30:09 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Markus Armbruster , qemu-devel@nongnu.org Subject: [PATCH 15/20] hw/i2c/smbus_ich9: Include "qemu/range.h" Date: Mon, 14 Oct 2019 16:22:41 +0200 Message-Id: <20191014142246.4538-16-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.5.16 (mx1.redhat.com [10.5.110.39]); Mon, 14 Oct 2019 14:30:33 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 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 , Matthew Rosato , Paul Durrant , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Gerd Hoffmann , Stefano Stabellini , qemu-block@nongnu.org, Helge Deller , David Hildenbrand , Halil Pasic , Christian Borntraeger , Anthony Perard , xen-devel@lists.xenproject.org, 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: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" hw/i2c/smbus_ich9.c calls range_covers_byte(). Include "qemu/range.h" which declares it. This fixes (when modifying unrelated headers): hw/i2c/smbus_ich9.c:66:9: error: implicit declaration of function 'range_covers_byte' is invalid in C99 [-Werror,-Wimplicit-function-declaration] if (range_covers_byte(address, len, ICH9_SMB_HOSTC)) { ^ Signed-off-by: Philippe Mathieu-Daudé --- hw/i2c/smbus_ich9.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/i2c/smbus_ich9.c b/hw/i2c/smbus_ich9.c index fd50fb851a..48f1ff4191 100644 --- a/hw/i2c/smbus_ich9.c +++ b/hw/i2c/smbus_ich9.c @@ -21,6 +21,7 @@ */ #include "qemu/osdep.h" +#include "qemu/range.h" #include "hw/i2c/pm_smbus.h" #include "hw/pci/pci.h" #include "migration/vmstate.h" From patchwork Mon Oct 14 14:22:42 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: 1176419 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=fail (p=none dis=none) header.from=redhat.com 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 46sLtD2mzpz9sPK for ; Tue, 15 Oct 2019 01:44:20 +1100 (AEDT) Received: from localhost ([::1]:50872 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iK1a5-0002tg-VZ for incoming@patchwork.ozlabs.org; Mon, 14 Oct 2019 10:44:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49993) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iK1NH-00055X-KV for qemu-devel@nongnu.org; Mon, 14 Oct 2019 10:31:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iK1NG-0002U8-Hw for qemu-devel@nongnu.org; Mon, 14 Oct 2019 10:31:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41694) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iK1NB-0002RB-QH; Mon, 14 Oct 2019 10:30:58 -0400 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 C908C80166C; Mon, 14 Oct 2019 14:30:56 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.206.0]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5A245600CD; Mon, 14 Oct 2019 14:30:33 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Markus Armbruster , qemu-devel@nongnu.org Subject: [PATCH 16/20] hw/pci-host/piix: Include "qemu/range.h" Date: Mon, 14 Oct 2019 16:22:42 +0200 Message-Id: <20191014142246.4538-17-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.67]); Mon, 14 Oct 2019 14:30:57 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 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 , Matthew Rosato , Paul Durrant , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Gerd Hoffmann , Stefano Stabellini , qemu-block@nongnu.org, Helge Deller , David Hildenbrand , Halil Pasic , Christian Borntraeger , Anthony Perard , xen-devel@lists.xenproject.org, 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: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" hw/pci-host/piix.c calls various functions from the Range API. Include "qemu/range.h" which declares them. This fixes (when modifying unrelated headers): hw/pci-host/i440fx.c:54:11: error: field has incomplete type 'Range' (aka 'struct Range') Range pci_hole; ^ include/qemu/typedefs.h:116:16: note: forward declaration of 'struct Range' typedef struct Range Range; ^ hw/pci-host/i440fx.c:126:9: error: implicit declaration of function 'ranges_overlap' is invalid in C99 [-Werror,-Wimplicit-function-declaration] if (ranges_overlap(address, len, I440FX_PAM, I440FX_PAM_SIZE) || ^ hw/pci-host/i440fx.c:126:9: error: this function declaration is not a prototype [-Werror,-Wstrict-prototypes] hw/pci-host/i440fx.c:127:9: error: implicit declaration of function 'range_covers_byte' is invalid in C99 [-Werror,-Wimplicit-function-declaration] range_covers_byte(address, len, I440FX_SMRAM)) { ^ hw/pci-host/i440fx.c:127:9: error: this function declaration is not a prototype [-Werror,-Wstrict-prototypes] hw/pci-host/i440fx.c:189:13: error: implicit declaration of function 'range_is_empty' is invalid in C99 [-Werror,-Wimplicit-function-declaration] val64 = range_is_empty(&s->pci_hole) ? 0 : range_lob(&s->pci_hole); ^ Signed-off-by: Philippe Mathieu-Daudé --- hw/pci-host/piix.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c index 135c645535..76ed252a60 100644 --- a/hw/pci-host/piix.c +++ b/hw/pci-host/piix.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "qemu/range.h" #include "hw/i386/pc.h" #include "hw/irq.h" #include "hw/pci/pci.h" From patchwork Mon Oct 14 14:22:43 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: 1176420 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=fail (p=none dis=none) header.from=redhat.com 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 46sLwQ6Lh7z9sPK for ; Tue, 15 Oct 2019 01:46:14 +1100 (AEDT) Received: from localhost ([::1]:50906 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iK1bw-0004uv-91 for incoming@patchwork.ozlabs.org; Mon, 14 Oct 2019 10:46:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50099) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iK1Ng-0005KK-LV for qemu-devel@nongnu.org; Mon, 14 Oct 2019 10:31:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iK1Nf-0002Z6-DU for qemu-devel@nongnu.org; Mon, 14 Oct 2019 10:31:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41698) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iK1Na-0002Xl-Kz; Mon, 14 Oct 2019 10:31:22 -0400 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 AA45476525; Mon, 14 Oct 2019 14:31:20 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.206.0]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 995CB60126; Mon, 14 Oct 2019 14:30:57 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Markus Armbruster , qemu-devel@nongnu.org Subject: [PATCH 17/20] hw/acpi: Include "hw/mem/nvdimm.h" Date: Mon, 14 Oct 2019 16:22:43 +0200 Message-Id: <20191014142246.4538-18-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.5.16 (mx1.redhat.com [10.5.110.26]); Mon, 14 Oct 2019 14:31:20 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 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 , Matthew Rosato , Paul Durrant , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Gerd Hoffmann , Stefano Stabellini , qemu-block@nongnu.org, Helge Deller , David Hildenbrand , Halil Pasic , Christian Borntraeger , Anthony Perard , xen-devel@lists.xenproject.org, 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: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Both ich9.c and piix4.c use methods/definitions declared in the NVDIMM device header. Include it. This fixes (when modifying unrelated headers): hw/acpi/ich9.c:507:46: error: use of undeclared identifier 'TYPE_NVDIMM' if (object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM)) { ^ hw/acpi/ich9.c:508:13: error: implicit declaration of function 'nvdimm_acpi_plug_cb' is invalid in C99 [-Werror,-Wimplicit-function-declaration] nvdimm_acpi_plug_cb(hotplug_dev, dev); ^ hw/acpi/piix4.c:403:46: error: use of undeclared identifier 'TYPE_NVDIMM' if (object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM)) { ^ hw/acpi/piix4.c:404:13: error: implicit declaration of function 'nvdimm_acpi_plug_cb' is invalid in C99 [-Werror,-Wimplicit-function-declaration] nvdimm_acpi_plug_cb(hotplug_dev, dev); ^ Signed-off-by: Philippe Mathieu-Daudé --- hw/acpi/ich9.c | 1 + hw/acpi/piix4.c | 1 + 2 files changed, 2 insertions(+) diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c index fdd0a6c79e..4e74284b65 100644 --- a/hw/acpi/ich9.c +++ b/hw/acpi/ich9.c @@ -39,6 +39,7 @@ #include "hw/i386/ich9.h" #include "hw/mem/pc-dimm.h" +#include "hw/mem/nvdimm.h" //#define DEBUG diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 5742c3df87..11a3e33e5b 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -39,6 +39,7 @@ #include "hw/acpi/cpu.h" #include "hw/hotplug.h" #include "hw/mem/pc-dimm.h" +#include "hw/mem/nvdimm.h" #include "hw/acpi/memory_hotplug.h" #include "hw/acpi/acpi_dev_interface.h" #include "hw/xen/xen.h" From patchwork Mon Oct 14 14:22:44 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: 1176413 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=fail (p=none dis=none) header.from=redhat.com 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 46sLlH42Rkz9sPK for ; Tue, 15 Oct 2019 01:38:19 +1100 (AEDT) Received: from localhost ([::1]:50714 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iK1UH-0003wZ-12 for incoming@patchwork.ozlabs.org; Mon, 14 Oct 2019 10:38:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50248) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iK1OA-0005it-J2 for qemu-devel@nongnu.org; Mon, 14 Oct 2019 10:32:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iK1O9-0002jm-DA for qemu-devel@nongnu.org; Mon, 14 Oct 2019 10:31:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58880) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iK1O1-0002ev-1h; Mon, 14 Oct 2019 10:31:49 -0400 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 0F7D63086211; Mon, 14 Oct 2019 14:31:48 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.206.0]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5E5E7600CD; Mon, 14 Oct 2019 14:31:20 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Markus Armbruster , qemu-devel@nongnu.org Subject: [PATCH 18/20] hw/i386: Include "hw/mem/nvdimm.h" Date: Mon, 14 Oct 2019 16:22:44 +0200 Message-Id: <20191014142246.4538-19-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.5.16 (mx1.redhat.com [10.5.110.42]); Mon, 14 Oct 2019 14:31:48 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 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 , Matthew Rosato , Paul Durrant , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Gerd Hoffmann , Stefano Stabellini , qemu-block@nongnu.org, Helge Deller , David Hildenbrand , Halil Pasic , Christian Borntraeger , Anthony Perard , xen-devel@lists.xenproject.org, 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: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" All this files use methods/definitions declared in the NVDIMM device header. Include it. This fixes (when modifying unrelated headers): hw/i386/acpi-build.c:2733:9: error: implicit declaration of function 'nvdimm_build_acpi' is invalid in C99 [-Werror,-Wimplicit-function-declaration] nvdimm_build_acpi(table_offsets, tables_blob, tables->linker, ^ hw/i386/pc.c:1996:61: error: use of undeclared identifier 'TYPE_NVDIMM' const bool is_nvdimm = object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM); ^ hw/i386/pc.c:2032:55: error: use of undeclared identifier 'TYPE_NVDIMM' bool is_nvdimm = object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM); ^ hw/i386/pc.c:2040:9: error: implicit declaration of function 'nvdimm_plug' is invalid in C99 [-Werror,-Wimplicit-function-declaration] nvdimm_plug(ms->nvdimms_state); ^ hw/i386/pc.c:2040:9: error: this function declaration is not a prototype [-Werror,-Wstrict-prototypes] nvdimm_plug(ms->nvdimms_state); ^ hw/i386/pc.c:2065:42: error: use of undeclared identifier 'TYPE_NVDIMM' if (object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM)) { ^ hw/i386/pc_i440fx.c:307:9: error: implicit declaration of function 'nvdimm_init_acpi_state' is invalid in C99 [-Werror,-Wimplicit-function-declaration] nvdimm_init_acpi_state(machine->nvdimms_state, system_io, ^ hw/i386/pc_q35.c:332:9: error: implicit declaration of function 'nvdimm_init_acpi_state' is invalid in C99 [-Werror,-Wimplicit-function-declaration] nvdimm_init_acpi_state(machine->nvdimms_state, system_io, ^ Signed-off-by: Philippe Mathieu-Daudé --- hw/i386/acpi-build.c | 1 + hw/i386/pc.c | 1 + hw/i386/pc_piix.c | 1 + hw/i386/pc_q35.c | 1 + 4 files changed, 4 insertions(+) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 4e0f9f425a..ac46936f63 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -48,6 +48,7 @@ #include "hw/timer/mc146818rtc_regs.h" #include "migration/vmstate.h" #include "hw/mem/memory-device.h" +#include "hw/mem/nvdimm.h" #include "sysemu/numa.h" #include "sysemu/reset.h" diff --git a/hw/i386/pc.c b/hw/i386/pc.c index bcda50efcc..cff330802d 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -73,6 +73,7 @@ #include "hw/boards.h" #include "acpi-build.h" #include "hw/mem/pc-dimm.h" +#include "hw/mem/nvdimm.h" #include "qapi/error.h" #include "qapi/qapi-visit-common.h" #include "qapi/visitor.h" diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 6824b72124..8651b6e2ec 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -58,6 +58,7 @@ #include "migration/misc.h" #include "kvm_i386.h" #include "sysemu/numa.h" +#include "hw/mem/nvdimm.h" #define MAX_IDE_BUS 2 diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 8fad20f314..91ba231ef1 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -53,6 +53,7 @@ #include "qapi/error.h" #include "qemu/error-report.h" #include "sysemu/numa.h" +#include "hw/mem/nvdimm.h" /* ICH9 AHCI has 6 ports */ #define MAX_SATA_PORTS 6 From patchwork Mon Oct 14 14:22:45 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: 1176421 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=fail (p=none dis=none) header.from=redhat.com 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 46sLyv6SpQz9sPZ for ; Tue, 15 Oct 2019 01:48:22 +1100 (AEDT) Received: from localhost ([::1]:50942 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iK1dz-0007Tc-I9 for incoming@patchwork.ozlabs.org; Mon, 14 Oct 2019 10:48:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50352) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iK1OY-0006Ai-Md for qemu-devel@nongnu.org; Mon, 14 Oct 2019 10:32:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iK1OX-0002tn-E5 for qemu-devel@nongnu.org; Mon, 14 Oct 2019 10:32:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58912) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iK1OS-0002rK-OT; Mon, 14 Oct 2019 10:32:16 -0400 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 A9DD7308FBB4; Mon, 14 Oct 2019 14:32:15 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.206.0]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A8E70600CD; Mon, 14 Oct 2019 14:31:48 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Markus Armbruster , qemu-devel@nongnu.org Subject: [PATCH 19/20] hw/pci-host/q35: Remove unused includes Date: Mon, 14 Oct 2019 16:22:45 +0200 Message-Id: <20191014142246.4538-20-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.5.16 (mx1.redhat.com [10.5.110.43]); Mon, 14 Oct 2019 14:32:15 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 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 , Matthew Rosato , Paul Durrant , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Gerd Hoffmann , Stefano Stabellini , qemu-block@nongnu.org, Helge Deller , David Hildenbrand , Halil Pasic , Christian Borntraeger , Anthony Perard , xen-devel@lists.xenproject.org, 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: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Only q35.c requires declarations from "hw/i386/pc.h", move it there. Remove all the includes not used by "q35.h". Signed-off-by: Philippe Mathieu-Daudé --- hw/pci-host/q35.c | 1 + include/hw/pci-host/q35.h | 7 ------- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c index 158d270b9f..918843d373 100644 --- a/hw/pci-host/q35.c +++ b/hw/pci-host/q35.c @@ -29,6 +29,7 @@ */ #include "qemu/osdep.h" +#include "hw/i386/pc.h" #include "hw/pci-host/q35.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" diff --git a/include/hw/pci-host/q35.h b/include/hw/pci-host/q35.h index 79a88d67b1..534d90dbaf 100644 --- a/include/hw/pci-host/q35.h +++ b/include/hw/pci-host/q35.h @@ -22,16 +22,9 @@ #ifndef HW_Q35_H #define HW_Q35_H -#include "hw/isa/isa.h" -#include "hw/sysbus.h" -#include "hw/i386/pc.h" -#include "hw/isa/apm.h" #include "hw/pci/pci.h" #include "hw/pci/pcie_host.h" -#include "hw/acpi/acpi.h" -#include "hw/acpi/ich9.h" #include "hw/pci-host/pam.h" -#include "hw/i386/intel_iommu.h" #include "qemu/range.h" #define TYPE_Q35_HOST_DEVICE "q35-pcihost" 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: 1176422 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=fail (p=none dis=none) header.from=redhat.com 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 46sM1T24qzz9sPK for ; Tue, 15 Oct 2019 01:50:37 +1100 (AEDT) Received: from localhost ([::1]:50978 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iK1gB-0001KN-4v for incoming@patchwork.ozlabs.org; Mon, 14 Oct 2019 10:50:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50444) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iK1Oz-0006VN-2c for qemu-devel@nongnu.org; Mon, 14 Oct 2019 10:32:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iK1Ox-00036z-VC for qemu-devel@nongnu.org; Mon, 14 Oct 2019 10:32:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50722) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iK1Or-00033y-NI; Mon, 14 Oct 2019 10:32:41 -0400 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 Subject: [PATCH 20/20] hw/i386/pc: Clean up includes 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) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 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 , Matthew Rosato , Paul Durrant , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Gerd Hoffmann , Stefano Stabellini , qemu-block@nongnu.org, Helge Deller , David Hildenbrand , Halil Pasic , Christian Borntraeger , Anthony Perard , xen-devel@lists.xenproject.org, 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: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-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"