From nobody Wed Feb 11 01:12:32 2026 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1621875434; cv=none; d=zohomail.com; s=zohoarc; b=Rnm6xYRIYe2twFLJ51WFvirWb2iWatmQpyOpVd5G6djT882RTlXqcsqYG19iQnB+5953LWwbkGKkgcflCoDNQJVwlsnCVDzQGhkv9VAN0so77pnFEXrohAqtTRYKPZonZ5Om9yt3VBb5LqF6FzDhIHes5qxQSFUqFFMikaIHhzE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621875434; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=J4uFbK1t87t3yE0My/WwkVODQQO6taRX0FVG5vrflTQ=; b=Yu/94waIBUgcPt0s31puB8dxe7asQBOVB/174LCE54HWh+SJZsYiq7neClTf8iBpieTVQ5jbJKFyHGCQfxDSi4LXBJtGkG5VI8O9KhamdYkX1YBzHbTeSNSL0Mz863IecDjtzYAycFCDL5kzF2cNwdScHdezlN+l0wnlrftdaoI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16218754346612.723084780723525; Mon, 24 May 2021 09:57:14 -0700 (PDT) Received: from localhost ([::1]:59966 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1llDtB-0001Ul-HB for importer2@patchew.org; Mon, 24 May 2021 12:57:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44036) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llDZW-0007El-ME; Mon, 24 May 2021 12:36:55 -0400 Received: from mail-ed1-x536.google.com ([2a00:1450:4864:20::536]:33409) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1llDZV-0002o0-1q; Mon, 24 May 2021 12:36:54 -0400 Received: by mail-ed1-x536.google.com with SMTP id b17so32752592ede.0; Mon, 24 May 2021 09:36:52 -0700 (PDT) Received: from avogadro.redhat.com ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n8sm7967684ejl.0.2021.05.24.09.36.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 May 2021 09:36:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=J4uFbK1t87t3yE0My/WwkVODQQO6taRX0FVG5vrflTQ=; b=eP65eK+uSkEvfyUl9Ny+71ANhXbWPpNMGho2aQ6VfrFRZimqG6dLZdC5ZF9ertN3Ci vqedzIX4azAFLU9VfGpF/weC530GhO9faVY4e2gFHKcfT634W9RSdADimnwBOCHzwKhu cZI9c1bwP38vacSgZlaYABkSE3ic6DMF6v0bDA5zF0/jb1/1Bgs1CFfEbyTCtTvGQIoT axK49XzmUVCfaxM9SBVd31b1VbOKLH9iTf4cJ1TmNe5m3apJpUaP6FcgRqbyp01Dw9Bx YHokBvo9v8ZGkWNKdW1j7QQ2y1tIfALmjYT7yOD+WBIe6KCGDzab01OPB5Rd1uK4fp8M D7sA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=J4uFbK1t87t3yE0My/WwkVODQQO6taRX0FVG5vrflTQ=; b=TmQo89MzeNF8KXPuPwiKyi+yVbMR4o3nfDlsSKVdIo9ipURRzfsRnDI2G/T/n0Sw14 T6Y++rhDotNVz3PLG0Cx3wF93P8cDj2kJWIpKNfqs63vOsWgH4Fg5CJES8pB2Ja2cItq RXAAKRyXlz/E0Witc34SDz1ZkLP+nq77gJ5LQ3enczER01NCtwgB4lZvJ+aq6P51s5W1 3MGE+wobhwdz7EWxw1TGCmOw36FG9uhwqFZOii1jHOO/IJQM6w3LgKnUH0iK0Urh44vD tucjtOmDixMAylMWM4QfIKURY4JzjS1fYvw9pUsUoGFOse6qUYkjIPNbQvLVMsmEoiUg ObUA== X-Gm-Message-State: AOAM533k+S4Ne0hDcGWYkHklRX3n/QEvJOH6F4KphxxqzIxX4Dszrg3B uZQBfZ5SLJPulstT4du6bLSaeShA8k9pCg== X-Google-Smtp-Source: ABdhPJy+JRfjkiP4KQxWcbX09dlRXvlUmDcmcmRZ8T72OAqsSeziHyD5VBLsRV7tGuiplx0KxF5KSg== X-Received: by 2002:aa7:c4c2:: with SMTP id p2mr25774073edr.144.1621874211294; Mon, 24 May 2021 09:36:51 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH v2 6/6] block: detect DKIOCGETBLOCKCOUNT/SIZE before use Date: Mon, 24 May 2021 18:36:45 +0200 Message-Id: <20210524163645.382940-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210524163645.382940-1-pbonzini@redhat.com> References: <20210524163645.382940-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::536; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x536.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Warner Losh , Joelle van Dyne , qemu-block@nongnu.org, Peter Maydell Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Joelle van Dyne iOS hosts do not have these defined so we fallback to the default behaviour. Co-authored-by: Warner Losh Reviewed-by: Peter Maydell Signed-off-by: Joelle van Dyne Message-Id: <20210315180341.31638-4-j@getutm.app> Signed-off-by: Paolo Bonzini --- block/file-posix.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/block/file-posix.c b/block/file-posix.c index e83f34a960..34bd413553 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -2311,8 +2311,11 @@ static int64_t raw_getlength(BlockDriverState *bs) again: #endif if (!fstat(fd, &sb) && (S_IFCHR & sb.st_mode)) { + size =3D 0; #ifdef DIOCGMEDIASIZE - if (ioctl(fd, DIOCGMEDIASIZE, (off_t *)&size)) + if (ioctl(fd, DIOCGMEDIASIZE, (off_t *)&size)) { + size =3D 0; + } #elif defined(DIOCGPART) { struct partinfo pi; @@ -2321,9 +2324,7 @@ again: else size =3D 0; } - if (size =3D=3D 0) -#endif -#if defined(__APPLE__) && defined(__MACH__) +#elif defined(DKIOCGETBLOCKCOUNT) && defined(DKIOCGETBLOCKSIZE) { uint64_t sectors =3D 0; uint32_t sector_size =3D 0; @@ -2331,19 +2332,15 @@ again: if (ioctl(fd, DKIOCGETBLOCKCOUNT, §ors) =3D=3D 0 && ioctl(fd, DKIOCGETBLOCKSIZE, §or_size) =3D=3D 0) { size =3D sectors * sector_size; - } else { - size =3D lseek(fd, 0LL, SEEK_END); - if (size < 0) { - return -errno; - } } } -#else - size =3D lseek(fd, 0LL, SEEK_END); +#endif + if (size =3D=3D 0) { + size =3D lseek(fd, 0LL, SEEK_END); + } if (size < 0) { return -errno; } -#endif #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) switch(s->type) { case FTYPE_CD: --=20 2.31.1