[Qemu-commits] [COMMIT 5561650] Include assert.h from qemu-common.h

[Anthony Liguori]

From: Paul Brook <address@hidden>

Include assert.h from qemu-common.h and remove other direct uses.
cpu-all.h still need to include it because of the dyngen-exec.h hacks

Signed-off-by: Paul Brook <address@hidden>

diff --git a/aes.c b/aes.c
index 7e84f46..eb37adb 100644
--- a/aes.c
+++ b/aes.c
@@ -34,8 +34,6 @@
 #define NDEBUG
 #endif
 
-#include <assert.h>
-
 typedef uint32_t u32;
 typedef uint16_t u16;
 typedef uint8_t u8;
diff --git a/block-qcow2.c b/block-qcow2.c
index 9a49777..2ad0725 100644
--- a/block-qcow2.c
+++ b/block-qcow2.c
@@ -25,7 +25,6 @@
 #include "block_int.h"
 #include <zlib.h>
 #include "aes.h"
-#include <assert.h>
 
 /*
   Differences with QCOW:
diff --git a/block-raw-posix.c b/block-raw-posix.c
index bcb3e01..406ec7d 100644
--- a/block-raw-posix.c
+++ b/block-raw-posix.c
@@ -25,7 +25,6 @@
 #include "qemu-timer.h"
 #include "qemu-char.h"
 #include "block_int.h"
-#include <assert.h>
 #ifdef CONFIG_AIO
 #include "posix-aio-compat.h"
 #endif
diff --git a/block-raw-win32.c b/block-raw-win32.c
index b5287d2..a998166 100644
--- a/block-raw-win32.c
+++ b/block-raw-win32.c
@@ -24,7 +24,6 @@
 #include "qemu-common.h"
 #include "qemu-timer.h"
 #include "block_int.h"
-#include <assert.h>
 #include <windows.h>
 #include <winioctl.h>
 
diff --git a/block-vvfat.c b/block-vvfat.c
index 7905931..0f0760f 100644
--- a/block-vvfat.c
+++ b/block-vvfat.c
@@ -24,7 +24,6 @@
  */
 #include <sys/stat.h>
 #include <dirent.h>
-#include <assert.h>
 #include "qemu-common.h"
 #include "block_int.h"
 
diff --git a/cutils.c b/cutils.c
index a1652ab..0623cf7 100644
--- a/cutils.c
+++ b/cutils.c
@@ -23,7 +23,6 @@
  */
 #include "qemu-common.h"
 #include "host-utils.h"
-#include <assert.h>
 
 void pstrcpy(char *buf, int buf_size, const char *str)
 {
diff --git a/hw/adlib.c b/hw/adlib.c
index 076c1a0..8c23319 100644
--- a/hw/adlib.c
+++ b/hw/adlib.c
@@ -22,7 +22,6 @@
  * THE SOFTWARE.
  */
 
-#include <assert.h>
 #include "hw.h"
 #include "audiodev.h"
 #include "audio/audio.h"
diff --git a/hw/baum.c b/hw/baum.c
index 7dac684..f6d6e67 100644
--- a/hw/baum.c
+++ b/hw/baum.c
@@ -26,7 +26,6 @@
 #include "qemu-timer.h"
 #include "usb.h"
 #include "baum.h"
-#include <assert.h>
 #include <brlapi.h>
 #include <brlapi_constants.h>
 #include <brlapi_keycodes.h>
diff --git a/hw/eepro100.c b/hw/eepro100.c
index 7dbbca0..8543481 100644
--- a/hw/eepro100.c
+++ b/hw/eepro100.c
@@ -38,7 +38,6 @@
 # warning "PXE boot still not working!"
 #endif
 
-#include <assert.h>
 #include <stddef.h>             /* offsetof */
 #include "hw.h"
 #include "pci.h"
diff --git a/hw/eeprom93xx.c b/hw/eeprom93xx.c
index e4b6b13..f91b0c9 100644
--- a/hw/eeprom93xx.c
+++ b/hw/eeprom93xx.c
@@ -36,7 +36,6 @@
  * - No emulation of EEPROM timings.
  */
 
-#include <assert.h>
 #include "hw.h"
 #include "eeprom93xx.h"
 
diff --git a/hw/sh7750.c b/hw/sh7750.c
index 423c43f..f079781 100644
--- a/hw/sh7750.c
+++ b/hw/sh7750.c
@@ -23,7 +23,6 @@
  * THE SOFTWARE.
  */
 #include <stdio.h>
-#include <assert.h>
 #include "hw.h"
 #include "sh.h"
 #include "sysemu.h"
diff --git a/hw/sh_intc.c b/hw/sh_intc.c
index f4138fd..b75d794 100644
--- a/hw/sh_intc.c
+++ b/hw/sh_intc.c
@@ -8,7 +8,6 @@
  * This code is licenced under the GPL.
  */
 
-#include <assert.h>
 #include "sh_intc.h"
 #include "hw.h"
 #include "sh.h"
diff --git a/hw/sh_serial.c b/hw/sh_serial.c
index 4957c41..ee0c52c 100644
--- a/hw/sh_serial.c
+++ b/hw/sh_serial.c
@@ -27,7 +27,6 @@
 #include "hw.h"
 #include "sh.h"
 #include "qemu-char.h"
-#include <assert.h>
 
 //#define DEBUG_SERIAL
 
diff --git a/hw/sm501.c b/hw/sm501.c
index 316aba2..4b0df8f 100644
--- a/hw/sm501.c
+++ b/hw/sm501.c
@@ -23,7 +23,6 @@
  */
 
 #include <stdio.h>
-#include <assert.h>
 #include "hw.h"
 #include "pc.h"
 #include "console.h"
diff --git a/hw/tc58128.c b/hw/tc58128.c
index 2f1b305..21e8085 100644
--- a/hw/tc58128.c
+++ b/hw/tc58128.c
@@ -1,4 +1,3 @@
-#include <assert.h>
 #include "hw.h"
 #include "sh.h"
 #include "sysemu.h"
diff --git a/qemu-common.h b/qemu-common.h
index b2e2829..ee4a672 100644
--- a/qemu-common.h
+++ b/qemu-common.h
@@ -23,6 +23,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/stat.h>
+#include <assert.h>
 #include "config-host.h"
 
 #ifndef O_LARGEFILE
diff --git a/qemu-img.c b/qemu-img.c
index 29149a2..32c5b42 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -24,7 +24,6 @@
 #include "qemu-common.h"
 #include "osdep.h"
 #include "block_int.h"
-#include <assert.h>
 #include <stdio.h>
 
 #ifdef _WIN32
diff --git a/target-cris/op_helper.c b/target-cris/op_helper.c
index 2e280f3..edfaf41 100644
--- a/target-cris/op_helper.c
+++ b/target-cris/op_helper.c
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
  */
 
-#include <assert.h>
 #include "exec.h"
 #include "mmu.h"
 #include "helper.h"
diff --git a/target-cris/translate.c b/target-cris/translate.c
index b3d0a19..6a44281 100644
--- a/target-cris/translate.c
+++ b/target-cris/translate.c
@@ -29,7 +29,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <inttypes.h>
-#include <assert.h>
 
 #include "cpu.h"
 #include "exec-all.h"
diff --git a/target-i386/helper.c b/target-i386/helper.c
index 5c03e3a..7fc5366 100644
--- a/target-i386/helper.c
+++ b/target-i386/helper.c
@@ -23,7 +23,6 @@
 #include <string.h>
 #include <inttypes.h>
 #include <signal.h>
-#include <assert.h>
 
 #include "cpu.h"
 #include "exec-all.h"
diff --git a/target-i386/translate.c b/target-i386/translate.c
index 3933697..d45e9fe 100644
--- a/target-i386/translate.c
+++ b/target-i386/translate.c
@@ -23,7 +23,6 @@
 #include <string.h>
 #include <inttypes.h>
 #include <signal.h>
-#include <assert.h>
 
 #include "cpu.h"
 #include "exec-all.h"
diff --git a/target-m68k/translate.c b/target-m68k/translate.c
index f9b36c9..422f0a4 100644
--- a/target-m68k/translate.c
+++ b/target-m68k/translate.c
@@ -23,7 +23,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <inttypes.h>
-#include <assert.h>
 
 #include "config.h"
 #include "cpu.h"
diff --git a/target-mips/helper.c b/target-mips/helper.c
index 35b2c59..fecbcb2 100644
--- a/target-mips/helper.c
+++ b/target-mips/helper.c
@@ -23,7 +23,6 @@
 #include <string.h>
 #include <inttypes.h>
 #include <signal.h>
-#include <assert.h>
 
 #include "cpu.h"
 #include "exec-all.h"
diff --git a/target-ppc/helper.c b/target-ppc/helper.c
index db765e3..5a7a935 100644
--- a/target-ppc/helper.c
+++ b/target-ppc/helper.c
@@ -23,7 +23,6 @@
 #include <string.h>
 #include <inttypes.h>
 #include <signal.h>
-#include <assert.h>
 
 #include "cpu.h"
 #include "exec-all.h"
diff --git a/target-sh4/helper.c b/target-sh4/helper.c
index d8e08e3..94be136 100644
--- a/target-sh4/helper.c
+++ b/target-sh4/helper.c
@@ -23,7 +23,6 @@
 #include <string.h>
 #include <inttypes.h>
 #include <signal.h>
-#include <assert.h>
 
 #include "cpu.h"
 #include "exec-all.h"
diff --git a/target-sh4/translate.c b/target-sh4/translate.c
index fc3633a..1f461b7 100644
--- a/target-sh4/translate.c
+++ b/target-sh4/translate.c
@@ -22,7 +22,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <inttypes.h>
-#include <assert.h>
 
 #define DEBUG_DISAS
 #define SH4_DEBUG_DISAS
diff --git a/target-sparc/helper.c b/target-sparc/helper.c
index 8ad82a9..2f41418 100644
--- a/target-sparc/helper.c
+++ b/target-sparc/helper.c
@@ -23,7 +23,6 @@
 #include <string.h>
 #include <inttypes.h>
 #include <signal.h>
-#include <assert.h>
 
 #include "cpu.h"
 #include "exec-all.h"
diff --git a/tcg/tcg.c b/tcg/tcg.c
index a75d8dc..299bff6 100644
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -32,7 +32,6 @@
 #define NDEBUG
 #endif
 
-#include <assert.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <stdio.h>