From 5d554fefebccea6abc41832f754a44756c9d749a Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@redhat.com>
Date: Wed, 7 Mar 2018 12:26:37 -0500
Subject: [PATCH] Include qapi/error.h exactly where needed

This cleanup makes the number of objects depending on qapi/error.h
drop from 1910 (out of 4743) to 1612 in my "build everything" tree.

While there, separate #include from file comment with a blank line,
and drop a useless comment on why qemu/osdep.h is included first.

Backports commit e688df6bc4549f28534cdb001f168b8caae55b0c from qemu
---
 qemu/cpus.c                | 2 +-
 qemu/hw/i386/pc.c          | 1 +
 qemu/hw/i386/pc_piix.c     | 1 +
 qemu/qobject/qnum.c        | 1 -
 qemu/scripts/qapi-event.py | 2 +-
 qemu/target/i386/cpu.c     | 2 +-
 qemu/vl.c                  | 1 +
 7 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/qemu/cpus.c b/qemu/cpus.c
index 28e331da..e395ef6f 100644
--- a/qemu/cpus.c
+++ b/qemu/cpus.c
@@ -24,10 +24,10 @@
 
 /* Modified for Unicorn Engine by Nguyen Anh Quynh, 2015 */
 
-/* Needed early for CONFIG_BSD etc. */
 #include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "cpu.h"
+#include "qapi/error.h"
 #include "sysemu/sysemu.h"
 #include "exec/exec-all.h"
 
diff --git a/qemu/hw/i386/pc.c b/qemu/hw/i386/pc.c
index df710532..d2ac8ae2 100644
--- a/qemu/hw/i386/pc.c
+++ b/qemu/hw/i386/pc.c
@@ -30,6 +30,7 @@
 #include "sysemu/cpus.h"
 #include "sysemu/sysemu.h"
 #include "target/i386/topology.h"
+#include "qapi/error.h"
 #include "qapi-visit.h"
 
 
diff --git a/qemu/hw/i386/pc_piix.c b/qemu/hw/i386/pc_piix.c
index ad7d54c9..ef680c27 100644
--- a/qemu/hw/i386/pc_piix.c
+++ b/qemu/hw/i386/pc_piix.c
@@ -25,6 +25,7 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
+#include "qapi/error.h"
 #include "hw/i386/pc.h"
 #include "hw/boards.h"
 #include "exec/address-spaces.h"
diff --git a/qemu/qobject/qnum.c b/qemu/qobject/qnum.c
index 476e81c9..8e2188db 100644
--- a/qemu/qobject/qnum.c
+++ b/qemu/qobject/qnum.c
@@ -13,7 +13,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "qapi/error.h"
 #include "qapi/qmp/qnum.h"
 #include "qapi/qmp/qobject.h"
 #include "qemu-common.h"
diff --git a/qemu/scripts/qapi-event.py b/qemu/scripts/qapi-event.py
index 1825ce03..4b76e4d8 100644
--- a/qemu/scripts/qapi-event.py
+++ b/qemu/scripts/qapi-event.py
@@ -206,6 +206,7 @@ fdef.write(mcgen('''
 #include "qemu-common.h"
 #include "%(prefix)sqapi-event.h"
 #include "%(prefix)sqapi-visit.h"
+#include "qapi/error.h"
 #include "qapi/qobject-output-visitor.h"
 #include "qapi/qmp-event.h"
 
@@ -213,7 +214,6 @@ fdef.write(mcgen('''
                  prefix=prefix))
 
 fdecl.write(mcgen('''
-#include "qapi/error.h"
 #include "qapi/qmp/qdict.h"
 #include "%(prefix)sqapi-types.h"
 
diff --git a/qemu/target/i386/cpu.c b/qemu/target/i386/cpu.c
index 914ef3fd..44823ef0 100644
--- a/qemu/target/i386/cpu.c
+++ b/qemu/target/i386/cpu.c
@@ -19,13 +19,13 @@
 
 #include "qemu/osdep.h"
 #include "qemu/cutils.h"
-#include "qapi/error.h"
 #include "unicorn/platform.h"
 
 #include "cpu.h"
 #include "exec/exec-all.h"
 #include "sysemu/cpus.h"
 
+#include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 
 #include "qapi-visit.h"
diff --git a/qemu/vl.c b/qemu/vl.c
index 5bf4c7a4..51c9f2ea 100644
--- a/qemu/vl.c
+++ b/qemu/vl.c
@@ -26,6 +26,7 @@
 /* By Nguyen Anh Quynh, 2015 */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu/cutils.h"
 #include "hw/boards.h"  // MachineClass
 #include "sysemu/sysemu.h"