From nobody Wed Nov 12 01:52:18 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1566932560; cv=none; d=zoho.com; s=zohoarc; b=C4ixXQhgWGfnsaT6ihhGe6kBO8s6llMjtQ7Cxvv+KR/DoULqQJD8RMOV1yyNkwGIBsRSy41UT2QHMxc/x+SZi4OqGcvcW7FgVnKkYXAHEDNq8iPUGD3xroY1+wjJKqpIsuqZ4TZfuqRQXgpuytl9dBG28AhR9Us70tZ4pUUTjB0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1566932560; 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:ARC-Authentication-Results; bh=5WYteARbw4F5SMsy3ezROwY8/lmuvqrn3c2e82dR+CI=; b=UhVuUBQiMzp+8zo6ksz3z0YM4ERV1Dd9Ol+QGh4LxcCFvRSi+6t1Nja6eAoIsc73AW2I28W38PdcEOYo4p+TgWoCjcZOx6DtQjQSZUai3wosAQkvi368A1e2Qgye71CNz9n6zkR3FoQsUSwFcGvYRZg9ZxWc1XvjqAH6XOshMoc= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=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 1566932560477241.10377948562666; Tue, 27 Aug 2019 12:02:40 -0700 (PDT) Received: from localhost ([::1]:56094 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i2gjl-0001aq-7M for importer@patchew.org; Tue, 27 Aug 2019 15:02:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33875) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i2ggd-0008Kl-V0 for qemu-devel@nongnu.org; Tue, 27 Aug 2019 14:59:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i2ggc-0006NL-OK for qemu-devel@nongnu.org; Tue, 27 Aug 2019 14:59:23 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:38620) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i2ggc-0006Mq-HK; Tue, 27 Aug 2019 14:59:22 -0400 Received: by mail-wr1-x444.google.com with SMTP id e16so2768733wro.5; Tue, 27 Aug 2019 11:59:22 -0700 (PDT) Received: from localhost.localdomain (109-186-142-128.bb.netvision.net.il. [109.186.142.128]) by smtp.gmail.com with ESMTPSA id g26sm9926wmh.32.2019.08.27.11.59.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Aug 2019 11:59:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5WYteARbw4F5SMsy3ezROwY8/lmuvqrn3c2e82dR+CI=; b=LhU/QzLQDQJPOddPNAx507pS8CqPjDObAoivk4qQmawxg80NZUpd0QodcwNzwkBU7w 7Pk7xlDiu0lH2WMVyXDcsTZChJJNnr+hA+WRL9A98Fl1z61vcxJKQjnTD3YkdTjlTKae t2WLbcDkGzxVDO83xGsSFRI/9NVYPmP8jotf+n5V2Bklp2g2ydYQWqiWHZcvTYUZpXxg iDbjgGx1cMIzGU3xDhT6ZlYsqtpshiFNBAaF8wQcCsNxn+EKViaT0UDlhZnuP2NBsWPg H/gRULi18Cczx4LmzN5ngtjkxVupc6hgqYXIfpbm0tao57qmfV8uSoLHLGyJe7IP0jyS cJ0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5WYteARbw4F5SMsy3ezROwY8/lmuvqrn3c2e82dR+CI=; b=uQUES4srtRUJKZrTUUsyYjKoxhZwS7ag9N8aUyEK15iBVZ8c1QA7NzjmSUXUSH97/d lP+QKVRkrwkU2HxinOfigQipFJvCQPKOw/zMcPpYyrkz5+sJ0psNrS2hv9aqReGiewWA aqOSR9ms/B3kJmhFLvXVbcfx5GCXCNzL15nZXrUiunwO704OwVkznimAKrp2CuaaeYWt ZHR+PEJs89PsrlueT9oyvxE23219ICUlaI0KH8hy2m0x7chmxqZ5gcqIeAvA9QSVItYD 7AD+UEB31qp2Gj97us9TEO1wUjBuZT41P4IjKDlFKl6CwJwByMlQNs9ksCWRlV6xaoSc MbCg== X-Gm-Message-State: APjAAAVrZ1iGGc4OfMxYRMe936eis6BUbcutd84nE+D5MguzDugXCphu XJQSgIsauPtq6MifP2ngqpOSXw6LnPXWEQ== X-Google-Smtp-Source: APXvYqxagZS3jZc/wJugW9RjPGZP+DNUcsuwLNApbRn7tzxMqzGP4AhTsnXh4mZN/jjZwgGJuBZjuQ== X-Received: by 2002:a5d:6a05:: with SMTP id m5mr32331916wru.305.1566932361121; Tue, 27 Aug 2019 11:59:21 -0700 (PDT) From: Nir Soffer X-Google-Original-From: Nir Soffer To: qemu-devel@nongnu.org Date: Tue, 27 Aug 2019 21:59:13 +0300 Message-Id: <20190827185913.27427-3-nsoffer@redhat.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190827185913.27427-1-nsoffer@redhat.com> References: <20190827185913.27427-1-nsoffer@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 Subject: [Qemu-devel] [PATCH v2 2/2] block: Remove unused masks 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 , Fam Zheng , qemu-block@nongnu.org, Juan Quintela , "Dr. David Alan Gilbert" , Max Reitz , Nir Soffer , Stefan Hajnoczi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Replace confusing usage: ~BDRV_SECTOR_MASK With more clear: (BDRV_SECTOR_SIZE - 1) Remove BDRV_SECTOR_MASK and the unused BDRV_BLOCK_OFFSET_MASK which was it's last user. Signed-off-by: Nir Soffer Reviewed-by: John Snow Reviewed-by: Juan Quintela --- include/block/block.h | 2 -- migration/block.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/include/block/block.h b/include/block/block.h index 124ad40809..37c9de7446 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -143,7 +143,6 @@ typedef struct HDGeometry { =20 #define BDRV_SECTOR_BITS 9 #define BDRV_SECTOR_SIZE (1ULL << BDRV_SECTOR_BITS) -#define BDRV_SECTOR_MASK ~(BDRV_SECTOR_SIZE - 1) =20 #define BDRV_REQUEST_MAX_SECTORS MIN(SIZE_MAX >> BDRV_SECTOR_BITS, \ INT_MAX >> BDRV_SECTOR_BITS) @@ -195,7 +194,6 @@ typedef struct HDGeometry { #define BDRV_BLOCK_ALLOCATED 0x10 #define BDRV_BLOCK_EOF 0x20 #define BDRV_BLOCK_RECURSE 0x40 -#define BDRV_BLOCK_OFFSET_MASK BDRV_SECTOR_MASK =20 typedef QSIMPLEQ_HEAD(BlockReopenQueue, BlockReopenQueueEntry) BlockReopen= Queue; =20 diff --git a/migration/block.c b/migration/block.c index aa747b55fa..92c36b68ec 100644 --- a/migration/block.c +++ b/migration/block.c @@ -906,7 +906,7 @@ static int block_load(QEMUFile *f, void *opaque, int ve= rsion_id) do { addr =3D qemu_get_be64(f); =20 - flags =3D addr & ~BDRV_SECTOR_MASK; + flags =3D addr & (BDRV_SECTOR_SIZE - 1); addr >>=3D BDRV_SECTOR_BITS; =20 if (flags & BLK_MIG_FLAG_DEVICE_BLOCK) { --=20 2.20.1