From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 542F1C433E0 for ; Tue, 9 Mar 2021 11:33:18 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AAAE865259 for ; Tue, 9 Mar 2021 11:33:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AAAE865259 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:51052 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJac0-0005Rj-M8 for qemu-devel@archiver.kernel.org; Tue, 09 Mar 2021 06:33:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37372) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJaaV-0004nx-4R for qemu-devel@nongnu.org; Tue, 09 Mar 2021 06:31:43 -0500 Received: from mail-ej1-x62f.google.com ([2a00:1450:4864:20::62f]:36017) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lJaaS-0007n0-Bh for qemu-devel@nongnu.org; Tue, 09 Mar 2021 06:31:42 -0500 Received: by mail-ej1-x62f.google.com with SMTP id e19so26742718ejt.3 for ; Tue, 09 Mar 2021 03:31:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=w4q6igLyhpztxOKThSb8mVPy8c4IoqSAJFc2dUHMagQ=; b=UTcWiTz9c/rhBwq0Sv6Yq0Vgs2Bw1XImZpka+HPh9jOoT6DlileiNoQiNRviNt1rY+ ddcOaJkjZ1UxeljK9vC09xTguqjGNPjig25Uv1D+QQCuEqMX8Zkv3s/7Rgxok6zQ54r/ N1sAD6+mh5Z0obEidkEyLx1zXMaxRf7wa7edTNWBw0kMHx09q+QQZiqTCZIu1wKSD2+1 1CqLlOSe2uoqBRIaM1sLlt7SZtKduZEgmfWJHCn+z1iJW7VH8dXI21IGhZhRU1oYsWgE +F4TpnUekvdmzoQTO2JD6d9AejcgPfjCCktjIDB/aMNLzjeSJpE+QUml55PiM9kEu46k S9pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=w4q6igLyhpztxOKThSb8mVPy8c4IoqSAJFc2dUHMagQ=; b=mFqFmcmoyDlaq8dwi3BvSn/1rryGf57VgnxR9CNVY7+rFbYO+OOKuCLZM4XNaUyl8K 8tONUVrp1JkST1tZI+lLv8K/WGpKHMNr4juApdrGbyxqiQtbfBLPnrFJoGPJvvYFE+2j 3uBwAgcrv70G6sLq6f0Rg3d6PRvhlnYpoTWxAMatdGcwwxp8pKhKWsktyqfi3GHl5uTi Xn0ft97xfZFg+7JlL99+z4vLy4TYWyo0sKhdgLWdZR6EGwbau4LOcw/ZdprjrKarA9gJ TnYtBVQPJCz58+twQvaNgLDRHzxV/3Wa37KBxJmHbUhn3dXt6pkVhV0DzyAWMiipUeCT zezg== X-Gm-Message-State: AOAM531A/tNNMexLWTTEJCqJjM9cdHuZOvwHJ+r6EVOXF7k2756mLzFu eVdw6PGILE3BCAOCOVsRtC6vSD8ju0U6DymXebBZ5g== X-Google-Smtp-Source: ABdhPJxzquEpSRAhDm6NNBw2OrXCzCRctswgn6jd06mgptvrfG7m/IvjCt7HtIqvyCfNYYMHiuBUNmrM5pQscZ55BLM= X-Received: by 2002:a17:906:16ca:: with SMTP id t10mr20012556ejd.85.1615289497418; Tue, 09 Mar 2021 03:31:37 -0800 (PST) MIME-Version: 1.0 References: <20210309002741.85057-1-j@getutm.app> <20210309002741.85057-4-j@getutm.app> In-Reply-To: <20210309002741.85057-4-j@getutm.app> From: Peter Maydell Date: Tue, 9 Mar 2021 11:31:20 +0000 Message-ID: Subject: Re: [PATCH v2 3/4] block: detect DKIOCGETBLOCKCOUNT/SIZE before use To: Joelle van Dyne Content-Type: text/plain; charset="UTF-8" Received-SPF: pass client-ip=2a00:1450:4864:20::62f; envelope-from=peter.maydell@linaro.org; helo=mail-ej1-x62f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: Kevin Wolf , Warner Losh , QEMU Developers , "open list:raw" , Max Reitz Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Tue, 9 Mar 2021 at 00:30, Joelle van Dyne wrote: > > iOS hosts do not have these defined so we fallback to the > default behaviour. > > Co-authored-by: Warner Losh > Signed-off-by: Joelle van Dyne > --- > block/file-posix.c | 18 +++++++----------- > 1 file changed, 7 insertions(+), 11 deletions(-) raw_getlength() is a bit of a mess; this certainly seems like an improvement... > diff --git a/block/file-posix.c b/block/file-posix.c > index d1ab3180ff..9b6d7ddda3 100644 > --- a/block/file-posix.c > +++ b/block/file-posix.c > @@ -2326,8 +2326,10 @@ static int64_t raw_getlength(BlockDriverState *bs) > again: > #endif > if (!fstat(fd, &sb) && (S_IFCHR & sb.st_mode)) { > + size = 0; > #ifdef DIOCGMEDIASIZE > if (ioctl(fd, DIOCGMEDIASIZE, (off_t *)&size)) > + size = 0; this if() should have braces {}. Otherwise Reviewed-by: Peter Maydell thanks -- PMM