From patchwork Tue Jan 13 20:07:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Programmingkid X-Patchwork-Id: 428683 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id C272D14009B for ; Wed, 14 Jan 2015 07:07:37 +1100 (AEDT) Received: from localhost ([::1]:41214 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YB7kU-0005Ir-Oy for incoming@patchwork.ozlabs.org; Tue, 13 Jan 2015 15:07:34 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36296) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YB7kD-0004tT-D4 for qemu-devel@nongnu.org; Tue, 13 Jan 2015 15:07:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YB7k9-00055m-Cz for qemu-devel@nongnu.org; Tue, 13 Jan 2015 15:07:17 -0500 Received: from mail-qa0-x233.google.com ([2607:f8b0:400d:c00::233]:41651) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YB7k9-00055c-9I for qemu-devel@nongnu.org; Tue, 13 Jan 2015 15:07:13 -0500 Received: by mail-qa0-f51.google.com with SMTP id f12so2870455qad.10 for ; Tue, 13 Jan 2015 12:07:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:content-type:content-transfer-encoding:subject:date:message-id :cc:to:mime-version; bh=yUN/U5xAwLI/r5T4AqJkTgdNI7bFxWmiaTDjrOBqry8=; b=qtyKrZs6UUszQGkOrwstnwEJWVhmkpIa5XkaF0NP8QrMmRe2ecnLIfbnvY3wwZyNRS 4IrQUWUfjKx3kfzJVv8Q/mxDddupOtJ1gjvSG0Ua0z0h3xvfV/fgVQytjEwJCfQ54HW3 3EVZjyYJl9/L66U3329wRwVFB72QddxsmLubXjxkZA6MmYnUSrljhiyj5FMnQ8Yh2a2g 6vD8b73rQOWlkxpbBLYxoKdli9CSCe56wgapAMvpj+Z+1VyPMX2IjHAkQ8Z9wJ3+Hvxg K6w+DLF6nZDfl1RXvQ0JBxF4Pv1uEBS7d/faaTlZQj2rtNXK31YBiYQVvgBE4OA/C8s9 owdg== X-Received: by 10.229.225.195 with SMTP id it3mr443074qcb.24.1421179632884; Tue, 13 Jan 2015 12:07:12 -0800 (PST) Received: from [192.168.0.2] (d199-74-164-53.col.wideopenwest.com. [74.199.53.164]) by mx.google.com with ESMTPSA id t2sm18588381qae.6.2015.01.13.12.07.11 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 13 Jan 2015 12:07:12 -0800 (PST) From: Programmingkid Date: Tue, 13 Jan 2015 15:07:08 -0500 Message-Id: <71BB46AD-4E5B-4876-84F0-12260D6846D3@gmail.com> To: Peter Maydell , Kevin Wolf , Stefan Hajnoczi Mime-Version: 1.0 (Apple Message framework v1084) X-Mailer: Apple Mail (2.1084) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c00::233 Cc: qemu-devel qemu-devel Subject: [Qemu-devel] [PATCH v6] block/raw-posix.c: Fixes raw_getlength() on Mac OS X so that it reports the correct length of a real CD X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Allows QEMU on Mac OS X to use a real cdrom again. Signed-off-by: John Arbuckle --- Added fallback code - uses lseek() if ioctl() fails. block/raw-posix.c | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/block/raw-posix.c b/block/raw-posix.c index e51293a..5815707 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -1312,7 +1312,30 @@ again: if (size == 0) #endif #if defined(__APPLE__) && defined(__MACH__) - size = LLONG_MAX; + { + uint64_t sectors = 0; + uint32_t sector_size = 0; + bool ioctl_problem = false; + ret = 0; + + /* Query the number of sectors on the disk */ + ret = ioctl(fd, DKIOCGETBLOCKCOUNT, §ors); + if (ret != 0) + ioctl_problem = true; + + /* Query the size of each sector */ + ret = ioctl(fd, DKIOCGETBLOCKSIZE, §or_size); + if (ret != 0) + ioctl_problem = true; + + /* If everything is ok */ + if (ioctl_problem == false) + size = sectors * sector_size; + + /* If a problem occurred with ioctl(), fallback to lseek() */ + else + size = lseek(fd, 0LL, SEEK_END); + } #else size = lseek(fd, 0LL, SEEK_END); if (size < 0) {