Re: [Qemu-devel] [patch]Make GTK build on OS X
On Mar 27, 2013, at 2:34 AM, Paolo Bonzini pbonz...@redhat.com wrote: Il 26/03/2013 23:16, C.W. Betts ha scritto: This patch makes the GTK UI build on OS X by including the right headers. From b5cc84343f479d4870961c82fc7b384637e9616c Mon Sep 17 00:00:00 2001 From: C.W. Betts computer...@hotmail.com Date: Sun, 24 Mar 2013 11:24:05 -0600 Subject: [PATCH 1/3] Make the GTK UI build on OS X. --- ui/gtk.c | 5 + 1 file changed, 5 insertions(+) diff --git a/ui/gtk.c b/ui/gtk.c index 305940d..e2948d7 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -54,7 +54,12 @@ #include sys/socket.h #include sys/un.h #include sys/wait.h +#ifdef __APPLE__ +#include termios.h +#include util.h +#else #include pty.h +#endif #include math.h #include ui/console.h termios.h can be included unconditionally. For util.h and pty.h, there is already similar code in qemu-char.c: the pty.h include was already there #if defined(__GLIBC__) #include pty.h #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) #include libutil.h #else #include util.h #endif Please move it to include/qemu-common.h instead so that there is no duplication. The next patch will do this. Thank you for the feedback. Paolo
[Qemu-devel] [patch v2] Make GTK build on OS X
From 1339a76e71d7b8a8e689b8a79530d4732a316d37 Mon Sep 17 00:00:00 2001 From: C.W. Betts computer...@hotmail.com Date: Wed, 27 Mar 2013 12:02:42 -0600 Subject: [PATCH] Make the GTK UI build on OS X. Moved the terminal includes from qemu-char.c to qemu-common.h. Removed the terminal includes from gtk.c. --- include/qemu-common.h | 8 qemu-char.c | 9 - ui/gtk.c | 1 - 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/include/qemu-common.h b/include/qemu-common.h index 31fff22..08d4b46 100644 --- a/include/qemu-common.h +++ b/include/qemu-common.h @@ -40,6 +40,14 @@ #include sys/time.h #include assert.h #include signal.h + +#if defined(__GLIBC__) +#include pty.h +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) +#include libutil.h +#else +#include util.h +#endif #include glib-compat.h #ifdef _WIN32 diff --git a/qemu-char.c b/qemu-char.c index dee623e..f142b81 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -51,15 +51,6 @@ #include dirent.h #include netdb.h #include sys/select.h -#ifdef CONFIG_BSD -#include sys/stat.h -#if defined(__GLIBC__) -#include pty.h -#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) -#include libutil.h -#else -#include util.h -#endif #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) #include dev/ppbus/ppi.h #include dev/ppbus/ppbconf.h diff --git a/ui/gtk.c b/ui/gtk.c index a5a8156..b45706b 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -54,7 +54,6 @@ #include sys/socket.h #include sys/un.h #include sys/wait.h -#include pty.h #include math.h #include ui/console.h -- 1.8.2
[Qemu-devel] [patch v2.5] Make GTK UI build on OS X
This patch is identical to the previous, but this one is signed off. From f9009d44e4c4c5325d960a61eadcff0d9c352ee1 Mon Sep 17 00:00:00 2001 From: C.W. Betts computer...@hotmail.com Date: Wed, 27 Mar 2013 12:11:54 -0600 Subject: [PATCH] Make the GTK UI build on OS X. Moved the terminal includes from qemu-char.c to qemu-common.h. Removed the terminal includes from gtk.c. Signed-off-by: C.W. Betts computer...@hotmail.com --- include/qemu-common.h | 8 qemu-char.c | 9 - ui/gtk.c | 1 - 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/include/qemu-common.h b/include/qemu-common.h index 31fff22..08d4b46 100644 --- a/include/qemu-common.h +++ b/include/qemu-common.h @@ -40,6 +40,14 @@ #include sys/time.h #include assert.h #include signal.h + +#if defined(__GLIBC__) +#include pty.h +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) +#include libutil.h +#else +#include util.h +#endif #include glib-compat.h #ifdef _WIN32 diff --git a/qemu-char.c b/qemu-char.c index dee623e..f142b81 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -51,15 +51,6 @@ #include dirent.h #include netdb.h #include sys/select.h -#ifdef CONFIG_BSD -#include sys/stat.h -#if defined(__GLIBC__) -#include pty.h -#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) -#include libutil.h -#else -#include util.h -#endif #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) #include dev/ppbus/ppi.h #include dev/ppbus/ppbconf.h diff --git a/ui/gtk.c b/ui/gtk.c index a5a8156..b45706b 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -54,7 +54,6 @@ #include sys/socket.h #include sys/un.h #include sys/wait.h -#include pty.h #include math.h #include ui/console.h -- 1.8.2
[Qemu-devel] [patch v3] Make GTK UI build on OS X
From 51326a5db7e774cfe405b8cbcac7fc748857faac Mon Sep 17 00:00:00 2001 From: C.W. Betts computer...@hotmail.com Date: Wed, 27 Mar 2013 13:19:07 -0600 Subject: [PATCH] Make the GTK UI build on OS X. Moved the terminal includes from qemu-char.c to qemu-common.h. Removed the terminal includes from gtk.c. Signed-off-by: C.W. Betts computer...@hotmail.com --- include/qemu-common.h | 8 qemu-char.c | 12 ui/gtk.c | 1 - 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/include/qemu-common.h b/include/qemu-common.h index 31fff22..08d4b46 100644 --- a/include/qemu-common.h +++ b/include/qemu-common.h @@ -40,6 +40,14 @@ #include sys/time.h #include assert.h #include signal.h + +#if defined(__GLIBC__) +#include pty.h +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) +#include libutil.h +#else +#include util.h +#endif #include glib-compat.h #ifdef _WIN32 diff --git a/qemu-char.c b/qemu-char.c index dee623e..a4e203e 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -51,15 +51,6 @@ #include dirent.h #include netdb.h #include sys/select.h -#ifdef CONFIG_BSD -#include sys/stat.h -#if defined(__GLIBC__) -#include pty.h -#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) -#include libutil.h -#else -#include util.h -#endif #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) #include dev/ppbus/ppi.h #include dev/ppbus/ppbconf.h @@ -69,8 +60,6 @@ #endif #else #ifdef __linux__ -#include pty.h - #include linux/ppdev.h #include linux/parport.h #endif @@ -90,7 +79,6 @@ #include stropts.h #endif #endif -#endif #include qemu/sockets.h #include ui/qemu-spice.h diff --git a/ui/gtk.c b/ui/gtk.c index a5a8156..b45706b 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -54,7 +54,6 @@ #include sys/socket.h #include sys/un.h #include sys/wait.h -#include pty.h #include math.h #include ui/console.h -- 1.8.2
[Qemu-devel] [patch]Make GTK build on OS X
This patch makes the GTK UI build on OS X by including the right headers. From b5cc84343f479d4870961c82fc7b384637e9616c Mon Sep 17 00:00:00 2001 From: C.W. Betts computer...@hotmail.com Date: Sun, 24 Mar 2013 11:24:05 -0600 Subject: [PATCH 1/3] Make the GTK UI build on OS X. --- ui/gtk.c | 5 + 1 file changed, 5 insertions(+) diff --git a/ui/gtk.c b/ui/gtk.c index 305940d..e2948d7 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -54,7 +54,12 @@ #include sys/socket.h #include sys/un.h #include sys/wait.h +#ifdef __APPLE__ +#include termios.h +#include util.h +#else #include pty.h +#endif #include math.h #include ui/console.h -- 1.8.2
[Qemu-devel] Minor fixes to OS X.
This patch contains minor fixes for the Cocoa UI.
From c36f0f8e4602fe014a3a383d6bb181401e72e8fe Mon Sep 17 00:00:00 2001
From: C.W. Betts computer...@hotmail.com
Date: Sun, 24 Mar 2013 11:52:14 -0600
Subject: [PATCH 2/3] Minor Cocoa UI improvements. Use fileSystemRepresentation
to get a file name from an NSString. Define NSInteger on pre-Leopard systems,
and use it on -openPanelDidEnd:returnCode:contextInfo: so that it's
consistant with the signature requested in 64-bit code.
---
ui/cocoa.m | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/ui/cocoa.m b/ui/cocoa.m
index 048cc97..edd62be 100644
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -68,6 +68,10 @@ static DisplayChangeListener *dcl;
int gArgc;
char **gArgv;
+#if (MAC_OS_X_VERSION_MAX_ALLOWED = MAC_OS_X_VERSION_10_4)
+typedef int NSInteger;
+#endif
+
// keymap conversion
int keymap[] =
{
@@ -350,11 +354,7 @@ QemuCocoaView *cocoaView;
} else {
// selective drawing code (draws only dirty rectangles) (OS X =
10.4)
const NSRect *rectList;
-#if (MAC_OS_X_VERSION_MAX_ALLOWED = MAC_OS_X_VERSION_10_5)
NSInteger rectCount;
-#else
-int rectCount;
-#endif
int i;
CGImageRef clipImageRef;
CGRect clipRect;
@@ -712,7 +712,7 @@ QemuCocoaView *cocoaView;
{
}
- (void)startEmulationWithArgc:(int)argc argv:(char**)argv;
-- (void)openPanelDidEnd:(NSOpenPanel *)sheet returnCode:(int)returnCode
contextInfo:(void *)contextInfo;
+- (void)openPanelDidEnd:(NSOpenPanel *)sheet returnCode:(NSInteger)returnCode
contextInfo:(void *)contextInfo;
- (void)toggleFullScreen:(id)sender;
- (void)showQEMUDoc:(id)sender;
- (void)showQEMUTec:(id)sender;
@@ -802,7 +802,7 @@ QemuCocoaView *cocoaView;
exit(status);
}
-- (void)openPanelDidEnd:(NSOpenPanel *)sheet returnCode:(int)returnCode
contextInfo:(void *)contextInfo
+- (void)openPanelDidEnd:(NSOpenPanel *)sheet returnCode:(NSInteger)returnCode
contextInfo:(void *)contextInfo
{
COCOA_DEBUG(QemuCocoaAppController: openPanelDidEnd\n);
@@ -810,7 +810,7 @@ QemuCocoaView *cocoaView;
exit(0);
} else if(returnCode == NSOKButton) {
const char *bin = qemu;
-char *img = (char*)[ [ sheet filename ]
cStringUsingEncoding:NSASCIIStringEncoding];
+char *img = (char*)[ [ sheet filename ] fileSystemRepresentation];
char **argv = (char**)malloc( sizeof(char*)*3 );
--
1.8.2
[Qemu-devel] [Bug 1054812] [NEW] Configure uses wrong libtool on Darwin
Public bug reported: On Darwin/OS X, there are two versions of libtool: the GNU libtool, and Apple's libtool. Both are installed, but Apple's libtool (libtool) won't build libcacard that Qemu uses, but Gnu's libtool (glibtool) does. I get around using Apple's libtool by passing LIBTOOL=glibtool when configuring; unfortunately this variable isn't preserved so when Qemu's configure changes it's not passed. A simple switch in the configure script could check for Darwin, then if present, use glibtool. Or configure could check the features of libtool, see if they can build libcacard, then look for alternatives like glibtool. This bug was probably introduced when libcacard was added to Qemu, and is present in commit 93b6599734f81328ee3d608f57667742cafeea72. ** Affects: qemu Importance: Undecided Status: New -- You received this bug notification because you are a member of qemu- devel-ml, which is subscribed to QEMU. https://bugs.launchpad.net/bugs/1054812 Title: Configure uses wrong libtool on Darwin Status in QEMU: New Bug description: On Darwin/OS X, there are two versions of libtool: the GNU libtool, and Apple's libtool. Both are installed, but Apple's libtool (libtool) won't build libcacard that Qemu uses, but Gnu's libtool (glibtool) does. I get around using Apple's libtool by passing LIBTOOL=glibtool when configuring; unfortunately this variable isn't preserved so when Qemu's configure changes it's not passed. A simple switch in the configure script could check for Darwin, then if present, use glibtool. Or configure could check the features of libtool, see if they can build libcacard, then look for alternatives like glibtool. This bug was probably introduced when libcacard was added to Qemu, and is present in commit 93b6599734f81328ee3d608f57667742cafeea72. To manage notifications about this bug go to: https://bugs.launchpad.net/qemu/+bug/1054812/+subscriptions
[Qemu-devel] Milky Mist fbconfig misconfigured
I noticed when looking through Qemu's source code to find out about OpenGL in it, I noticed that the array glx_fbconfig_attr had two GLX_GREEN_SIZE methods defined. Is this on purpose, or a bug?
[Qemu-devel] Sheepdog doesn't build on OS X
When building the current master branch, I get an error when building the Sheepdog block driver: /Users/cwbetts/makestuff/qemu/block/sheepdog.c: In function ‘set_cork’: /Users/cwbetts/makestuff/qemu/block/sheepdog.c:903: error: ‘SOL_TCP’ undeclared (first use in this function) /Users/cwbetts/makestuff/qemu/block/sheepdog.c:903: error: (Each undeclared identifier is reported only once /Users/cwbetts/makestuff/qemu/block/sheepdog.c:903: error: for each function it appears in.) /Users/cwbetts/makestuff/qemu/block/sheepdog.c:903: error: ‘TCP_CORK’ undeclared (first use in this function) make: *** [block/sheepdog.o] Error 1 Any suggestions to fix them?
[Qemu-devel] Make configure find uuid functions in Mac OS X by looking into libSystem.B
Make configure find uuid functions in Mac OS X by looking into libSystem.B Mac OS X consolidates many smaller libraries into libSystem.B.dylib. libuuid is one of these. This patch makes it so that configure doesn't look for a non-existant libuuid.dylib, but look in libSystem for the uuid functions. Signed off by C.W. Betts computer...@hotmail.com --- configure |6 +- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/configure b/configure index 966cd7d..ecc3317 100755 --- a/configure +++ b/configure @@ -1198,7 +1198,11 @@ fi ## # uuid_generate() probe, used for vdi block driver if test $uuid != no ; then - uuid_libs=-luuid + if test $darwin == yes; then +uuid_libs= + else +uuid_libs=-luuid + fi cat $TMPC EOF #include uuid/uuid.h int main(void) -- 1.6.5.5
[Qemu-devel] [PATCH] My patches
These are my following patches to contribute to Qemu. Included in the patch: * ignore missing libuuid on Darwin: libSystem has the needed functions in it. * quiet warning about no prototype for qemu_main when building Cocoa. * fixes handleEvent: warning in Cocoa.m * use other than in qemu-thread.h for system includes. gitdiff.diff Description: Binary data
[Qemu-devel] qemu-thread doesn't compile on OS X
When I tried to compile qemu git with --enable-io-thread on Mac OS X 10.6.2, it botches on qemu-thread: CCqemu-thread.o /Users/cwbetts/makestuff/qemu/qemu-thread.c: In function ‘qemu_mutex_timedlock’: /Users/cwbetts/makestuff/qemu/qemu-thread.c:66: warning: implicit declaration of function ‘clock_gettime’ /Users/cwbetts/makestuff/qemu/qemu-thread.c:66: error: ‘CLOCK_REALTIME’ undeclared (first use in this function) /Users/cwbetts/makestuff/qemu/qemu-thread.c:66: error: (Each undeclared identifier is reported only once /Users/cwbetts/makestuff/qemu/qemu-thread.c:66: error: for each function it appears in.) /Users/cwbetts/makestuff/qemu/qemu-thread.c:69: warning: implicit declaration of function ‘pthread_mutex_timedlock’ /Users/cwbetts/makestuff/qemu/qemu-thread.c: In function ‘qemu_cond_timedwait’: /Users/cwbetts/makestuff/qemu/qemu-thread.c:125: error: ‘CLOCK_REALTIME’ undeclared (first use in this function) make[1]: *** [qemu-thread.o] Error 1 make: *** [build-all] Error 2 Just a heads up.
Re: [Qemu-devel] don't look for libuuid on Darwin
On Nov 9, 2009, at 12:22 PM, Christoph Hellwig wrote: On Mon, Nov 09, 2009 at 11:46:13AM -0700, C.W. Betts wrote: Does this work? diff --git a/configure b/configure index aa2cc43..00e04e9 100755 --- a/configure +++ b/configure @@ -1060,7 +1060,11 @@ fi ## # uuid_generate() probe, used for vdi block driver if test $uuid != no ; then - uuid_libs=-luuid + if test $darwin == yes; then +uuid_libs= + else +uuid_libs=-luuid + fi It might work, but does Darwin really provide no libuuid at all? I thought it was just the static one that is missing? The uuid definitions are in the libSystem library, which everything links against. LibSystem also includes libc, libm, pthreads, etc. If it really is the case a comment above the test would help. Also I think you should try to keep the mailinglist on Cc - it includes people that can provide valueable feedback, and also people that unlike me can actually apply the patch to the qemu repository. heh, sorry. I replied to the wrong message.
[Qemu-devel] don't look for libuuid on Darwin
In Darwin, the libSystem.B.dylib is a container for a lot of libraries, among them is libuuid. However, there isn't, by default, a static link libuuid to libSystem. The configure script should just check to see if there's a uuid header and don't look for a libuuid.
Re: [Qemu-devel] Patches?
On Monday 17 March 2008 07:19:18 am Gary Thomas wrote: I've fixed a number of problems with the user mode code. Where's the best place to send/propose/discuss these? What's the preferred format? The best place to send patches is this mailing list. I think they have to be a unified diff, i.e. diff -u. signature.asc Description: This is a digitally signed message part.
Re: [Qemu-devel] build failure on x86, any suggestions?
On Saturday 15 March 2008 09:13:02 am Peter Volkov wrote: В Сбт, 15/03/2008 в 14:20 +, Paul Brook пишет: On Saturday 15 March 2008, Peter Volkov wrote: Hello. I just wanted to point developers attention to the following bug: bugs.gentoo.org/212351 , comment #11 and further. The problem is that qemu does not compile any more on x86. I've tried recent snapshot (2008-03-15_05) and the problem persist there. You're almost certainly using gcc4.x. Don't do that. Paul, thank you for you answer. I do have gcc-4 installed on my system but I'm sure that I'm using gcc-3.4: gcc --version Try setting the compiler flags to use -march=pentium-mmx . That is the max setting for -march that qemu compiles on. also, make sure that the compiler isn't sending any of the -msse functions. I tried to build qemu using -msse -march=pentium3 and it spat out the same thing. gcc (GCC) 3.4.6 (Gentoo 3.4.6-r2 p1.5, ssp-3.4.6-1.0, pie-8.7.10) As I read FAQ this version should be supported. I've tried to build gcc without patches (ssp, pie, C++ support and some gentoo specific patches) but qemu build process still fails at the same place... IIRC gentoo already has a big pile hacks for this. This kind of breakage is exactly why those hacks haven't been merged into cvs. They're papering over the problem rather than fixing it, so you should expect them to need constant maintenance. Sorry, but what hacks are you talking about? The only hack I'm aware about is that all system is build with newer compiler while to build qemu I have to install old gcc. As mentioned several times on this recently on this list, the proper fix is to finish the TCG conversion. That will happen when it's done. Eh, I saw you talking about this and I'm aware that this will definitely take time. That's why I asked for suggestion... signature.asc Description: This is a digitally signed message part.
[Qemu-devel] helper.c chokes up when using -march
When I try to compile qemu on MinGW gcc 3.4.5 using -march=i686 or higher, or
use -msse, the helper.c file on the i386 (but not the x86_64 target, for some
odd reason) spits out
C:/msys/1.0/home/Owner/SoureCode/qemu/target-i386/helper.c: In function
`svm_check_intercept_param':
C:/msys/1.0/home/Owner/SoureCode/qemu/target-i386/helper.c:4375: error: unable
to find a register to spill in class `GENERAL_REGS'
C:/msys/1.0/home/Owner/SoureCode/qemu/target-i386/helper.c:4375: error: this is
the insn:
(insn:HI 353 352 354 39
C:/msys/1.0/home/Owner/SoureCode/qemu/target-i386/helper.c:4368 (parallel [
(set (reg:DI 167 [ variable.intercept ])
(lshiftrt:DI (reg:DI 167 [ variable.intercept ])
(subreg:QI (reg:SI 166) 0)))
(clobber (scratch:SI))
(clobber (reg:CC 17 flags))
]) 309 {lshrdi3_1} (insn_list 351 (insn_list 352 (nil)))
(expr_list:REG_DEAD (reg:SI 166)
(expr_list:REG_UNUSED (reg:CC 17 flags)
(expr_list:REG_UNUSED (scratch:SI)
(nil)
A similar error happens on ppc with op_helper, but it seems to be a problem
with a header file (it also doesn't choke up when compiling the 64-bit
target... odd):
./softmmu_template.h: In function `__stq_mmu':
./softmmu_template.h:260: error: unable to find a register to spill in class
`GENERAL_REGS'
./softmmu_template.h:260: error: this is the insn:
(insn:HI 254 249 255 13 ../softmmu_template.h:289 (parallel [
(set (reg:DI 0 ax [171])
(lshiftrt:DI (reg/v:DI 59 [ val ])
(subreg:QI (reg:SI 194) 0)))
(clobber (scratch:SI))
(clobber (reg:CC 17 flags))
]) 309 {lshrdi3_1} (nil)
(expr_list:REG_UNUSED (reg:CC 17 flags)
(expr_list:REG_UNUSED (scratch:SI)
(nil
./softmmu_template.h:260: confused by earlier errors, bailing out
make: *** [op_helper.o] Error 1
[Qemu-devel] [PATCH]version.rc patch
First of all, I'd like to thank Johannes Schindelin for all the help and
patience when dealing with a newbie like me.
This is a patch that will add version information to the Windows executable.
Index: Makefile.target
===
RCS file: /sources/qemu/qemu/Makefile.target,v
retrieving revision 1.245
diff -u -r1.245 Makefile.target
--- Makefile.target 10 Feb 2008 16:33:12 - 1.245
+++ Makefile.target 10 Feb 2008 18:08:44 -
@@ -638,6 +638,7 @@
ifdef CONFIG_WIN32
SDL_LIBS := $(filter-out -mwindows, $(SDL_LIBS)) -mconsole
+OBJS+=version.o
endif
# profiling code
@@ -654,6 +655,9 @@
%.o: %.c
$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $
+%.o: %.rc
+ windres -I. -DORIGINAL_FILENAME=\$(QEMU_PROG)\ -c -o $ $@
+
%.o: %.S
$(CC) $(CPPFLAGS) -c -o $@ $
Index: configure
===
RCS file: /sources/qemu/qemu/configure,v
retrieving revision 1.188
diff -u -r1.188 configure
--- configure 10 Feb 2008 16:33:12 - 1.188
+++ configure 10 Feb 2008 18:08:45 -
@@ -1089,6 +1089,10 @@
echo # Automatically generated by configure - do not modify $config_mak
echo /* Automatically generated by configure - do not modify */
$config_h
+if test $mingw32 = yes ; then
+echo #define QEMU_FILEVERSION $(tr . , VERSION),0 $config_h
+echo #define QEMU_PRODUCTVERSION $(tr . , VERSION),0 $config_h
+fi
echo include ../config-host.mak $config_mak
echo #include \../config-host.h\ $config_h
Index: version.rc
===
diff -u /dev/null version.rc
--- /dev/null Sun Feb 10 11:08:50 2008
+++ version.rc Fri Feb 8 15:41:46 2008
@@ -0,0 +1,22 @@
+#include config.h
+
+1 VERSIONINFO
+FILEVERSION QEMU_FILEVERSION
+PRODUCTVERSION QEMU_PRODUCTVERSION
+FILETYPE 0x1 //VFT_APP
+ {
+BLOCK StringFileInfo
+ {
+ BLOCK 040904E4
+ {
+ VALUE FileDescription, Qemu System emulator, TARGET_ARCH version
+ VALUE FileVersion, QEMU_VERSION
+ VALUE LegalCopyright, GNU General Public License
+ VALUE ProductName, Qemu
+ }
+ }
+BLOCK VarFileInfo
+ {
+ VALUE Translation, 0x0409, 1252
+ }
+}
versionrc.diff
Description: Binary data
[Qemu-devel] [PATCH] Better version.rc patch
This is a better patch to make qemu on Windows show info when you go into properties. versionrc.diff Description: Binary data
Re: [Qemu-devel] [PATCH] Better version.rc patch
Another patch. Thank you for your patience.
Index: Makefile.target
===
RCS file: /sources/qemu/qemu/Makefile.target,v
retrieving revision 1.244
diff -u -r1.244 Makefile.target
--- Makefile.target 3 Feb 2008 02:20:17 - 1.244
+++ Makefile.target 8 Feb 2008 22:48:27 -
@@ -638,6 +638,7 @@
ifdef CONFIG_WIN32
SDL_LIBS := $(filter-out -mwindows, $(SDL_LIBS)) -mconsole
+OBJS+=version.o
endif
# profiling code
@@ -654,6 +655,9 @@
%.o: %.c
$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $
+%.o: %.rc
+ windres -I. -c -o $ $@
+
%.o: %.S
$(CC) $(CPPFLAGS) -c -o $@ $
Index: configure
===
RCS file: /sources/qemu/qemu/configure,v
retrieving revision 1.187
diff -u -r1.187 configure
--- configure 3 Feb 2008 19:20:13 - 1.187
+++ configure 8 Feb 2008 22:48:30 -
@@ -1065,6 +1065,10 @@
echo # Automatically generated by configure - do not modify $config_mak
echo /* Automatically generated by configure - do not modify */
$config_h
+if test $mingw32 = yes ; then
+echo #define QEMU_FILEVERSION 0,9,1,0 $config_h
+echo #define QEMU_PRODUCTVERSION 0,9,1,0 $config_h
+fi
echo include ../config-host.mak $config_mak
echo #include \../config-host.h\ $config_h
0a1,22
#include config.h
1 VERSIONINFO
FILEVERSION QEMU_FILEVERSION
PRODUCTVERSION QEMU_PRODUCTVERSION
FILETYPE 0x1 //VFT_APP
{
BLOCK StringFileInfo
{
BLOCK 040904E4
{
VALUE FileDescription, Qemu System emulator, TARGET_ARCH
version
VALUE FileVersion, QEMU_VERSION
VALUE LegalCopyright, GNU General Public License
VALUE ProductName, Qemu
}
}
BLOCK VarFileInfo
{
VALUE Translation, 0x0409, 1252
}
}
- Original Message -
From: Johannes Schindelin [EMAIL PROTECTED]
To: C.W. Betts [EMAIL PROTECTED]
Cc: qemu-devel@nongnu.org
Sent: Friday, February 08, 2008 1:49 PM
Subject: Re: [Qemu-devel] [PATCH] Better version.rc patch
Hi,
On Fri, 8 Feb 2008, C.W. Betts wrote:
It is _still_ a hassle to review your patch, since you did not inline it
again.
Sorry. I'm new.
Also, it seems as you have yet another line which is commented out, with a
comment currently not working. I'd appreciate it if it was left out, or
fixed.
As I said, I'm new.
Hth,
Dscho
versionrc.diff
Description: Binary data
[Qemu-devel] [PATCH] Windows: put version and file info into exe
This patch will make an .rc file that will put the version info as well as a brief discription of the app for Windows. versionrc.diff Description: Binary data
Re: [Qemu-devel] qemu configure
mingw doesn't have readlink - Original Message - From: andrzej zaborowski [EMAIL PROTECTED] To: C.W. Betts [EMAIL PROTECTED] Cc: qemu-devel@nongnu.org Sent: Sunday, February 03, 2008 8:58 AM Subject: Re: [Qemu-devel] qemu configure On 03/02/2008, C.W. Betts [EMAIL PROTECTED] wrote: That's all nice and good, but it doesn't seem to work with systems that don't use symlinks, such as mingw (the ln command creates duplicates). Can you give an example scenario that would fail under a system that doesn't use symlinks? AFAICT in the simplest case of ./configure, $workdir will be equal with $source_path as it was without this patch - no matter if there are symlinks or duplicates. Regards
Re: [Qemu-devel] [qemu 0.9.1] broken build system
Don't set host-cc. It can be gcc4. The current qemu configure script will look for an alternate version of GCC if the gcc program is version 4. It should find your gcc 3.4 executable. - Original Message - From: solsTiCe d'Hiver [EMAIL PROTECTED] To: qemu-devel@nongnu.org Sent: Saturday, February 02, 2008 4:19 AM Subject: [Qemu-devel] [qemu 0.9.1] broken build system hi. i am trying to compile qemu 0.9.1 on archlinux 64 (x86_64) when i try to compile it with : ./configure --prefix=/usr --enable-alsa --host-cc=gcc-3.4 --target-list=i386-softmmu ppc-softmmu sparc-softmmu x86_64-softmmu arm-softmmu mips-softmmu avoiding all the *-user target as specified in the original PKGBUILD i use, because they do not compile on x86_64 (???) i got this error: gcc-3.4 -m64 -Wl,-T,/home/solstice/abs/qemu/src/qemu-0.9.1/x86_64.ld -g -o qemu vl.o osdep.o monitor.o pci.o loader.o isa_mmio.o block-raw-posix.o lsi53c895a.o usb-ohci.o eeprom93xx.o eepro100.o ne2000.o pcnet.o rtl8139.o ide.o pckbd.o ps2.o vga.o sb16.o es1370.o dma.o fdc.o mc146818rtc.o serial.o i8259.o i8254.o pcspk.o pc.o cirrus_vga.o apic.o parallel.o acpi.o piix_pci.o usb-uhci.o vmmouse.o vmport.o vmware_vga.o gdbstub.o ../libqemu_common.a libqemu.a -lm -lz -lasound -lgnutls -L/usr/lib -Wl,-rpath,/usr/lib -lSDL -lpthread -lrt -lpthread -lutil /usr/bin/ld: warning: libdl.so.2, needed by /usr/lib/libasound.so, not found (try using -rpath or -rpath-link) /usr/lib/libSDL.so: undefined reference to [EMAIL PROTECTED]' /usr/lib/libasound.so: undefined reference to [EMAIL PROTECTED]' /usr/lib/libSDL.so: undefined reference to [EMAIL PROTECTED]' /usr/lib/libasound.so: undefined reference to [EMAIL PROTECTED]' /usr/lib/libasound.so: undefined reference to [EMAIL PROTECTED]' /usr/lib/libasound.so: undefined reference to [EMAIL PROTECTED]' collect2: ld returned 1 exit status make[1]: *** [qemu] Error 1 make[1]: Leaving directory `/home/solstice/abs/qemu/src/qemu-0.9.1/i386-softmmu' make: *** [subdir-i386-softmmu] Error 2 a linking problem ? $ locate libdl /lib/libdl-2.7.so /lib/libdl.so.2 /usr/lib/libdl.a /usr/lib/libdl.so and /usr/lib/libdl.so is a symlink towards /lib/libdl.so.2 if i make a symlink: ln -s /usr/bin/libdl.so /usr/bin/libdl.so.2 it works ! until the next bug if i try to walk around that bug without that symlink i had to patch the config-host.mak to had a rpath toward /lib. well, i don't know how it's work. i simply used the error message and grep for rpath in src directory i can't fix the configure or whatever. HELP ! i got similar error when i try to compile *-user target but this time with libz.so.1. i do not make a symlink here... i am not gonna fix the build system by making symlink all around WAIT ! i am not finished ;-) and by the way, it fixes one problem but i got another one: i install -m 755 -s qemu-system-mips /home/solstice/abs/qemu/pkg/usr/bin make[1]: Leaving directory `/home/solstice/abs/qemu/src/qemu-0.9.1/mips-softmmu' ERROR: unknown option --host-cc Usage: ./configure [options] Options include: --arch=ARCHarchitecture to compile for (x86_64) --cross-prefix=PREFIX prefix for cross compile --prefix=PREFIXwhere to install things (/usr) --with-patched-kernel don't use external module --kerneldir=DIRkernel build directory (/lib/modules/2.6.23-ARCH/build) --qemu-cc=CC specify compiler for qemu (must be gcc-3.x) --qemu-cflags=CFLAGS CFLAGS to add to qemu configuration --qemu-ldflags=LDFLAGS LDFLAGS to add to qemu configuration Any additional option is given to qemu's configure verbatim; including: --disable-gcc-checkdon't insist on gcc-3.x CAUTION: this will break running without kvm --disable-werror disable compilation abort on warning --disable-sdl disable SDL --enable-cocoa enable COCOA (Mac OS X only) --enable-mingw32 enable Win32 cross compilation with mingw32 --enable-adlib enable Adlib emulation --enable-coreaudio enable Coreaudio audio driver --enable-alsa enable ALSA audio driver --enable-fmod enable FMOD audio driver --enable-dsoundenable DirectSound audio driver --disable-vnc-tls disable TLS encryption for VNC server Makefile:1: ../config.mak: No such file or directory make: *** No rule to make target `../config.mak'. Stop. == ERROR: Build Failed. Aborting... WTF ! --host-cc is not recognize here. but wait we're installing and a configure option get in the way... i really do not understand anything
Re: [Qemu-devel] qemu configure
That's all nice and good, but it doesn't seem to work with systems that don't use symlinks, such as mingw (the ln command creates duplicates). This may work with cygwin. - Original Message - From: Andrzej Zaborowski [EMAIL PROTECTED] To: qemu-devel@nongnu.org Sent: Saturday, February 02, 2008 9:22 PM Subject: [Qemu-devel] qemu configure CVSROOT: /sources/qemu Module name: qemu Changes by: Andrzej Zaborowski balrog 08/02/03 04:22:24 Modified files: . : configure Log message: Fix building under paths with symlinks (patch from Richard Purdie). CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/qemu/configure?cvsroot=qemur1=1.184r2=1.185
Re: [Qemu-devel] TCG
Well, it compiles fine on Windows using gcc 3.4.5. Haven't tried Linux yet. - Original Message - From: Fabrice Bellard [EMAIL PROTECTED] To: qemu-devel@nongnu.org Sent: Friday, February 01, 2008 6:13 AM Subject: [Qemu-devel] TCG Hi, I added a new code generator (TCG) in QEMU. Read the file qemu/tcg/README to have technical information. A new code generator was needed in order to avoid problems with the various GCC versions and to get better performance. I made minimal modifications in each target so that they can still work by using TCG and legacy dyngen micro operations. More work will be needed to convert each target to TCG, but it can be done progressively. Only the x86 and x86_64 targets have been significantly modified to use TCG. TCG currently only supports x86 and x86_64 hosts. The support of other hosts is broken in QEMU. I don't consider it is a priority to support other hosts although TCG is generic enough to allow it. The performance should not change much at this point. On x86_64 hosts, the x86 and x86_64 targets are faster because of some assembly language optimizations. On x86 hosts, the x86_64 target is faster because TCG can do some optimizations related to the conversion from 64 to 32 bits. No performance change should be noticed on non x86 targets because they are not converted yet. Fabrice.
[Qemu-devel] using actual PPC ROM?
is it possible to use an actual PowerPC ROM in qemu-system-ppc? If so, what would be the minimum Mac ROM that would be used (I'm guessing the blue and white G3)? If not, why isn't it?
[Qemu-devel] threads on qemu
I was thinking, maybe qemu could use threads for at least every processor it emulates (on emulated smp computers) and, at the most, every single device emulated. This would help users who have multiple cores, but it might impact performance on those of us who don't. Just an idea I'm throwing out.
Re: [Qemu-devel] threads on qemu
Still, is there a way to make qemu take advantage of multiple cores? They are pretty commonplace in new computers (is there any selling computer that doesn't have multiple cores?). - Original Message - From: Johannes Schindelin [EMAIL PROTECTED] To: C.W. Betts [EMAIL PROTECTED] Cc: qemu-devel@nongnu.org Sent: Monday, January 21, 2008 9:10 AM Subject: Re: [Qemu-devel] threads on qemu Hi, On Mon, 21 Jan 2008, C.W. Betts wrote: I was thinking, maybe qemu could use threads for at least every processor it emulates (on emulated smp computers) and, at the most, every single device emulated. This would help users who have multiple cores, but it might impact performance on those of us who don't. This is an idea that comes up every once in a while: http://lists.gnu.org/archive/html/qemu-devel/2007-07/msg00369.html Ciao, Dscho
Re: [Qemu-devel] Using multiple cores in qemu was Re: threads on qemu
I'm just trying to think of ways to improve, so don't hurt me too much. What about splitting up the CPU and other functions into their own threads? The CPU emulation is probably the biggest thing that uses the CPU, the second biggest the display(?). From reading the past e-mails, the only thing that might stop this from working is the virtual timing, right? In what way could this be fixed, and will it make qemu faster? - Original Message - From: William Pearson [EMAIL PROTECTED] To: qemu-devel@nongnu.org Sent: Monday, January 21, 2008 10:59 AM Subject: [Qemu-devel] Using multiple cores in qemu was Re: threads on qemu Still, is there a way to make qemu take advantage of multiple cores? They are pretty commonplace in new computers (is there any selling computer that doesn't have multiple cores?). It depends on what you want to do. You could always run two or more copies of qemu and set up a small networked cluster of the architecture you want to emulate. Each emulator should go on to a different core. Might be useful when compiling things in qemu or doing other processor bound tasks. Will Pearson
[Qemu-devel] kqemu working with qemu cvs?
Is there a version of kqemu that works with the cvs version of qemu? When I tried to run qemu with kqemu, it hung while booting SuSE Linux. And I'm sorry if this is the second one with this question; MDaemon seems to like to block me when I use Outlook Express. _ Connect and share in new ways with Windows Live. http://www.windowslive.com/share.html?ocid=TXT_TAGHM_Wave2_sharelife_012008
[Qemu-devel] kqemu working with qemu cvs?
Is there a version of kqemu that works with the cvs version of qemu? When I tried to run qemu with kqemu, it hung while booting SuSE Linux.
[Qemu-devel] temporary fix for Dsound
The current patches break directsound. This tiny fix makes it compile, but
it throws a lot of warnings.
Index: audio/dsound_template.h
===
RCS file: /sources/qemu/qemu/audio/dsound_template.h,v
retrieving revision 1.5
diff -u -r1.5 dsound_template.h
--- audio/dsound_template.h 14 Jan 2008 04:24:28 - 1.5
+++ audio/dsound_template.h 14 Jan 2008 05:37:12 -
@@ -197,7 +197,7 @@
#endif
if (!s-FIELD2) {
-dsound_logerr (Attempt to initialize voice without NAME2 object);
+dsound_logerr (hr,Attempt to initialize voice without NAME2
object);
return -1;
}
[Qemu-devel] recent patches break
The current patches break directsound. This tiny fix makes it compile, but it
throws a lot of warnings.
Index: audio/dsound_template.h
===
RCS file: /sources/qemu/qemu/audio/dsound_template.h,v
retrieving revision 1.5
diff -u -r1.5 dsound_template.h
--- audio/dsound_template.h 14 Jan 2008 04:24:28 - 1.5
+++ audio/dsound_template.h 14 Jan 2008 05:37:12 -
@@ -197,7 +197,7 @@
#endif
if (!s-FIELD2) {
-dsound_logerr (Attempt to initialize voice without NAME2 object);
+dsound_logerr (hr,Attempt to initialize voice without NAME2
object);
return -1;
}
Re: [Qemu-devel] Re: Windows Vista 64 bit on QEMU
Don't take my word for it, but I don't think AMD64 (or EM64T) uses efi. I'd look it up for myself, but I gotta go to bed. - Original Message - From: Anup Gangwar To: qemu-devel@nongnu.org Sent: Tuesday, January 08, 2008 3:51 AM Subject: [Qemu-devel] Re: Windows Vista 64 bit on QEMU Hello All, I did not get any response to this E-mail. Could someone please let me know in case there is any other forum to discuss such issues. The topics on QEMU user forum (relating to this issue) seem to be inactive. Thanks for the help. Regards, Anup On Jan 4, 2008 9:50 AM, Anup Gangwar [EMAIL PROTECTED] wrote: Hello All, Has anyone had success installing (and runnning) Vista 64 bit on QEMU. I tried it and landed into a variety of windows blue screen errors. The EFI BIOS also does not seem to be working with the QEMU version in CVS. Thanks for the help. Regards, Anup
[Qemu-devel] Unable to run on Windows
When I try to run qemu with a disk image, I get a segmentation fault. When I run it under GDB, this is the following error: Program received signal SIGSEGV, Segmentation fault. [Switching to thread 5516.0x15b0] 0x0048e2f3 in cpu_interrupt (env=0x0, mask=1) at /home/cwbetts/sourceCode/qemu/exec.c:1218 1218env-interrupt_request |= mask; Anyone know what might be causing this?
Re: [Qemu-devel] Windows build broken
Same problem with cygwin. I think it's a problem with BlockInterfaceType not being correctly parsed on mingw-gcc for some odd reason. - Original Message - From: Balazs Attila-Mihaly (Cd-MaN) [EMAIL PROTECTED] To: Qemu Devel qemu-devel@nongnu.org Sent: Tuesday, December 11, 2007 8:05 PM Subject: [Qemu-devel] Windows build broken Trying to build the current CVS Head with Mingw under windows, the result is the following error message: In file included from tap-win32.c:31: sysemu.h:125: error: syntax error before ';' token sysemu.h:137: error: syntax error before ',' token sysemu.h:138: error: syntax error before ')' token make: *** [tap-win32.o] Error 1 __ Sent from Yahoo! - the World's favourite mail http://uk.mail.yahoo.com
Re: [Qemu-devel] Windows build broken
Could you perhaps give a patch? I don't feel like going through and changing every instance of BlockInterfaceType to something else. - Original Message - From: Eduardo Felipe To: qemu-devel@nongnu.org Sent: Wednesday, December 12, 2007 3:41 AM Subject: Re: [Qemu-devel] Windows build broken 2007/12/12, C.W. Betts [EMAIL PROTECTED]: Same problem with cygwin. I think it's a problem with BlockInterfaceType not being correctly parsed on mingw-gcc for some odd reason. Hi, I don't think it is related with BlockInterfaceType itself. The problem is to use interface as a variable or parameter name, which seems to be confused with a reserved keyword, type or something like that. I was able to compile with mingw changing that variable name and all its references along the code. Regards.
[Qemu-devel] [patch] fixing compiling problems on Windows
The patch that's attached contains a fix that prevents qemu-img from compiling on Windows under cygwin. It also contains a patch to the old and probably unused cocoa file as well as some include fixes for monitor.c and adlib.c . diffFromHead.diff Description: Binary data
[Qemu-devel] mac99: which Mac?
I'm just wondering which Mac does the mac99 architecture in Qemu-ppc reference. I, for some reason, thought it was referencing a Mac with the Mac OS Toolbox in the ROM, but they stopped making those earlier than that, didn't they?
[Qemu-devel] unable to boot Linux PPC live CD
After failing to boot my Beige G3 from http://www.sysresccd.org/ the system rescue CD, I decided to try the PPC version on Qemu. when using both 0.9.0 and the CVS tree, the bootloader says that the bootstrap partition type is Apple_HFS but it should be Apple_Bootstrap. It also shows OF_Property_copy errors, but it scrolls by so fast that I can't read them. I get as far as the Tux Penguin on the upper left-hand size, then it freezes.
Re: [Qemu-devel] no meta key?
That doesn't fix the problem with the meta key not being in the sendkey qemu function. That is informative. - Original Message - From: Daniel Jacobowitz [EMAIL PROTECTED] To: qemu-devel@nongnu.org Sent: Friday, March 30, 2007 7:01 AM Subject: Re: [Qemu-devel] no meta key? On Thu, Mar 29, 2007 at 07:43:01PM -0600, C.W. Betts wrote: When I was trying to get the PowerPC qemu to go into open Firmware mode, The mode you're looking for doesn't exist :-) Open Hack'ware implements a bunch of PROM operations that let the OS query it, et cetera, but the Forth interpreter is completely missing. Therefore, so is the Forth console. -- Daniel Jacobowitz CodeSourcery
Re: [Qemu-devel] Clock runs at double speed in guest
What OS are you using? - Original Message - From: Thomas Tuttle [EMAIL PROTECTED] To: qemu-devel@nongnu.org Sent: Wednesday, March 28, 2007 6:54 PM Subject: [Qemu-devel] Clock runs at double speed in guest Hi. I have a 64-bit dual-core (Core 2 Duo) laptop, and I'm trying to install Gentoo AMD64 on a Qemu virtual machine. The system clock runs at double speed. If I run `date' in a tight loop, I can see it ticking off two seconds for every one second of real time. The hardware clock does not run at double speed; if I run `hwclock --hctosys', the system clock jumps back to the right time. I have tried: 1) Setting the host's RTC's max-user-freq to 1024 2) Setting the guest's RTC's max-user-freq to 1024, just for good measure 3) Running the host with the CPU frequency locked to the minimum (1 GHz) 4) Running the host with the CPU frequency locked to the maximum (2 GHz) This problem does not occur if: 1) The guest is booted with the kernel parameter nolapic 2) The guest is a 32-bit kernel 3) I manually modify hw/mc146818rtc.c to send interrupts half as often. I'd really like to get this fixed, because it's the only barrier to me being able to use Qemu (and KVM) for arch testing Gentoo. If there's any more information I can provide (if you need access to the machine, it could be arranged), please don't hesitate to ask. I am not subscribed to qemu-devel, so please CC me on replies. Thanks, Thomas Tuttle
[Qemu-devel] slirp as a static library?
I'm just wondering if anyone has thougt about making the slirp interface a static library so that each processor type doesn't have to build the same source code over and over again. This would make it so that it would build only once, saving time and processing power for the rest of the program. the disk interpreters could probably also be built as a static library.
[Qemu-devel] PowerPC: Doesn't boot OS 8.5
When I tried to boot from the Mac OS 8.5.1 CD using the -M g3bw command, the firmware says: Found Apple Partition map... Not a bootable partition 0 0 (0 5834d80) Partition: 8 'Macintosh HD' 'Apple_HFS' st 3c4 size 113000 HFS volume ERROR: Found boot partition : 5834d80 582eb80 ERROR: Not a MACH-O file ERROR: XML error: unknown Fourth script debug? if cr . elf-phys,elf-virt,elf-pages: elf-phys u. . , elf-virt u. . , elf-pages u. th cr . end of BOOT-SCRIPTen .registers thentemp resourcesloadox-images,lzss propertye thene u. then unable to load boot file Is there any plan to get Mac OS 8.5 working?
[Qemu-devel] qemu-ppc doesn't like local CDs
Whenever I have tried to use the local CDs, qemu-system-ppc hangs. I am using XP home with the qemu cvs, but the problem isn't just there. This isn't a problem with the i386 version.
[Qemu-devel] no meta key?
When I was trying to get the PowerPC qemu to go into open Firmware mode, I tried to send the command key (not the control key), but I couldn't find any key that resembles it in the built-in sendkey command. There was no meta or Windows key in the autocomplete function of sendkey (as well as a missing ).
