qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Kevin Wolf <kwolf@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com
Subject: [Qemu-devel] [PULL 12/32] qcow2: Use int64_t for in-memory reftable size
Date: Thu, 23 Oct 2014 22:42:19 +0200	[thread overview]
Message-ID: <1414096959-14682-13-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1414096959-14682-1-git-send-email-kwolf@redhat.com>

From: Max Reitz <mreitz@redhat.com>

Use int64_t for the entry count of the in-memory refcount table
throughout the check functions.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/qcow2-refcount.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
index 24f297f..a3f4d47 100644
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -1084,7 +1084,7 @@ fail:
 static void inc_refcounts(BlockDriverState *bs,
                           BdrvCheckResult *res,
                           uint16_t *refcount_table,
-                          int refcount_table_size,
+                          int64_t refcount_table_size,
                           int64_t offset, int64_t size)
 {
     BDRVQcowState *s = bs->opaque;
@@ -1127,7 +1127,7 @@ enum {
  * error occurred.
  */
 static int check_refcounts_l2(BlockDriverState *bs, BdrvCheckResult *res,
-    uint16_t *refcount_table, int refcount_table_size, int64_t l2_offset,
+    uint16_t *refcount_table, int64_t refcount_table_size, int64_t l2_offset,
     int flags)
 {
     BDRVQcowState *s = bs->opaque;
@@ -1237,7 +1237,7 @@ fail:
 static int check_refcounts_l1(BlockDriverState *bs,
                               BdrvCheckResult *res,
                               uint16_t *refcount_table,
-                              int refcount_table_size,
+                              int64_t refcount_table_size,
                               int64_t l1_table_offset, int l1_size,
                               int flags)
 {
-- 
1.8.3.1

  parent reply	other threads:[~2014-10-23 20:43 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-23 20:42 [Qemu-devel] [PULL 00/32] Block patches Kevin Wolf
2014-10-23 20:42 ` [Qemu-devel] [PULL 01/32] MAINTAINERS: add aio to block layer Kevin Wolf
2014-10-23 20:42 ` [Qemu-devel] [PULL 02/32] MAINTAINERS: qemu-iotests belongs to the " Kevin Wolf
2014-10-23 20:42 ` [Qemu-devel] [PULL 03/32] MAINTAINERS: add the image fuzzer " Kevin Wolf
2014-10-23 20:42 ` [Qemu-devel] [PULL 04/32] block/vdi: Use {DIV_,}ROUND_UP Kevin Wolf
2014-10-23 20:42 ` [Qemu-devel] [PULL 05/32] block: qemu-iotests change _supported_proto to file once more Kevin Wolf
2014-10-23 20:42 ` [Qemu-devel] [PULL 06/32] block: Add qemu_{,try_}blockalign0() Kevin Wolf
2014-10-23 20:42 ` [Qemu-devel] [PULL 07/32] qcow2: Calculate refcount block entry count Kevin Wolf
2014-10-23 20:42 ` [Qemu-devel] [PULL 08/32] qcow2: Fix leaks in dirty images Kevin Wolf
2014-10-23 20:42 ` [Qemu-devel] [PULL 09/32] qcow2: Split qcow2_check_refcounts() Kevin Wolf
2014-10-23 20:42 ` [Qemu-devel] [PULL 10/32] qcow2: Use sizeof(**refcount_table) Kevin Wolf
2014-10-23 20:42 ` [Qemu-devel] [PULL 11/32] qcow2: Pull check_refblocks() up Kevin Wolf
2014-10-23 20:42 ` Kevin Wolf [this message]
2014-10-23 20:42 ` [Qemu-devel] [PULL 13/32] qcow2: Split fail code in L1 and L2 checks Kevin Wolf
2014-10-23 20:42 ` [Qemu-devel] [PULL 14/32] qcow2: Let inc_refcounts() return -errno Kevin Wolf
2014-10-23 20:42 ` [Qemu-devel] [PULL 15/32] qcow2: Let inc_refcounts() resize the reftable Kevin Wolf
2014-10-23 20:42 ` [Qemu-devel] [PULL 16/32] qcow2: Reuse refcount table in calculate_refcounts() Kevin Wolf
2014-10-23 20:42 ` [Qemu-devel] [PULL 17/32] qcow2: Fix refcount blocks beyond image end Kevin Wolf
2014-10-23 20:42 ` [Qemu-devel] [PULL 18/32] qcow2: Do not perform potentially damaging repairs Kevin Wolf
2014-10-23 20:42 ` [Qemu-devel] [PULL 19/32] qcow2: Rebuild refcount structure during check Kevin Wolf
2014-10-23 20:42 ` [Qemu-devel] [PULL 20/32] qcow2: Clean up after refcount rebuild Kevin Wolf
2014-10-23 20:42 ` [Qemu-devel] [PULL 21/32] iotests: Fix test outputs Kevin Wolf
2014-10-23 20:42 ` [Qemu-devel] [PULL 22/32] iotests: Add test for potentially damaging repairs Kevin Wolf
2014-10-23 20:42 ` [Qemu-devel] [PULL 23/32] qcow2: Drop REFCOUNT_SHIFT Kevin Wolf
2014-10-23 20:42 ` [Qemu-devel] [PULL 24/32] docs/qcow2: Correct refcount_block_entries Kevin Wolf
2014-10-23 20:42 ` [Qemu-devel] [PULL 25/32] docs/qcow2: Limit refcount_order to [0, 6] Kevin Wolf
2014-10-23 20:42 ` [Qemu-devel] [PULL 26/32] block: Respect underlying file's EOF Kevin Wolf
2014-10-23 20:42 ` [Qemu-devel] [PULL 27/32] qemu-io: Respect early image end for map Kevin Wolf
2014-10-23 20:42 ` [Qemu-devel] [PULL 28/32] iotests: Add test for map commands Kevin Wolf
2014-10-23 20:42 ` [Qemu-devel] [PULL 29/32] qcow2: Do not overflow when writing an L1 sector Kevin Wolf
2014-10-23 20:42 ` [Qemu-devel] [PULL 30/32] iotests: Add test for qcow2 L1 table update Kevin Wolf
2014-10-23 20:42 ` [Qemu-devel] [PULL 31/32] block: char devices on FreeBSD are not behind a pager Kevin Wolf
2014-10-23 20:42 ` [Qemu-devel] [PULL 32/32] qemu-img: Print error if check failed Kevin Wolf
2014-10-24 11:38 ` [Qemu-devel] [PULL 00/32] Block patches Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1414096959-14682-13-git-send-email-kwolf@redhat.com \
    --to=kwolf@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).