From nobody Tue Feb 10 20:48:23 2026 Delivered-To: importer@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+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1597393933; cv=none; d=zohomail.com; s=zohoarc; b=TpKiVcGg/Pl5sHeFNgXSYNG1+miHji85g2T2YCSsbeGtn19rOrDiyJ2KH7N75e5sWZDPG4ewHB/MFrrgmaaGVCSziy/3lanyG5u87tN5GyZYIEccnU6WD+fHapEGCVz67a+VpSZ+ZuxiFeuSef/rF1X+wB5j3q9qb4/IUU0DIPM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597393933; h=Content-Type: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=MHwsW3nEzd0gLVyoTqr0zx54B5tpAsp2Gj+L5fVRrhY=; b=VyhnZwebws3pDdyV3xKBx0tk6EJzGtpZKH3m3HKXBTt/vPZnt60RhdEyKoRUJKGUGgD99WLKambHuoRvoCCLKuT8if6wxUwS1J4ArG27I83PnhmXqIdYTGREH2gvVClc+naDt1N2exLJQi50cf2DRPibeZ0Wu/817lvKhhL/aN0= 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+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1597393933230781.5197627726582; Fri, 14 Aug 2020 01:32:13 -0700 (PDT) Received: from localhost ([::1]:34494 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k6V8G-0000bY-4c for importer@patchew.org; Fri, 14 Aug 2020 04:32:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52232) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k6V52-0003U0-17; Fri, 14 Aug 2020 04:28:52 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:34977) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k6V50-0004M3-6A; Fri, 14 Aug 2020 04:28:51 -0400 Received: by mail-wr1-x442.google.com with SMTP id f1so7614451wro.2; Fri, 14 Aug 2020 01:28:49 -0700 (PDT) Received: from localhost.localdomain (121.red-81-40-121.staticip.rima-tde.net. [81.40.121.121]) by smtp.gmail.com with ESMTPSA id d14sm14668107wre.44.2020.08.14.01.28.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Aug 2020 01:28:47 -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=MHwsW3nEzd0gLVyoTqr0zx54B5tpAsp2Gj+L5fVRrhY=; b=uHNobyX8IN836KBI4XwLZSVIsEA+KOp8gt7K6LC4CaJhMJkQGKOeFig3znr3lR5qiB ILAPAlDrfJ4mfwmJzDwgOBdn/VgcBiSRu7A3KsvUiCxe3X5zZyPkIuVx70sKjhtjM5at JaO13fz2shzzXd9B+alfJprBheIACu13kFHrPjImg9QxLMEQPfbe73C/Jbf5NlcgzVxS VfkpWvZfcRJsmwPHbFWs46DwUTUpFcVqa3CJmOYvud4UZEnC9vdQaIDC7Ge2eZIK0AZq iDJStx1yw87QfCLA+hut+GAy3Q9DAqJREUFQE5WXMhMr7n0xAX+UyabeWTn4j2SkdeVl u7lQ== 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=MHwsW3nEzd0gLVyoTqr0zx54B5tpAsp2Gj+L5fVRrhY=; b=m4EQY+2DTJkkaCDPXe9innuLEM7o/GHZle0kdlahmZRFLJXrrl19bTmLK6jWWyM8mH Rn5AAFiUQlhYtbKz53wZAqTuxFULJsA99BwYznmwgve1SnnWQESahTj1ya7IYZD/zZG0 hewsnddoO9XXmT2jt0UdRL/E0VK7hqNYfN9JbvZHIpBkYtyx3qckKm0H147CTWs9VajT tfmA41UBawmImVFvCkGYbfJUgDeIcRaSW921jSp+7Xca9ubCDcOTuDWHrXMSJ7p543IS wXUECfMMteE9D3v7fHczkqPPUlDr6npbkQ6dWbmvMmGDTIOaRm3zutytigNEIRRSnr1s uM2Q== X-Gm-Message-State: AOAM5312Ro0Cr6oe40jpa7UEz3nM/E9Qs3CdAoMeHm2e820rLpbhKhmo RLKgvg0pznCGIocLAwFf0dWul/TozcY= X-Google-Smtp-Source: ABdhPJzJkrAkaLBKsQWUfnMfCToWt4YCf8RmwVTW5vjXhDhn4elYHu+XWoYV/Axw++1sPsNLFwJcyw== X-Received: by 2002:a5d:4947:: with SMTP id r7mr1673726wrs.165.1597393727667; Fri, 14 Aug 2020 01:28:47 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 3/7] hw/ide/core: Replace magic '512' value by BDRV_SECTOR_SIZE Date: Fri, 14 Aug 2020 10:28:37 +0200 Message-Id: <20200814082841.27000-4-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200814082841.27000-1-f4bug@amsat.org> References: <20200814082841.27000-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::442; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x442.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, 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: Fam Zheng , Kevin Wolf , qemu-block@nongnu.org, qemu-trivial@nongnu.org, Michael Tokarev , Laurent Vivier , Max Reitz , Paolo Bonzini , John Snow , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Use self-explicit definitions instead of magic '512' value. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Li Qiang Reviewed-by: Richard Henderson --- hw/ide/core.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/hw/ide/core.c b/hw/ide/core.c index f76f7e5234..bcb2aa85fc 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -121,7 +121,7 @@ static void ide_identify(IDEState *s) put_le16(p + 0, 0x0040); put_le16(p + 1, s->cylinders); put_le16(p + 3, s->heads); - put_le16(p + 4, 512 * s->sectors); /* XXX: retired, remove ? */ + put_le16(p + 4, BDRV_SECTOR_SIZE * s->sectors); /* XXX: retired, remov= e ? */ put_le16(p + 5, 512); /* XXX: retired, remove ? */ put_le16(p + 6, s->sectors); padstr((char *)(p + 10), s->drive_serial_str, 20); /* serial number */ @@ -864,7 +864,7 @@ static void ide_dma_cb(void *opaque, int ret) } } =20 - if (s->io_buffer_size > s->nsector * 512) { + if (s->io_buffer_size > s->nsector * BDRV_SECTOR_SIZE) { /* * The PRDs were longer than needed for this request. * The Active bit must remain set after the request completes. @@ -877,7 +877,7 @@ static void ide_dma_cb(void *opaque, int ret) =20 sector_num =3D ide_get_sector(s); if (n > 0) { - assert(n * 512 =3D=3D s->sg.size); + assert(n * BDRV_SECTOR_SIZE =3D=3D s->sg.size); dma_buf_commit(s, s->sg.size); sector_num +=3D n; ide_set_sector(s, sector_num); @@ -894,17 +894,17 @@ static void ide_dma_cb(void *opaque, int ret) /* launch next transfer */ n =3D s->nsector; s->io_buffer_index =3D 0; - s->io_buffer_size =3D n * 512; + s->io_buffer_size =3D n * BDRV_SECTOR_SIZE; prep_size =3D s->bus->dma->ops->prepare_buf(s->bus->dma, s->io_buffer_= size); /* prepare_buf() must succeed and respect the limit */ - assert(prep_size >=3D 0 && prep_size <=3D n * 512); + assert(prep_size >=3D 0 && prep_size <=3D n * BDRV_SECTOR_SIZE); =20 /* * Now prep_size stores the number of bytes in the sglist, and * s->io_buffer_size stores the number of bytes described by the PRDs. */ =20 - if (prep_size < n * 512) { + if (prep_size < n * BDRV_SECTOR_SIZE) { /* * The PRDs are too short for this request. Error condition! * Reset the Active bit and don't raise the interrupt. @@ -1412,7 +1412,8 @@ static bool cmd_identify(IDEState *s, uint8_t cmd) ide_cfata_identify(s); } s->status =3D READY_STAT | SEEK_STAT; - ide_transfer_start(s, s->io_buffer, 512, ide_transfer_stop); + ide_transfer_start(s, s->io_buffer, BDRV_SECTOR_SIZE, + ide_transfer_stop); ide_set_irq(s->bus); return false; } else { @@ -1482,7 +1483,7 @@ static bool cmd_write_multiple(IDEState *s, uint8_t c= md) n =3D MIN(s->nsector, s->req_nb_sectors); =20 s->status =3D SEEK_STAT | READY_STAT; - ide_transfer_start(s, s->io_buffer, 512 * n, ide_sector_write); + ide_transfer_start(s, s->io_buffer, BDRV_SECTOR_SIZE * n, ide_sector_w= rite); =20 s->media_changed =3D 1; =20 @@ -1524,7 +1525,7 @@ static bool cmd_write_pio(IDEState *s, uint8_t cmd) =20 s->req_nb_sectors =3D 1; s->status =3D SEEK_STAT | READY_STAT; - ide_transfer_start(s, s->io_buffer, 512, ide_sector_write); + ide_transfer_start(s, s->io_buffer, BDRV_SECTOR_SIZE, ide_sector_write= ); =20 s->media_changed =3D 1; =20 @@ -1678,7 +1679,7 @@ static bool cmd_identify_packet(IDEState *s, uint8_t = cmd) { ide_atapi_identify(s); s->status =3D READY_STAT | SEEK_STAT; - ide_transfer_start(s, s->io_buffer, 512, ide_transfer_stop); + ide_transfer_start(s, s->io_buffer, BDRV_SECTOR_SIZE, ide_transfer_sto= p); ide_set_irq(s->bus); return false; } @@ -2559,7 +2560,7 @@ static void ide_init1(IDEBus *bus, int unit) s->unit =3D unit; s->drive_serial =3D drive_serial++; /* we need at least 2k alignment for accessing CDROMs using O_DIRECT */ - s->io_buffer_total_len =3D IDE_DMA_BUF_SECTORS*512 + 4; + s->io_buffer_total_len =3D IDE_DMA_BUF_SECTORS * BDRV_SECTOR_SIZE + 4; s->io_buffer =3D qemu_memalign(2048, s->io_buffer_total_len); memset(s->io_buffer, 0, s->io_buffer_total_len); =20 --=20 2.21.3