Skip to contentSkip to conversation

Cocoa: Avoid missing prototype warnings for qemu_main

PATCH In review Andreas Färber 2 participants 4 messages Sep 11, 2010 – Sep 19, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Cocoa: Avoid missing prototype warnings for qemu_main

In vl.c main is redefined to qemu_main but no prototype is available. Move it into qemu-common.h since it is needed in ui/cocoa.m, too. Adjust the call sites to the signature used in vl.c.

---
 qemu-common.h |    4 ++++
 ui/cocoa.m    |    5 ++---
 2 files changed, 6 insertions(+), 3 deletions(-)
qemu-common.h +4 -0
index dfd3dc0..f8ce3ce 100644
@@ -13,6 +13,10 @@
 
 #define QEMU_BUILD_BUG_ON(x) typedef char __build_bug_on__##__LINE__[(x)?-1:1];
 
+#ifdef CONFIG_COCOA
+int qemu_main(int argc, char** argv, char** envp);
+#endif
+
 typedef struct QEMUTimer QEMUTimer;
 typedef struct QEMUFile QEMUFile;
 typedef struct QEMUBH QEMUBH;
ui/cocoa.m +2 -3
index 56c789a..d7deb0e 100644
@@ -61,7 +61,6 @@ typedef struct {
     int bitsPerPixel;
 } QEMUScreen;
 
-int qemu_main(int argc, char **argv); // main defined in qemu/vl.c
 NSWindow *normalWindow;
 id cocoaView;
 static DisplayChangeListener *dcl;
@@ -794,7 +793,7 @@ static int cocoa_keycode_to_qemu(int keycode)
     COCOA_DEBUG("QemuCocoaAppController: startEmulationWithArgc\n");
 
     int status;
-    status = qemu_main(argc, argv);
+    status = qemu_main(argc, argv, NULL);
     exit(status);
 }
 
@@ -868,7 +867,7 @@ int main (int argc, const char * argv[]) {
         if (!strcmp(argv[i], "-vnc") ||
             !strcmp(argv[i], "-nographic") ||
             !strcmp(argv[i], "-curses")) {
-                return qemu_main(gArgc, gArgv);
+                return qemu_main(gArgc, gArgv, NULL);
         }
     }
 
Signature · 1 line
1.7.0.4
#1 lore raw

Am 11.09.2010 11:55, schrieb Andreas Färber:

Quoted 15 lines

In vl.c main is redefined to qemu_main but no prototype is available. Move it into qemu-common.h since it is needed in ui/cocoa.m, too. Adjust the call sites to the signature used in vl.c.

---
  qemu-common.h |    4 ++++
  ui/cocoa.m    |    5 ++---
  2 files changed, 6 insertions(+), 3 deletions(-)
qemu-common.h +0 -0
index dfd3dc0..f8ce3ce 100644

qemu-common.h line 20

Quoted 8 lines
qemu-common.h +4 -0
@@ -13,6 +13,10 @@
 
  #define QEMU_BUILD_BUG_ON(x) typedef char __build_bug_on__##__LINE__[(x)?-1:1];
 
+#ifdef CONFIG_COCOA
+int qemu_main(int argc, char** argv, char** envp);
+#endif
+
 

Is this conditional compilation needed here, or
could qemu_main be declared unconditionally?

Quoted 34 lines
qemu-common.h +0 -0
  typedef struct QEMUTimer QEMUTimer;
  typedef struct QEMUFile QEMUFile;

typedef struct QEMUBH QEMUBH;

ui/cocoa.m +2 -3
index 56c789a..d7deb0e 100644
@@ -61,7 +61,6 @@ typedef struct {
      int bitsPerPixel;
  } QEMUScreen;
 
-int qemu_main(int argc, char **argv); // main defined in qemu/vl.c
  NSWindow *normalWindow;
  id cocoaView;
  static DisplayChangeListener *dcl;
@@ -794,7 +793,7 @@ static int cocoa_keycode_to_qemu(int keycode)
      COCOA_DEBUG("QemuCocoaAppController: startEmulationWithArgc\n");
 
      int status;
-    status = qemu_main(argc, argv);
+    status = qemu_main(argc, argv, NULL);
      exit(status);
  }
 
@@ -868,7 +867,7 @@ int main (int argc, const char * argv[]) {
          if (!strcmp(argv[i], "-vnc") ||
              !strcmp(argv[i], "-nographic") ||
              !strcmp(argv[i], "-curses")) {
-                return qemu_main(gArgc, gArgv);
+                return qemu_main(gArgc, gArgv, NULL);
          }
      }
 
#2 lore raw

Am 11.09.2010 um 15:26 schrieb Stefan Weil:

Quoted 16 lines

Am 11.09.2010 11:55, schrieb Andreas Färber:

Quoted 15 lines

In vl.c main is redefined to qemu_main but no prototype is available. Move it into qemu-common.h since it is needed in ui/cocoa.m, too. Adjust the call sites to the signature used in vl.c.

qemu-common.h +0 -0
index dfd3dc0..f8ce3ce 100644
@@ -13,6 +13,10 @@
 
 #define QEMU_BUILD_BUG_ON(x) typedef char  
 __build_bug_on__##__LINE__[(x)?-1:1];
 
Quoted 8 lines

qemu-common.h

Quoted 5 lines
qemu-common.h +4 -0
+#ifdef CONFIG_COCOA
+int qemu_main(int argc, char** argv, char** envp);
+#endif
+
 

Is this conditional compilation needed here, or
could qemu_main be declared unconditionally?

There's another (identical) declaration for SDL, but SDL on Solaris does not take that code path, so I couldn't test.

The tricky thing is that when CONFIG_SDL and (main or __APPLE__) is defined, a new main() function is provided that already uses qemu_main(), likely before qemu-common.h is included.

Anyway, generalizing it should be done in a follow-on patch imo, so that the SDL part can be reverted independently.

Andreas

#3 lore raw
In reply to Andreas Färber

Am 11.09.2010 um 11:55 schrieb Andreas Färber:

Quoted 5 lines

In vl.c main is redefined to qemu_main but no prototype is available. Move it into qemu-common.h since it is needed in ui/cocoa.m, too. Adjust the call sites to the signature used in vl.c.

Ping? Should I issue a pull request for this?
Or might console.h be a better place for the prototype to live than qemu-common.h?
Or does SDL need to be refactored at the same time? In that case I would need suggestions and (Win32?) testers.

Regards,
Andreas

Quoted 54 lines

---

qemu-common.h |    4 ++++
ui/cocoa.m    |    5 ++---
2 files changed, 6 insertions(+), 3 deletions(-)
qemu-common.h +4 -0
index dfd3dc0..f8ce3ce 100644
@@ -13,6 +13,10 @@
 
 #define QEMU_BUILD_BUG_ON(x) typedef char __build_bug_on__##__LINE__[(x)?-1:1];
 
+#ifdef CONFIG_COCOA
+int qemu_main(int argc, char** argv, char** envp);
+#endif
+
 typedef struct QEMUTimer QEMUTimer;
 typedef struct QEMUFile QEMUFile;
 typedef struct QEMUBH QEMUBH;
ui/cocoa.m +2 -3
index 56c789a..d7deb0e 100644
@@ -61,7 +61,6 @@ typedef struct {
    int bitsPerPixel;
 } QEMUScreen;
 
-int qemu_main(int argc, char **argv); // main defined in qemu/vl.c
 NSWindow *normalWindow;
 id cocoaView;
 static DisplayChangeListener *dcl;
@@ -794,7 +793,7 @@ static int cocoa_keycode_to_qemu(int keycode)
    COCOA_DEBUG("QemuCocoaAppController: startEmulationWithArgc\n");
 
    int status;
-    status = qemu_main(argc, argv);
+    status = qemu_main(argc, argv, NULL);
    exit(status);
 }
 
@@ -868,7 +867,7 @@ int main (int argc, const char * argv[]) {
        if (!strcmp(argv[i], "-vnc") ||
            !strcmp(argv[i], "-nographic") ||
            !strcmp(argv[i], "-curses")) {
-                return qemu_main(gArgc, gArgv);
+                return qemu_main(gArgc, gArgv, NULL);
        }
    }
 
Signature · 1 line
1.7.0.4