[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/10] cocoa: Provide central qemu_main() prototype
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH 07/10] cocoa: Provide central qemu_main() prototype |
Date: |
Tue, 14 Jun 2011 03:22:04 +0200 |
This fixes a missing prototype warning in vl.c and obsoletes
the prototype in cocoa.m. Adjust callers in cocoa.m to supply
third argument, which is currently only used on Linux/ppc.
The prototype is designed so that it could be shared with SDL
and other frontends, if desired.
Cc: Alexandre Raymond <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
qemu-common.h | 5 +++++
ui/cocoa.m | 6 +++---
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/qemu-common.h b/qemu-common.h
index 39fabc9..109498d 100644
--- a/qemu-common.h
+++ b/qemu-common.h
@@ -132,6 +132,11 @@ static inline char *realpath(const char *path, char
*resolved_path)
#endif /* !defined(NEED_CPU_H) */
+/* main function, renamed */
+#if defined(CONFIG_COCOA)
+int qemu_main(int argc, char **argv, char **envp);
+#endif
+
/* bottom halves */
typedef void QEMUBHFunc(void *opaque);
diff --git a/ui/cocoa.m b/ui/cocoa.m
index e1312d3..1c54759 100644
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -23,6 +23,7 @@
*/
#import <Cocoa/Cocoa.h>
+#include <crt_externs.h>
#include "qemu-common.h"
#include "console.h"
@@ -61,7 +62,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 +794,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, *_NSGetEnviron());
exit(status);
}
@@ -877,7 +877,7 @@ int main (int argc, const char * argv[]) {
!strcmp(opt, "-nographic") ||
!strcmp(opt, "-version") ||
!strcmp(opt, "-curses")) {
- return qemu_main(gArgc, gArgv);
+ return qemu_main(gArgc, gArgv, *_NSGetEnviron());
}
}
}
--
1.7.5.3
- [Qemu-devel] [PULL 00/10] Fixes for Cocoa backend, Andreas Färber, 2011/06/13
- [Qemu-devel] [PATCH 01/10] cocoa: do not create a spurious window for -version, Andreas Färber, 2011/06/13
- [Qemu-devel] [PATCH 02/10] Fix compilation warning due to incorrectly specified type, Andreas Färber, 2011/06/13
- [Qemu-devel] [PATCH 03/10] Cocoa: avoid displaying window when command-line contains '-h' or '-help', Andreas Färber, 2011/06/13
- [Qemu-devel] [PATCH 04/10] Remove warning in printf due to type mismatch, Andreas Färber, 2011/06/13
- [Qemu-devel] [PATCH 05/10] configure: Fix check for fdatasync(), Andreas Färber, 2011/06/13
- [Qemu-devel] [PATCH 06/10] Fix libfdt warnings on Darwin, Andreas Färber, 2011/06/13
- [Qemu-devel] [PATCH 07/10] cocoa: Provide central qemu_main() prototype,
Andreas Färber <=
- [Qemu-devel] [PATCH 08/10] cocoa: Revert dependency on VNC, Andreas Färber, 2011/06/13
- [Qemu-devel] [PATCH 09/10] cocoa: Avoid warning related to multiple handleEvent: definitions, Andreas Färber, 2011/06/13
- [Qemu-devel] [PATCH 10/10] Darwin: Fix compilation warning regarding the deprecated daemon() function, Andreas Färber, 2011/06/13
- Re: [Qemu-devel] [PATCH 08/10] cocoa: Revert dependency on VNC, Jes Sorensen, 2011/06/27
Re: [Qemu-devel] [PULL 00/10] Fixes for Cocoa backend, Blue Swirl, 2011/06/15