From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59027) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1kMh-00017i-QR for qemu-devel@nongnu.org; Wed, 25 Nov 2015 19:24:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a1kMe-0006MG-M1 for qemu-devel@nongnu.org; Wed, 25 Nov 2015 19:24:47 -0500 From: Programmingkid Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Date: Wed, 25 Nov 2015 19:24:41 -0500 Message-Id: <0CCF4621-0581-41FD-A207-9FE5E1EDC58D@gmail.com> Mime-Version: 1.0 (Apple Message framework v1084) Subject: [Qemu-devel] [PATCH v8] block/raw-posix.c: Make physical devices usable in QEMU under Mac OS X host List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kevin Wolf Cc: qemu-devel qemu-devel , Qemu-block Mac OS X can be picky when it comes to allowing the user to use physical devices in QEMU. Most mounted volumes appear to be off limits to QEMU. If an issue is detected, a message is displayed showing the user how to unmount a volume. Signed-off-by: John Arbuckle --- block/raw-posix.c | 98 = +++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 72 insertions(+), 26 deletions(-) diff --git a/block/raw-posix.c b/block/raw-posix.c index ccfec1c..d0190c1 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -42,9 +42,8 @@ #include #include #include -//#include #include -#endif +#endif /* (__APPLE__) && (__MACH__) */ =20 #ifdef __sun__ #define _POSIX_PTHREAD_SEMANTICS 1 @@ -2033,7 +2032,36 @@ kern_return_t GetBSDPath(io_iterator_t = mediaIterator, char *bsdPath, return kernResult; } =20 -#endif +/* Sets up a real cdrom for use in QEMU */ +static bool setup_cdrom(char *bsd_path, Error **errp) +{ + int index, num_of_test_partitions =3D 2, fd; + char test_partition[MAXPATHLEN]; + bool partition_found =3D false; + + /* look for a working partition */ + for (index =3D 0; index < num_of_test_partitions; index++) { + snprintf(test_partition, sizeof(test_partition), "%ss%d", = bsd_path, + = index); + fd =3D qemu_open(test_partition, O_RDONLY | O_BINARY | = O_LARGEFILE); + if (fd >=3D 0) { + partition_found =3D true; + qemu_close(fd); + break; + } + } + + /* if a working partition on the device was not found */ + if (partition_found =3D=3D false) { + error_setg(errp, "Error: Failed to find a working partition on = " + = "disc!\n"); + } else { + DPRINTF("Using %s as optical disc\n", test_partition); + pstrcpy(bsd_path, MAXPATHLEN, test_partition); + } + return partition_found; +} +#endif /* defined(__APPLE__) && defined(__MACH__) */ =20 static int hdev_probe_device(const char *filename) { @@ -2115,6 +2143,17 @@ static bool hdev_is_sg(BlockDriverState *bs) return false; } =20 +/* Prints directions on mounting and unmounting a device */ +static void printUnmountingDirections(const char *file_name) +{ + error_report("Error: If device %s is mounted on the desktop, = unmount" + " it first before using it in QEMU.\n", = file_name); + error_report("Command to unmount device: diskutil unmountDisk = %s\n", + = file_name); + error_report("Command to mount device: diskutil mountDisk %s\n", + = file_name); +} + static int hdev_open(BlockDriverState *bs, QDict *options, int flags, Error **errp) { @@ -2123,32 +2162,32 @@ static int hdev_open(BlockDriverState *bs, QDict = *options, int flags, int ret; =20 #if defined(__APPLE__) && defined(__MACH__) - const char *filename =3D qdict_get_str(options, "filename"); + const char *file_name =3D qdict_get_str(options, "filename"); =20 - if (strstart(filename, "/dev/cdrom", NULL)) { - kern_return_t kernResult; + /* If using a real cdrom */ + if (strcmp(file_name, "/dev/cdrom") =3D=3D 0) { + char bsd_path[MAXPATHLEN]; io_iterator_t mediaIterator; - char bsdPath[ MAXPATHLEN ]; - int fd; - - kernResult =3D FindEjectableCDMedia( &mediaIterator ); - kernResult =3D GetBSDPath(mediaIterator, bsdPath, = sizeof(bsdPath), - = flags); - if ( bsdPath[ 0 ] !=3D '\0' ) { - strcat(bsdPath,"s0"); - /* some CDs don't have a partition 0 */ - fd =3D qemu_open(bsdPath, O_RDONLY | O_BINARY | = O_LARGEFILE); - if (fd < 0) { - bsdPath[strlen(bsdPath)-1] =3D '1'; - } else { - qemu_close(fd); - } - filename =3D bsdPath; - qdict_put(options, "filename", qstring_from_str(filename)); + FindEjectableCDMedia(&mediaIterator); + GetBSDPath(mediaIterator, bsd_path, sizeof(bsd_path), flags); + if (mediaIterator) { + IOObjectRelease(mediaIterator); + } + + /* If a real optical drive was not found */ + if (bsd_path[0] =3D=3D '\0') { + error_setg(errp, "Error: failed to obtain bsd path for = optical" + " = drive!\n"); + return -1; } =20 - if ( mediaIterator ) - IOObjectRelease( mediaIterator ); + /* If finding a partition on the cdrom disc failed */ + if (setup_cdrom(bsd_path, errp) =3D=3D false) { + printUnmountingDirections(bsd_path); + return -1; + } + file_name =3D bsd_path; + qdict_put(options, "filename", qstring_from_str(file_name)); } #endif =20 @@ -2159,9 +2198,16 @@ static int hdev_open(BlockDriverState *bs, QDict = *options, int flags, if (local_err) { error_propagate(errp, local_err); } - return ret; } =20 +#if defined(__APPLE__) && defined(__MACH__) + /* if a physical device experienced an error while being opened */ + if (strncmp(file_name, "/dev/", 5) =3D=3D 0 && ret !=3D 0) { + printUnmountingDirections(file_name); + return -1; + } +#endif /* defined(__APPLE__) && defined(__MACH__) */ + /* Since this does ioctl the device must be already opened */ bs->sg =3D hdev_is_sg(bs); =20 --=20 1.7.5.4