Re: [Qemu-devel] another patch against head

[Thiemo Seufer]

Hotmail wrote:
[snip]
> Index: Makefile
> ===================================================================
> RCS file: /sources/qemu/qemu/Makefile,v
> retrieving revision 1.136
> diff -u -r1.136 Makefile
> --- Makefile  24 Nov 2007 23:35:07 -0000      1.136
> +++ Makefile  30 Nov 2007 15:29:08 -0000
> @@ -15,7 +15,11 @@
>  
>  CPPFLAGS += -I. -I$(SRC_PATH) -MMD -MP
>  CPPFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
> +ifdef CONFIG_WIN32
> +LIBS= -lmingw32 -mno-cygwin

This should be done in the configure script via OS_LDFLAGS.

> +else
>  LIBS=
> +endif
>  ifdef CONFIG_STATIC
>  BASE_LDFLAGS += -static
>  endif
> Index: cocoa.m
> ===================================================================
> RCS file: /sources/qemu/qemu/cocoa.m,v
> retrieving revision 1.14
> diff -u -r1.14 cocoa.m
> --- cocoa.m   17 Nov 2007 17:14:37 -0000      1.14
> +++ cocoa.m   30 Nov 2007 15:29:09 -0000
> @@ -751,7 +751,7 @@
>  
>          [op setMessage:@"Select the disk image you want to boot.\n\nHit the 
> \"Cancel\" button to quit"];
>  
> -        [op beginSheetForDirectory:nil file:nil types:[NSArray 
> arrayWithObjects:@"img",@"iso",@"dmg",@"qcow",@"cow",@"cloop",@"vmdk",nil]
> +        [op beginSheetForDirectory:nil file:nil types:[NSArray 
> arrayWithObjects:@"img",@"iso",@"dmg",@"qcow",@"qcow2",@"cow",@"cloop",@"vmdk",nil]

That's still incomplete WT to object formats supported, I leave that out
until somebody actually completed and tested it.

>                modalForWindow:window modalDelegate:self
>                
> didEndSelector:@selector(openPanelDidEnd:returnCode:contextInfo:) 
> contextInfo:NULL];
>      }
> Index: monitor.c
> ===================================================================
> RCS file: /sources/qemu/qemu/monitor.c,v
> retrieving revision 1.87
> diff -u -r1.87 monitor.c
> --- monitor.c 18 Nov 2007 01:44:35 -0000      1.87
> +++ monitor.c 30 Nov 2007 15:29:10 -0000
> @@ -29,6 +29,7 @@
>  #include "gdbstub.h"
>  #include "net.h"
>  #include "qemu-char.h"
> +#include "qemu-timer.h"

I don't see where the monitor would use a timer.
Can you post the compiler error message which is solved by this include?

>  #include "sysemu.h"
>  #include "console.h"
>  #include "block.h"
> Index: hw/adlib.c
> ===================================================================
> RCS file: /sources/qemu/qemu/hw/adlib.c,v
> retrieving revision 1.8
> diff -u -r1.8 adlib.c
> --- hw/adlib.c        17 Nov 2007 17:14:40 -0000      1.8
> +++ hw/adlib.c        30 Nov 2007 15:29:10 -0000
> @@ -23,7 +23,9 @@
>   */
>  #include <assert.h>
>  #include "hw.h"
> +#include "audio/audio.h"

Added.

>  #include "audiodev.h"
> +#include "qemu-timer.h"

Only needed for #define DEBUG, I added a variant which takes this
into account.


Thiemo