Include assert.h from qemu-common.h

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 <paul@codesourcery.com>

diff --git a/aes.c b/aes.c
index 7e84f4643a25150e43a11c2c87552690169b3943..eb37adbed860674a059f8affffe8aae5b786575c 100644 (file)
--- 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 9a49777ed15ccbd97d1b2d6948235d65336fe290..2ad07250efd84e57a149d38ddf882c3ba9bfb6ca 100644 (file)
--- 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 bcb3e0145fb186c3b2363cb21051bbe234055712..406ec7d04c4b1b56db69ae3c8a0886eaa3a5bcb3 100644 (file)
--- 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 b5287d2a56fbafa8d5c0be818eb703ffb4ea6998..a998166a7906d0dc673a497cfbc8e51e00579253 100644 (file)
--- 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 79059311c6dabf23e7c4efb20c2fa4ade08f9376..0f0760f90c5a4e2ecd53982f5bd0b543cac5fc54 100644 (file)
--- 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 a1652ab0bc39bafcf0e9e9f71d90af65d237d426..0623cf70dabc13c5c96fec1cc4534ebde3a56dbd 100644 (file)
--- 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 076c1a0b1f0c65329abd2a6c366015999826d52d..8c2331955bf403f3aae84ed937825a9a70171b79 100644 (file)
--- 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 7dac684107a7bbcd55414c5538a71d4e4fa10f79..f6d6e67d48fbcd8c802dcb1d17d7064f758466cb 100644 (file)
--- 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 7dbbca009486d95a7735f2b387327d4d869c080a..85434818acbbf54a8975c28c8d986669a7fa4312 100644 (file)
--- 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 e4b6b13b76731c2cb7114ff015f2f61ff2f4c53c..f91b0c99c0ec0c0f4ecc5e4bd077e16321f32096 100644 (file)
--- 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 423c43ff122eff20d8179769ddf08b1917e10dd8..f079781b2442a2d06f6233c3a35c62adb358f75d 100644 (file)
--- 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 f4138fd2277021b1dcc9c9a627565f5350e36fe8..b75d794e1215f9fff160febcb679a9b0579a5a5a 100644 (file)
--- 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 4957c41ae8cf0959815e1deda0a639c067c7a305..ee0c52c42848a6334a6d0a6d973fc5326f1c5839 100644 (file)
--- 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 316aba2c616aeaab18fecc1663158a70e8bac5d0..4b0df8fec852156adf2518fa9fcdf1a76b59c94a 100644 (file)
--- 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 2f1b305d47b5b9892c847e42b08daaf0d93ca27c..21e808547e54ac3a48c35d31a224dd3a9f177ca0 100644 (file)
--- 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 b2e28297a8ffed0167a6d5380e3c96df843bf603..ee4a672694958ae8d469312b123ab9244307d181 100644 (file)
--- 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 29149a23c8af3b01ff283c669a295b7fd015220d..32c5b42008cd78a3db88183614754c5f7cd7ee66 100644 (file)
--- 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 2e280f3b62bc9fb0206bff3096f625a7174a9e4b..edfaf41a8c74bba01874065490251cab42f51fb8 100644 (file)
--- 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 b3d0a19edbe4a1a94e41476397302532971e5d43..6a442813ab6c320dd29fb556cdc23aafe71f9c2c 100644 (file)
--- 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 5c03e3a75f8dbc53f853c49ea88d13a1c1fa72ea..7fc5366e6d61cee0afdec3d1823b125286d59ba5 100644 (file)
--- 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 3933697ef112405fd7d1c86f8e559228185cd17c..d45e9fe73089e56961e02ff487cbcea98435b97f 100644 (file)
--- 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 f9b36c9630c3a6fdfb0e1edf086f9ecee385ce64..422f0a46e9c741540806395a2bded9e4e78eb8ee 100644 (file)
--- 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 35b2c591e30a6aab3f733c2c652280b9bd773516..fecbcb2f176cc68cc33e48e581c975376a6a47b1 100644 (file)
--- 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 db765e308be46c30997f8ba5fac4562e42fb4e63..5a7a935bb118cd35bfc2ec0bc04574d4dafba6af 100644 (file)
--- 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 d8e08e305cf2af93a7bf0adf32125554460537e9..94be136fa66ba575617e5a4baed392d8d96975ed 100644 (file)
--- 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 fc3633a6c3ee428dde18f11a1268fab1f28281e1..1f461b7a4bbf770282d594a5dacbdfc083cae7ae 100644 (file)
--- 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 8ad82a945646e78203e511839cbde617ca54eb10..2f41418c85cc19c22bb3412191a40cfd8d40c51c 100644 (file)
--- 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 a75d8dcc2c7b376819f5308ea6da35b62461925d..299bff6f0372d6074f4a436fcbdec22b1070fdb9 100644 (file)
--- 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>