* Re: [Qemu-devel] [PULL] Cocoa patch queue 2012-05-01
[not found] <1335824128-16819-1-git-send-email-andreas.faerber@web.de>
@ 2012-05-01 11:45 ` Blue Swirl
[not found] ` <1335824128-16819-2-git-send-email-andreas.faerber@web.de>
1 sibling, 0 replies; 3+ messages in thread
From: Blue Swirl @ 2012-05-01 11:45 UTC (permalink / raw)
To: Andreas Färber; +Cc: qemu-devel
On Mon, Apr 30, 2012 at 22:15, Andreas Färber <andreas.faerber@web.de> wrote:
> Hello Blue,
>
> Please pull the Cocoa queue into qemu.git master.
Thanks, pulled.
>
> The following changes since commit 42fe1c245f0239ebcdc084740a1777ac3699d071:
> Stefan Weil (1):
> main-loop: Fix build for w32 and w64
>
> are available in the git repository at:
>
> git://repo.or.cz/qemu/afaerber.git cocoa-for-upstream
>
> Andreas Färber (1):
> Drop darwin-user
>
> Pavel Borzenkov (2):
> raw-posix: Do not use CONFIG_COCOA macro
> configure: add '--disable-cocoa' switch
>
> MAINTAINERS | 5 -
> Makefile.target | 28 -
> block/raw-posix.c | 8 +-
> configure | 30 +-
> darwin-user/commpage.c | 357 --------
> darwin-user/ioctls.h | 4 -
> darwin-user/ioctls_types.h | 1 -
> darwin-user/machload.c | 902 -------------------
> darwin-user/main.c | 1027 ----------------------
> darwin-user/mmap.c | 409 ---------
> darwin-user/qemu.h | 178 ----
> darwin-user/signal.c | 452 ----------
> darwin-user/syscall.c | 1566 ----------------------------------
> darwin-user/syscalls.h | 384 ---------
> default-configs/i386-darwin-user.mak | 1 -
> default-configs/ppc-darwin-user.mak | 3 -
> qemu-doc.texi | 90 --
> qemu-tech.texi | 3 +-
> 18 files changed, 9 insertions(+), 5439 deletions(-)
> delete mode 100644 darwin-user/commpage.c
> delete mode 100644 darwin-user/ioctls.h
> delete mode 100644 darwin-user/ioctls_types.h
> delete mode 100644 darwin-user/machload.c
> delete mode 100644 darwin-user/main.c
> delete mode 100644 darwin-user/mmap.c
> delete mode 100644 darwin-user/qemu.h
> delete mode 100644 darwin-user/signal.c
> delete mode 100644 darwin-user/syscall.c
> delete mode 100644 darwin-user/syscalls.h
> delete mode 100644 default-configs/i386-darwin-user.mak
> delete mode 100644 default-configs/ppc-darwin-user.mak
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH 1/3] raw-posix: Do not use CONFIG_COCOA macro
[not found] ` <1335824128-16819-2-git-send-email-andreas.faerber@web.de>
@ 2012-05-02 8:02 ` Kevin Wolf
2012-05-02 9:39 ` Andreas Färber
0 siblings, 1 reply; 3+ messages in thread
From: Kevin Wolf @ 2012-05-02 8:02 UTC (permalink / raw)
To: Andreas Färber; +Cc: blauwirbel, Ben Leslie, qemu-devel, Pavel Borzenkov
Am 01.05.2012 00:15, schrieb Andreas Färber:
> From: Pavel Borzenkov <pavel.borzenkov@gmail.com>
>
> Use __APPLE__ and __MACH__ macros instead of CONFIG_COCOA to detect Mac
> OS X host. The patch is based on Ben Leslie's patch:
> http://patchwork.ozlabs.org/patch/97859/
>
> Signed-off-by: Ben Leslie <benno@benno.id.au>
> Signed-off-by: Pavel Borzenkov <pavel.borzenkov@gmail.com>
> Signed-off-by: Andreas Färber <andreas.faerber@web.de>
> ---
> block/raw-posix.c | 8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/block/raw-posix.c b/block/raw-posix.c
> index 2d1bc13..03fcfcc 100644
> --- a/block/raw-posix.c
> +++ b/block/raw-posix.c
> @@ -29,7 +29,7 @@
> #include "module.h"
> #include "block/raw-posix-aio.h"
>
> -#ifdef CONFIG_COCOA
> +#if defined(__APPLE__) && (__MACH__)
Is there a 'defined' missing?
Kevin
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH 1/3] raw-posix: Do not use CONFIG_COCOA macro
2012-05-02 8:02 ` [Qemu-devel] [PATCH 1/3] raw-posix: Do not use CONFIG_COCOA macro Kevin Wolf
@ 2012-05-02 9:39 ` Andreas Färber
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Färber @ 2012-05-02 9:39 UTC (permalink / raw)
To: Kevin Wolf; +Cc: blauwirbel, Ben Leslie, qemu-devel, Pavel Borzenkov
Am 02.05.2012 10:02, schrieb Kevin Wolf:
> Am 01.05.2012 00:15, schrieb Andreas Färber:
>> From: Pavel Borzenkov <pavel.borzenkov@gmail.com>
>>
>> Use __APPLE__ and __MACH__ macros instead of CONFIG_COCOA to detect Mac
>> OS X host. The patch is based on Ben Leslie's patch:
>> http://patchwork.ozlabs.org/patch/97859/
>>
>> Signed-off-by: Ben Leslie <benno@benno.id.au>
>> Signed-off-by: Pavel Borzenkov <pavel.borzenkov@gmail.com>
>> Signed-off-by: Andreas Färber <andreas.faerber@web.de>
>> ---
>> block/raw-posix.c | 8 ++++----
>> 1 files changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/block/raw-posix.c b/block/raw-posix.c
>> index 2d1bc13..03fcfcc 100644
>> --- a/block/raw-posix.c
>> +++ b/block/raw-posix.c
>> @@ -29,7 +29,7 @@
>> #include "module.h"
>> #include "block/raw-posix-aio.h"
>>
>> -#ifdef CONFIG_COCOA
>> +#if defined(__APPLE__) && (__MACH__)
>
> Is there a 'defined' missing?
Seems like it, I'll send you a fixup patch.
Thanks for noticing,
Andreas
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-05-02 9:40 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <1335824128-16819-1-git-send-email-andreas.faerber@web.de>
2012-05-01 11:45 ` [Qemu-devel] [PULL] Cocoa patch queue 2012-05-01 Blue Swirl
[not found] ` <1335824128-16819-2-git-send-email-andreas.faerber@web.de>
2012-05-02 8:02 ` [Qemu-devel] [PATCH 1/3] raw-posix: Do not use CONFIG_COCOA macro Kevin Wolf
2012-05-02 9:39 ` Andreas Färber
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.