Commit 55616505876d6683130076b810a27c7889321560

Authored by Paul Brook
1 parent 6c7f4b47

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>
@@ -34,8 +34,6 @@ @@ -34,8 +34,6 @@
34 #define NDEBUG 34 #define NDEBUG
35 #endif 35 #endif
36 36
37 -#include <assert.h>  
38 -  
39 typedef uint32_t u32; 37 typedef uint32_t u32;
40 typedef uint16_t u16; 38 typedef uint16_t u16;
41 typedef uint8_t u8; 39 typedef uint8_t u8;
block-qcow2.c
@@ -25,7 +25,6 @@ @@ -25,7 +25,6 @@
25 #include "block_int.h" 25 #include "block_int.h"
26 #include <zlib.h> 26 #include <zlib.h>
27 #include "aes.h" 27 #include "aes.h"
28 -#include <assert.h>  
29 28
30 /* 29 /*
31 Differences with QCOW: 30 Differences with QCOW:
block-raw-posix.c
@@ -25,7 +25,6 @@ @@ -25,7 +25,6 @@
25 #include "qemu-timer.h" 25 #include "qemu-timer.h"
26 #include "qemu-char.h" 26 #include "qemu-char.h"
27 #include "block_int.h" 27 #include "block_int.h"
28 -#include <assert.h>  
29 #ifdef CONFIG_AIO 28 #ifdef CONFIG_AIO
30 #include "posix-aio-compat.h" 29 #include "posix-aio-compat.h"
31 #endif 30 #endif
block-raw-win32.c
@@ -24,7 +24,6 @@ @@ -24,7 +24,6 @@
24 #include "qemu-common.h" 24 #include "qemu-common.h"
25 #include "qemu-timer.h" 25 #include "qemu-timer.h"
26 #include "block_int.h" 26 #include "block_int.h"
27 -#include <assert.h>  
28 #include <windows.h> 27 #include <windows.h>
29 #include <winioctl.h> 28 #include <winioctl.h>
30 29
block-vvfat.c
@@ -24,7 +24,6 @@ @@ -24,7 +24,6 @@
24 */ 24 */
25 #include <sys/stat.h> 25 #include <sys/stat.h>
26 #include <dirent.h> 26 #include <dirent.h>
27 -#include <assert.h>  
28 #include "qemu-common.h" 27 #include "qemu-common.h"
29 #include "block_int.h" 28 #include "block_int.h"
30 29
cutils.c
@@ -23,7 +23,6 @@ @@ -23,7 +23,6 @@
23 */ 23 */
24 #include "qemu-common.h" 24 #include "qemu-common.h"
25 #include "host-utils.h" 25 #include "host-utils.h"
26 -#include <assert.h>  
27 26
28 void pstrcpy(char *buf, int buf_size, const char *str) 27 void pstrcpy(char *buf, int buf_size, const char *str)
29 { 28 {
hw/adlib.c
@@ -22,7 +22,6 @@ @@ -22,7 +22,6 @@
22 * THE SOFTWARE. 22 * THE SOFTWARE.
23 */ 23 */
24 24
25 -#include <assert.h>  
26 #include "hw.h" 25 #include "hw.h"
27 #include "audiodev.h" 26 #include "audiodev.h"
28 #include "audio/audio.h" 27 #include "audio/audio.h"
hw/baum.c
@@ -26,7 +26,6 @@ @@ -26,7 +26,6 @@
26 #include "qemu-timer.h" 26 #include "qemu-timer.h"
27 #include "usb.h" 27 #include "usb.h"
28 #include "baum.h" 28 #include "baum.h"
29 -#include <assert.h>  
30 #include <brlapi.h> 29 #include <brlapi.h>
31 #include <brlapi_constants.h> 30 #include <brlapi_constants.h>
32 #include <brlapi_keycodes.h> 31 #include <brlapi_keycodes.h>
hw/eepro100.c
@@ -38,7 +38,6 @@ @@ -38,7 +38,6 @@
38 # warning "PXE boot still not working!" 38 # warning "PXE boot still not working!"
39 #endif 39 #endif
40 40
41 -#include <assert.h>  
42 #include <stddef.h> /* offsetof */ 41 #include <stddef.h> /* offsetof */
43 #include "hw.h" 42 #include "hw.h"
44 #include "pci.h" 43 #include "pci.h"
hw/eeprom93xx.c
@@ -36,7 +36,6 @@ @@ -36,7 +36,6 @@
36 * - No emulation of EEPROM timings. 36 * - No emulation of EEPROM timings.
37 */ 37 */
38 38
39 -#include <assert.h>  
40 #include "hw.h" 39 #include "hw.h"
41 #include "eeprom93xx.h" 40 #include "eeprom93xx.h"
42 41
hw/sh7750.c
@@ -23,7 +23,6 @@ @@ -23,7 +23,6 @@
23 * THE SOFTWARE. 23 * THE SOFTWARE.
24 */ 24 */
25 #include <stdio.h> 25 #include <stdio.h>
26 -#include <assert.h>  
27 #include "hw.h" 26 #include "hw.h"
28 #include "sh.h" 27 #include "sh.h"
29 #include "sysemu.h" 28 #include "sysemu.h"
hw/sh_intc.c
@@ -8,7 +8,6 @@ @@ -8,7 +8,6 @@
8 * This code is licenced under the GPL. 8 * This code is licenced under the GPL.
9 */ 9 */
10 10
11 -#include <assert.h>  
12 #include "sh_intc.h" 11 #include "sh_intc.h"
13 #include "hw.h" 12 #include "hw.h"
14 #include "sh.h" 13 #include "sh.h"
hw/sh_serial.c
@@ -27,7 +27,6 @@ @@ -27,7 +27,6 @@
27 #include "hw.h" 27 #include "hw.h"
28 #include "sh.h" 28 #include "sh.h"
29 #include "qemu-char.h" 29 #include "qemu-char.h"
30 -#include <assert.h>  
31 30
32 //#define DEBUG_SERIAL 31 //#define DEBUG_SERIAL
33 32
hw/sm501.c
@@ -23,7 +23,6 @@ @@ -23,7 +23,6 @@
23 */ 23 */
24 24
25 #include <stdio.h> 25 #include <stdio.h>
26 -#include <assert.h>  
27 #include "hw.h" 26 #include "hw.h"
28 #include "pc.h" 27 #include "pc.h"
29 #include "console.h" 28 #include "console.h"
hw/tc58128.c
1 -#include <assert.h>  
2 #include "hw.h" 1 #include "hw.h"
3 #include "sh.h" 2 #include "sh.h"
4 #include "sysemu.h" 3 #include "sysemu.h"
qemu-common.h
@@ -23,6 +23,7 @@ @@ -23,6 +23,7 @@
23 #include <unistd.h> 23 #include <unistd.h>
24 #include <fcntl.h> 24 #include <fcntl.h>
25 #include <sys/stat.h> 25 #include <sys/stat.h>
  26 +#include <assert.h>
26 #include "config-host.h" 27 #include "config-host.h"
27 28
28 #ifndef O_LARGEFILE 29 #ifndef O_LARGEFILE
qemu-img.c
@@ -24,7 +24,6 @@ @@ -24,7 +24,6 @@
24 #include "qemu-common.h" 24 #include "qemu-common.h"
25 #include "osdep.h" 25 #include "osdep.h"
26 #include "block_int.h" 26 #include "block_int.h"
27 -#include <assert.h>  
28 #include <stdio.h> 27 #include <stdio.h>
29 28
30 #ifdef _WIN32 29 #ifdef _WIN32
target-cris/op_helper.c
@@ -19,7 +19,6 @@ @@ -19,7 +19,6 @@
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA 19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA
20 */ 20 */
21 21
22 -#include <assert.h>  
23 #include "exec.h" 22 #include "exec.h"
24 #include "mmu.h" 23 #include "mmu.h"
25 #include "helper.h" 24 #include "helper.h"
target-cris/translate.c
@@ -29,7 +29,6 @@ @@ -29,7 +29,6 @@
29 #include <stdio.h> 29 #include <stdio.h>
30 #include <string.h> 30 #include <string.h>
31 #include <inttypes.h> 31 #include <inttypes.h>
32 -#include <assert.h>  
33 32
34 #include "cpu.h" 33 #include "cpu.h"
35 #include "exec-all.h" 34 #include "exec-all.h"
target-i386/helper.c
@@ -23,7 +23,6 @@ @@ -23,7 +23,6 @@
23 #include <string.h> 23 #include <string.h>
24 #include <inttypes.h> 24 #include <inttypes.h>
25 #include <signal.h> 25 #include <signal.h>
26 -#include <assert.h>  
27 26
28 #include "cpu.h" 27 #include "cpu.h"
29 #include "exec-all.h" 28 #include "exec-all.h"
target-i386/translate.c
@@ -23,7 +23,6 @@ @@ -23,7 +23,6 @@
23 #include <string.h> 23 #include <string.h>
24 #include <inttypes.h> 24 #include <inttypes.h>
25 #include <signal.h> 25 #include <signal.h>
26 -#include <assert.h>  
27 26
28 #include "cpu.h" 27 #include "cpu.h"
29 #include "exec-all.h" 28 #include "exec-all.h"
target-m68k/translate.c
@@ -23,7 +23,6 @@ @@ -23,7 +23,6 @@
23 #include <stdio.h> 23 #include <stdio.h>
24 #include <string.h> 24 #include <string.h>
25 #include <inttypes.h> 25 #include <inttypes.h>
26 -#include <assert.h>  
27 26
28 #include "config.h" 27 #include "config.h"
29 #include "cpu.h" 28 #include "cpu.h"
target-mips/helper.c
@@ -23,7 +23,6 @@ @@ -23,7 +23,6 @@
23 #include <string.h> 23 #include <string.h>
24 #include <inttypes.h> 24 #include <inttypes.h>
25 #include <signal.h> 25 #include <signal.h>
26 -#include <assert.h>  
27 26
28 #include "cpu.h" 27 #include "cpu.h"
29 #include "exec-all.h" 28 #include "exec-all.h"
target-ppc/helper.c
@@ -23,7 +23,6 @@ @@ -23,7 +23,6 @@
23 #include <string.h> 23 #include <string.h>
24 #include <inttypes.h> 24 #include <inttypes.h>
25 #include <signal.h> 25 #include <signal.h>
26 -#include <assert.h>  
27 26
28 #include "cpu.h" 27 #include "cpu.h"
29 #include "exec-all.h" 28 #include "exec-all.h"
target-sh4/helper.c
@@ -23,7 +23,6 @@ @@ -23,7 +23,6 @@
23 #include <string.h> 23 #include <string.h>
24 #include <inttypes.h> 24 #include <inttypes.h>
25 #include <signal.h> 25 #include <signal.h>
26 -#include <assert.h>  
27 26
28 #include "cpu.h" 27 #include "cpu.h"
29 #include "exec-all.h" 28 #include "exec-all.h"
target-sh4/translate.c
@@ -22,7 +22,6 @@ @@ -22,7 +22,6 @@
22 #include <stdio.h> 22 #include <stdio.h>
23 #include <string.h> 23 #include <string.h>
24 #include <inttypes.h> 24 #include <inttypes.h>
25 -#include <assert.h>  
26 25
27 #define DEBUG_DISAS 26 #define DEBUG_DISAS
28 #define SH4_DEBUG_DISAS 27 #define SH4_DEBUG_DISAS
target-sparc/helper.c
@@ -23,7 +23,6 @@ @@ -23,7 +23,6 @@
23 #include <string.h> 23 #include <string.h>
24 #include <inttypes.h> 24 #include <inttypes.h>
25 #include <signal.h> 25 #include <signal.h>
26 -#include <assert.h>  
27 26
28 #include "cpu.h" 27 #include "cpu.h"
29 #include "exec-all.h" 28 #include "exec-all.h"
tcg/tcg.c
@@ -32,7 +32,6 @@ @@ -32,7 +32,6 @@
32 #define NDEBUG 32 #define NDEBUG
33 #endif 33 #endif
34 34
35 -#include <assert.h>  
36 #include <stdarg.h> 35 #include <stdarg.h>
37 #include <stdlib.h> 36 #include <stdlib.h>
38 #include <stdio.h> 37 #include <stdio.h>