mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

block/file-posix: Remove a deprecation warning on macOS 12

Browse Source 
When building on macOS 12 we get:

  block/file-posix.c:3335:18: warning: 'IOMasterPort' is deprecated: first deprecated in macOS 12.0 [-Wdeprecated-declarations]
      kernResult = IOMasterPort( MACH_PORT_NULL, &masterPort );
                   ^~~~~~~~~~~~
                   IOMainPort

Replace by IOMainPort, redefining it to IOMasterPort if not available.

Suggested-by: Akihiko Odaki <akihiko.odaki@gmail.com>
Reviewed-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
Reviewed by: Cameron Esfahani <dirty@apple.com>
Reviewed-by: Akihiko Odaki <akihiko.odaki@gmail.com>
Tested-by: Akihiko Odaki <akihiko.odaki@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
This commit is contained in:
Philippe Mathieu-Daudé 2022-01-06 00:46:01 +01:00
parent 2e84d8521f
commit aa44d3f6b8
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
block/file-posix.c
View File

@ -3320,17 +3320,23 @@ BlockDriver bdrv_file = {
#if defined(__APPLE__) && defined(__MACH__) #if defined(__APPLE__) && defined(__MACH__)
static kern_return_t GetBSDPath(io_iterator_t mediaIterator, char *bsdPath, static kern_return_t GetBSDPath(io_iterator_t mediaIterator, char *bsdPath,
CFIndex maxPathSize, int flags); CFIndex maxPathSize, int flags);
#if !defined(MAC_OS_VERSION_12_0) \
|| (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_VERSION_12_0)
#define IOMainPort IOMasterPort
#endif
static char *FindEjectableOpticalMedia(io_iterator_t *mediaIterator) static char *FindEjectableOpticalMedia(io_iterator_t *mediaIterator)
{ {
kern_return_t kernResult = KERN_FAILURE; kern_return_t kernResult = KERN_FAILURE;
mach_port_t masterPort; mach_port_t mainPort;
CFMutableDictionaryRef classesToMatch; CFMutableDictionaryRef classesToMatch;
const char *matching_array[] = {kIODVDMediaClass, kIOCDMediaClass}; const char *matching_array[] = {kIODVDMediaClass, kIOCDMediaClass};
char *mediaType = NULL; char *mediaType = NULL;
kernResult = IOMasterPort( MACH_PORT_NULL, &masterPort ); kernResult = IOMainPort(MACH_PORT_NULL, &mainPort);
if ( KERN_SUCCESS != kernResult ) { if ( KERN_SUCCESS != kernResult ) {
printf( "IOMasterPort returned %d\n", kernResult ); printf("IOMainPort returned %d\n", kernResult);
} }
int index; int index;
@ -3343,7 +3349,7 @@ static char *FindEjectableOpticalMedia(io_iterator_t *mediaIterator)
} }
CFDictionarySetValue(classesToMatch, CFSTR(kIOMediaEjectableKey), CFDictionarySetValue(classesToMatch, CFSTR(kIOMediaEjectableKey),
kCFBooleanTrue); kCFBooleanTrue);
kernResult = IOServiceGetMatchingServices(masterPort, classesToMatch, kernResult = IOServiceGetMatchingServices(mainPort, classesToMatch,
mediaIterator); mediaIterator);
if (kernResult != KERN_SUCCESS) { if (kernResult != KERN_SUCCESS) {
error_report("Note: IOServiceGetMatchingServices returned %d", error_report("Note: IOServiceGetMatchingServices returned %d",