: miscellaneous warnings

PATCH In review Andre Przywara 1 participant 1 message Jan 9, 2008

Share & tools

Andre Przywara

author

2008-01-09 14:06 UTC #0 lore raw

PATCH 5/5 : miscellaneous warnings

Some minor things:
- double definition of NDEBUG (aes.c)
- static functions only needed in debug builds
- missing header for passthrough
- missing prototype for e100 device
- using intptr_t for opaque pointers
- unneeded declarations
- fixing strange pointer acrobatics in ide.c

Signature · 9 lines

Andre Przywara
AMD-Operating System Research Center (OSRC), Dresden, Germany
Tel: +49 351 277-84917
----to satisfy European Law for business letters:
AMD Saxony Limited Liability Company & Co. KG,
Wilschdorfer Landstr. 101, 01109 Dresden, Germany
Register Court Dresden: HRA 4896, General Partner authorized
to represent: AMD Saxony LLC (Wilmington, Delaware, US)
General Manager of AMD Saxony LLC: Dr. Hans-R. Deppe, Thomas McCoy

tools/ioemu/aes.c +3 -0

diff -r 0f0d67f29ccb tools/ioemu/aes.c
@@ -30,7 +30,10 @@
 #include "vl.h"
 #include "aes.h"
 
+#ifndef NDEBUG
 #define NDEBUG
+#endif
+
 #include <assert.h>
 
 typedef uint32_t u32;

tools/ioemu/block-vvfat.c +3 -1

diff -r 0f0d67f29ccb tools/ioemu/block-vvfat.c
@@ -1734,7 +1734,7 @@ DLOG(fprintf(stderr, "read cluster %d (s
 	}
 
 	for (i = 0; i < 0x10 * s->sectors_per_cluster; i++) {
-	    int cluster_count;
+	    int cluster_count=0;
 
 DLOG(fprintf(stderr, "check direntry %d: \n", i); print_direntry(direntries + i));
 	    if (is_volume_label(direntries + i) || is_dot(direntries + i) ||

@@ -2409,10 +2409,12 @@ static int handle_commits(BDRVVVFATState
 	    fail = -2;
 	    break;
 	case ACTION_WRITEOUT: {
+#ifndef NDEBUG
 	    direntry_t* entry = array_get(&(s->directory),
 		    commit->param.writeout.dir_index);
 	    uint32_t begin = begin_of_direntry(entry);
 	    mapping_t* mapping = find_mapping_for_cluster(s, begin);
+#endif
 
 	    assert(mapping);
 	    assert(mapping->begin == begin);

tools/ioemu/hw/acpi.c +1 -1

diff -r 0f0d67f29ccb tools/ioemu/hw/acpi.c
@@ -473,7 +473,7 @@ void piix4_pm_init(PCIBus *bus, int devf
 {
     PIIX4PMState *s;
     uint8_t *pci_conf;
-    uint32_t pm_io_base, smb_io_base;
+    uint32_t smb_io_base;
 
     s = (PIIX4PMState *)pci_register_device(bus,
                                          "PM", sizeof(PIIX4PMState),

tools/ioemu/hw/ide.c +2 -2

diff -r 0f0d67f29ccb tools/ioemu/hw/ide.c
@@ -573,8 +573,8 @@ static void padstr(char *str, const char
             v = *src++;
         else
             v = ' ';
-        *(char *)((long)str ^ 1) = v;
-        str++;
+        str[i^1] = v;
+
     }
 }

tools/ioemu/hw/pc.c +4 -0

diff -r 0f0d67f29ccb tools/ioemu/hw/pc.c
@@ -23,6 +23,10 @@
  */
 #include "vl.h"
 
+#ifdef CONFIG_PASSTHROUGH
+#include "pass-through.h"
+#endif
+
 /* output Bochs bios info messages */
 //#define DEBUG_BIOS

tools/ioemu/monitor.c +1 -1

diff -r 0f0d67f29ccb tools/ioemu/monitor.c
@@ -2234,7 +2234,7 @@ static void monitor_handle_command(const
                 }
                 if (nb_args >= MAX_ARGS)
                     goto error_args;
-                args[nb_args++] = (void *)has_option;
+                args[nb_args++] = (void *)(intptr_t)has_option;
             }
             break;
 #ifdef CONFIG_DM

tools/ioemu/vl.c +77 ~~-74~~

181 lines not on this page · raw message

tools/ioemu/vl.h +4 -0

diff -r 0f0d67f29ccb tools/ioemu/vl.h
@@ -1026,6 +1026,10 @@ void pcnet_h_reset(void *opaque);
 void pcnet_h_reset(void *opaque);
 void *lance_init(NICInfo *nd, uint32_t leaddr, void *dma_opaque);
 
+/* e100.c */
+
+void pci_e100_init(PCIBus *bus, NICInfo *nd);
+
 
 /* pckbd.c */

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel