Commit 83affaa6 authored by Pavel Borzenkov's avatar Pavel Borzenkov Committed by Andreas Färber
Browse files

raw-posix: Do not use CONFIG_COCOA macro 

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: default avatarBen Leslie <benno@benno.id.au>
Signed-off-by: default avatarPavel Borzenkov <pavel.borzenkov@gmail.com>
Acked-by: default avatarKevin Wolf <kwolf@redhat.com>
Signed-off-by: default avatarAndreas Färber <andreas.faerber@web.de>
parent 42fe1c24

block/raw-posix.c

+4 −4
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
#include "module.h"

#include "block/raw-posix-aio.h"



#ifdef CONFIG_COCOA

#if defined(__APPLE__) && (__MACH__)

#include <paths.h>

#include <sys/param.h>

#include <IOKit/IOKitLib.h>
@@ -505,7 +505,7 @@ again: 
        }

        if (size == 0)

#endif

#ifdef CONFIG_COCOA

#if defined(__APPLE__) && defined(__MACH__)

        size = LONG_LONG_MAX;

#else

        size = lseek(fd, 0LL, SEEK_END);
@@ -650,7 +650,7 @@ static BlockDriver bdrv_file = { 
/***********************************************/

/* host device */



#ifdef CONFIG_COCOA

#if defined(__APPLE__) && defined(__MACH__)

static kern_return_t FindEjectableCDMedia( io_iterator_t *mediaIterator );

static kern_return_t GetBSDPath( io_iterator_t mediaIterator, char *bsdPath, CFIndex maxPathSize );
@@ -728,7 +728,7 @@ static int hdev_open(BlockDriverState *bs, const char *filename, int flags) 
{

    BDRVRawState *s = bs->opaque;



#ifdef CONFIG_COCOA

#if defined(__APPLE__) && defined(__MACH__)

    if (strstart(filename, "/dev/cdrom", NULL)) {

        kern_return_t kernResult;

        io_iterator_t mediaIterator;