summary refs log tree commit diff stats
path: root/hw/pci
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2013-02-04 11:37:52 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2013-03-01 13:54:10 +0100
commitb4a42f81383d60900aae09513f42eb857a5a7c7c (patch)
tree952c4781da510cc183ec4770c9c00993d357d88d /hw/pci
parentfd7f0d66177ec1058a2a256856ff38fc9ceae5af (diff)
downloadfocaccia-qemu-b4a42f81383d60900aae09513f42eb857a5a7c7c.tar.gz
focaccia-qemu-b4a42f81383d60900aae09513f42eb857a5a7c7c.zip
hw: move qdev-monitor.o to toplevel directory
qdev-monitor.c is the only "core qdev" file that is not used in
user-mode emulation, and it does not define anything that is used
by hardware models.  Remove it from the hw/ directory and
remove hw/qdev-monitor.h from hw/qdev.h too; this requires
some files to have some new explicitly includes.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/pci')
-rw-r--r--hw/pci/shpc.c3
-rw-r--r--hw/pci/slotid_cap.c1
2 files changed, 3 insertions, 1 deletions
diff --git a/hw/pci/shpc.c b/hw/pci/shpc.c
index f07266da66..d35c2ee965 100644
--- a/hw/pci/shpc.c
+++ b/hw/pci/shpc.c
@@ -1,7 +1,8 @@
+#include "qemu-common.h"
 #include <strings.h>
 #include <stdint.h>
 #include "qemu/range.h"
-#include "qemu/range.h"
+#include "qemu/error-report.h"
 #include "hw/pci/shpc.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_bus.h"
diff --git a/hw/pci/slotid_cap.c b/hw/pci/slotid_cap.c
index 99a30f429d..62f7bae2f1 100644
--- a/hw/pci/slotid_cap.c
+++ b/hw/pci/slotid_cap.c
@@ -1,5 +1,6 @@
 #include "hw/pci/slotid_cap.h"
 #include "hw/pci/pci.h"
+#include "qemu/error-report.h"
 
 #define SLOTID_CAP_LENGTH 4
 #define SLOTID_NSLOTS_SHIFT (ffs(PCI_SID_ESR_NSLOTS) - 1)