Changeset 99 for branches

Show
Ignore:
Timestamp:
01/14/08 16:53:22 (3 years ago)
Author:
mike
Message:

[fix] 0.9.1 host-cocoa fix for QEMU 0.9.1 (andreasf) (#70)
[fix] 0.9.1 hd-led patch fix for QEMU 0.9.1 (andreasf) (#69)
[fix] 0.9.1 vl.h fix for QEMU 0.9.1 (andreasf) (#68)

Location:
branches/0_9_1
Files:
10 modified

Legend:

Unmodified
Added
Removed

  • branches/0_9_1/changelog.txt

    r96 r99  
     1Q-0.9.1d99 
     2[fix] 0.9.1 host-cocoa fix for QEMU 0.9.1 (andreasf) (#70) 
     3[fix] 0.9.1 hd-led patch fix for QEMU 0.9.1 (andreasf) (#69) 
     4[fix] 0.9.1 vl.h fix for QEMU 0.9.1 (andreasf) (#68) 
     5 
     6Q-0.9.1d98 
     7[new] 0.9.1 branch 
     8 
    19Q-0.9.0d96 
    210[fix] term "Shutdown" replaced by "turn off" to clearifiy effect. (#19) 

  • branches/0_9_1/host-cocoa/cocoaCpuView.m

    r89 r99  
    2424 
    2525#import "cocoaCpuView.h" 
    26 #import "../vl.h" 
     26#import "../qemu-common.h" 
    2727#import "../block_int.h" 
    2828 

  • branches/0_9_1/host-cocoa/cocoaQemu.h

    r61 r99  
    3737#import <OpenGL/CGLContext.h> 
    3838 
    39 #import "../vl.h" 
     39#import "../qemu-common.h" 
    4040#import "../../../q/qcontrol/cocoaControlDOServer.h" 
    4141#import "cocoaQemuProgressWindow.h" 

  • branches/0_9_1/host-cocoa/cocoaQemu.m

    r95 r99  
    2626 
    2727#import "cocoaQemu.h" 
     28#import "sysemu.h" 
    2829 
    2930#import "cocoaQemuOpenGLView.h" 

  • branches/0_9_1/host-cocoa/cocoaQemuOpenGLView.h

    r93 r99  
    2828#import <OpenGL/CGLContext.h> 
    2929 
    30 #import "vl.h" 
     30#import "console.h" 
    3131#import "cocoaQemuWindow.h" 
    3232 

  • branches/0_9_1/host-cocoa/cocoaQemuQuartzView.h

    r93 r99  
    2525#import <Cocoa/Cocoa.h> 
    2626 
    27 #import "vl.h" 
     27#import "console.h" 
    2828#import "cocoaQemuWindow.h" 
    2929 

  • branches/0_9_1/host-cocoa/cocoaQemuQuickDrawView.h

    r5 r99  
    2727#import <Cocoa/Cocoa.h> 
    2828 
    29 #import "vl.h" 
     29#import "console.h" 
    3030#import "cocoaQemuWindow.h" 
    3131 

  • branches/0_9_1/host-cocoa/cocoaQemuWindow.m

    r93 r99  
    3030#import "cocoaPopUpView.h" 
    3131#import "cocoaCpuView.h" 
    32 #import "vl.h" 
    3332#import "CGSPrivate.h" 
    3433 

  • branches/0_9_1/patches/q_block_int.h_hdled_1.diff

    r34 r99  
    1 --- block_int.h 2006-06-21 18:46:53.000000000 +0200 
    2 +++ block_int2.h        2006-07-03 17:20:04.000000000 +0200 
    3 @@ -51,6 +51,7 @@ 
     1Index: block_int.h 
     2=================================================================== 
     3RCS file: /sources/qemu/qemu/block_int.h,v 
     4retrieving revision 1.16 
     5diff -u -r1.16 block_int.h 
     6--- block_int.h 24 Dec 2007 16:10:43 -0000      1.16 
     7+++ block_int.h 8 Jan 2008 15:32:29 -0000 
     8@@ -96,6 +96,7 @@ 
    49     int removable; /* if true, the media can be removed */ 
    510     int locked;    /* if true, the media cannot temporarily be ejected */ 
    611     int encrypted; /* if true, the media is encrypted */ 
    712+    int activityLED; /* if true, the media is accessed atm */ 
     13     int sg;        /* if true, the device is a /dev/sg* */ 
    814     /* event callback when inserting/removing */ 
    915     void (*change_cb)(void *opaque); 
    10      void *change_opaque; 

  • branches/0_9_1/patches/q_host-cocoa_02.diff

    r61 r99  
    1 --- Makefile.target     2007-01-31 13:24:18.000000000 +0100 
    2 +++ Makefile.target     2007-02-02 14:45:02.000000000 +0100 
    3 @@ -415,8 +419,8 @@ 
     1Index: Makefile.target 
     2=================================================================== 
     3RCS file: /sources/qemu/qemu/Makefile.target,v 
     4retrieving revision 1.238 
     5diff -u -r1.238 Makefile.target 
     6--- Makefile.target     6 Jan 2008 18:27:58 -0000       1.238 
     7+++ Makefile.target     8 Jan 2008 15:42:39 -0000 
     8@@ -516,7 +516,7 @@ 
     9 VL_OBJS+=gdbstub.o 
    410 endif 
    5  VL_OBJS+=vnc.o 
    611 ifdef CONFIG_COCOA 
    7 -VL_OBJS+=cocoa.o 
    812-COCOA_LIBS=-F/System/Library/Frameworks -framework Cocoa -framework IOKit 
    9 +VL_OBJS+=cocoaQemuMain.o cocoaQemuController.o cocoaQemu.o cocoaQemuProgressWindow.o cocoaQemuWindow.o cocoaQemuOpenGLView.o cocoaQemuQuartzView.o cocoaQemuQuickDrawView.o cocoaPopUpView.o cocoaCpuView.o FSController.o FSRoundedView.o FSToolbarController.o FSTransparentButton.o 
    1013+COCOA_LIBS=-F/System/Library/Frameworks -framework Cocoa -framework IOKit -framework CoreFoundation -framework OpenGL -framework ApplicationServices 
    1114 ifdef CONFIG_COREAUDIO 
    1215 COCOA_LIBS+=-framework CoreAudio 
    1316 endif 
    14 @@ -465,7 +469,11 @@ 
    15  $(QEMU_SYSTEM): $(VL_OBJS) libqemu.a 
    16         $(CC) $(VL_LDFLAGS) -o $@ $^ $(LIBS) $(SDL_LIBS) $(COCOA_LIBS) $(VL_LIBS) 
     17Index: Makefile 
     18=================================================================== 
     19RCS file: /sources/qemu/qemu/Makefile,v 
     20retrieving revision 1.140 
     21diff -u -r1.140 Makefile 
     22--- Makefile    6 Jan 2008 18:27:12 -0000       1.140 
     23+++ Makefile    8 Jan 2008 15:42:40 -0000 
     24@@ -93,7 +93,7 @@ 
     25 OBJS+=vnc.o d3des.o 
     26  
     27 ifdef CONFIG_COCOA 
     28-OBJS+=cocoa.o 
     29+OBJS+=cocoaQemuMain.o cocoaQemuController.o cocoaQemu.o cocoaQemuProgressWindow.o cocoaQemuWindow.o cocoaQemuOpenGLView.o cocoaQemuQuartzView.o cocoaQemuQuickDrawView.o cocoaPopUpView.o cocoaCpuView.o FSController.o FSRoundedView.o FSToolbarController.o FSTransparentButton.o 
     30 endif 
     31  
     32 ifdef CONFIG_SLIRP 
     33@@ -104,7 +104,10 @@ 
     34 OBJS+=$(addprefix slirp/, $(SLIRP_OBJS)) 
     35 endif 
    1736  
    1837-cocoa.o: cocoa.m 
    19 + 
    2038+cocoa%.o: host-cocoa/cocoa%.m 
    2139+       $(CC) $(CFLAGS) $(CPPFLAGS) $(BASE_CFLAGS) -c -o $@ $<