[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 23/37] hw/scsi: Clean up includes
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH 23/37] hw/scsi: Clean up includes |
Date: |
Tue, 26 Jan 2016 18:17:16 +0000 |
Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.
This commit was created with scripts/clean-includes.
Signed-off-by: Peter Maydell <address@hidden>
---
hw/scsi/esp-pci.c | 1 +
hw/scsi/esp.c | 1 +
hw/scsi/lsi53c895a.c | 2 +-
hw/scsi/megasas.c | 1 +
hw/scsi/scsi-bus.c | 1 +
hw/scsi/scsi-disk.c | 1 +
hw/scsi/scsi-generic.c | 5 +----
hw/scsi/vhost-scsi.c | 2 +-
hw/scsi/vmw_pvscsi.c | 1 +
9 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/hw/scsi/esp-pci.c b/hw/scsi/esp-pci.c
index 8d2242d..1de7706 100644
--- a/hw/scsi/esp-pci.c
+++ b/hw/scsi/esp-pci.c
@@ -23,6 +23,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/pci/pci.h"
#include "hw/nvram/eeprom93xx.h"
#include "hw/scsi/esp.h"
diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c
index 272d13d..e55c32c 100644
--- a/hw/scsi/esp.c
+++ b/hw/scsi/esp.c
@@ -23,6 +23,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "hw/scsi/esp.h"
#include "trace.h"
diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c
index c5b0cc5..df205cd 100644
--- a/hw/scsi/lsi53c895a.c
+++ b/hw/scsi/lsi53c895a.c
@@ -13,7 +13,7 @@
* as well-behaved operating systems will not try to use them.
*/
-#include <assert.h>
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/pci/pci.h"
diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c
index 60c0e6c..a63a581 100644
--- a/hw/scsi/megasas.c
+++ b/hw/scsi/megasas.c
@@ -18,6 +18,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "sysemu/dma.h"
diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c
index 164af87..6dcdbc0 100644
--- a/hw/scsi/scsi-bus.c
+++ b/hw/scsi/scsi-bus.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "qemu/error-report.h"
#include "hw/scsi/scsi.h"
diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
index 4797d83..dc79dc0 100644
--- a/hw/scsi/scsi-disk.c
+++ b/hw/scsi/scsi-disk.c
@@ -28,6 +28,7 @@ do { printf("scsi-disk: " fmt , ## __VA_ARGS__); } while (0)
#define DPRINTF(fmt, ...) do {} while(0)
#endif
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/error-report.h"
#include "hw/scsi/scsi.h"
diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c
index a4626f7..75a4127 100644
--- a/hw/scsi/scsi-generic.c
+++ b/hw/scsi/scsi-generic.c
@@ -11,6 +11,7 @@
*
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/error-report.h"
#include "hw/scsi/scsi.h"
@@ -31,10 +32,6 @@ do { printf("scsi-generic: " fmt , ## __VA_ARGS__); } while
(0)
#define BADF(fmt, ...) \
do { fprintf(stderr, "scsi-generic: " fmt , ## __VA_ARGS__); } while (0)
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
#include <scsi/sg.h>
#include "block/scsi.h"
diff --git a/hw/scsi/vhost-scsi.c b/hw/scsi/vhost-scsi.c
index 7bc8288..c86622c 100644
--- a/hw/scsi/vhost-scsi.c
+++ b/hw/scsi/vhost-scsi.c
@@ -14,8 +14,8 @@
*
*/
+#include "qemu/osdep.h"
#include <sys/ioctl.h>
-#include "config.h"
#include "qemu/error-report.h"
#include "qemu/queue.h"
#include "monitor/monitor.h"
diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c
index 6b4b989..9abc086 100644
--- a/hw/scsi/vmw_pvscsi.c
+++ b/hw/scsi/vmw_pvscsi.c
@@ -25,6 +25,7 @@
*
*/
+#include "qemu/osdep.h"
#include "hw/scsi/scsi.h"
#include <block/scsi.h>
#include "hw/pci/msi.h"
--
1.9.1
- [Qemu-devel] [PATCH 03/37] exec: Clean up includes, (continued)
- [Qemu-devel] [PATCH 03/37] exec: Clean up includes, Peter Maydell, 2016/01/26
- [Qemu-devel] [PATCH 34/37] tilegx: Clean up includes, Peter Maydell, 2016/01/26
- [Qemu-devel] [PATCH 33/37] tricore: Clean up includes, Peter Maydell, 2016/01/26
- [Qemu-devel] [PATCH 35/37] arm devices: Clean up includes, Peter Maydell, 2016/01/26
- [Qemu-devel] [PATCH 31/37] cris: Clean up includes, Peter Maydell, 2016/01/26
- [Qemu-devel] [PATCH 36/37] hw/core: Clean up includes, Peter Maydell, 2016/01/26
- [Qemu-devel] [PATCH 37/37] hw: Clean up includes, Peter Maydell, 2016/01/26
- [Qemu-devel] [PATCH 26/37] hw/intc: Clean up includes, Peter Maydell, 2016/01/26
- [Qemu-devel] [PATCH 21/37] hw/vfio: Clean up includes, Peter Maydell, 2016/01/26
- [Qemu-devel] [PATCH 30/37] m68k: Clean up includes, Peter Maydell, 2016/01/26
- [Qemu-devel] [PATCH 23/37] hw/scsi: Clean up includes,
Peter Maydell <=
- [Qemu-devel] [PATCH 14/37] virtio: Clean up includes, Peter Maydell, 2016/01/26
- [Qemu-devel] [PATCH 20/37] hw/display: Clean up includes, Peter Maydell, 2016/01/26
- [Qemu-devel] [PATCH 13/37] xen: Clean up includes, Peter Maydell, 2016/01/26
- [Qemu-devel] [PATCH 32/37] moxie: Clean up includes, Peter Maydell, 2016/01/26
- [Qemu-devel] [PATCH 24/37] hw/misc: Clean up includes, Peter Maydell, 2016/01/26
- [Qemu-devel] [PATCH 22/37] pci: Clean up includes, Peter Maydell, 2016/01/26
- [Qemu-devel] [PATCH 16/37] ide: Clean up includes, Peter Maydell, 2016/01/26
- [Qemu-devel] [PATCH 17/37] 9pfs: Clean up includes, Peter Maydell, 2016/01/26
- [Qemu-devel] [PATCH 11/37] alpha: Clean up includes, Peter Maydell, 2016/01/26
- [Qemu-devel] [PATCH 18/37] hw/net: Clean up includes, Peter Maydell, 2016/01/26