qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Max Reitz <mreitz@redhat.com>
To: qemu-block@nongnu.org
Cc: qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>
Subject: [Qemu-devel] [PULL v2 36/50] raw: Assign bs to file in raw_co_get_block_status
Date: Tue,  2 Feb 2016 18:35:29 +0100	[thread overview]
Message-ID: <1454434543-25963-37-git-send-email-mreitz@redhat.com> (raw)
In-Reply-To: <1454434543-25963-1-git-send-email-mreitz@redhat.com>

From: Fam Zheng <famz@redhat.com>

Signed-off-by: Fam Zheng <famz@redhat.com>
Message-id: 1453780743-16806-5-git-send-email-famz@redhat.com
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/raw-posix.c | 1 +
 block/raw_bsd.c   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/block/raw-posix.c b/block/raw-posix.c
index 3ef9b25..8866121 100644
--- a/block/raw-posix.c
+++ b/block/raw-posix.c
@@ -1861,6 +1861,7 @@ static int64_t coroutine_fn raw_co_get_block_status(BlockDriverState *bs,
         *pnum = MIN(nb_sectors, (data - start) / BDRV_SECTOR_SIZE);
         ret = BDRV_BLOCK_ZERO;
     }
+    *file = bs;
     return ret | BDRV_BLOCK_OFFSET_VALID | start;
 }
 
diff --git a/block/raw_bsd.c b/block/raw_bsd.c
index 9a8933b..ea16a23 100644
--- a/block/raw_bsd.c
+++ b/block/raw_bsd.c
@@ -119,6 +119,7 @@ static int64_t coroutine_fn raw_co_get_block_status(BlockDriverState *bs,
                                             BlockDriverState **file)
 {
     *pnum = nb_sectors;
+    *file = bs->file->bs;
     return BDRV_BLOCK_RAW | BDRV_BLOCK_OFFSET_VALID | BDRV_BLOCK_DATA |
            (sector_num << BDRV_SECTOR_BITS);
 }
-- 
2.7.0

  parent reply	other threads:[~2016-02-02 17:37 UTC|newest]

Thread overview: 52+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-02 17:34 [Qemu-devel] [PULL v2 00/50] Block patches Max Reitz
2016-02-02 17:34 ` [Qemu-devel] [PULL v2 01/50] block: Add blk_dev_has_tray() Max Reitz
2016-02-02 17:34 ` [Qemu-devel] [PULL v2 02/50] blockdev: Fix 'change' for slot devices Max Reitz
2016-02-02 17:34 ` [Qemu-devel] [PULL v2 03/50] Revert "hw/block/fdc: Implement tray status" Max Reitz
2016-02-02 17:34 ` [Qemu-devel] [PULL v2 04/50] block/qapi: Emit tray_open only if there is a tray Max Reitz
2016-02-02 17:34 ` [Qemu-devel] [PULL v2 05/50] vmdk: Fix converting to streamOptimized Max Reitz
2016-02-02 17:34 ` [Qemu-devel] [PULL v2 06/50] iotests: Limit supported formats for 118 Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 07/50] nbd: client_close on error in nbd_co_client_start Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 08/50] iotests: Rename filter_nbd to _filter_nbd in 083 Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 09/50] iotests: Change coding style of " Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 10/50] iotests: Move _filter_nbd into common.filter Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 11/50] iotests: Make _filter_nbd drop log lines Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 12/50] iotests: Make _filter_nbd support more URL types Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 13/50] iotests: Make redirecting qemu's stderr optional Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 14/50] iotests: Add test for a nonexistent NBD export Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 15/50] block: Remove unused struct definition BlockFinishData Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 16/50] block: Release named dirty bitmaps in bdrv_close() Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 17/50] iotests: Add test for eject under NBD server Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 18/50] block: Add BB-BDS remove/insert notifiers Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 19/50] virtio-blk: Functions for op blocker management Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 20/50] virtio-scsi: Catch BDS-BB removal/insertion Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 21/50] nbd: Switch from close to eject notifier Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 22/50] block: Remove BDS close notifier Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 23/50] block: Use blk_remove_bs() in blk_delete() Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 24/50] blockdev: Use blk_remove_bs() in do_drive_del() Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 25/50] block: Make bdrv_close() static Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 26/50] block: Add list of all BlockDriverStates Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 27/50] blockdev: Keep track of monitor-owned BDS Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 28/50] block: Add blk_remove_all_bs() Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 29/50] block: Rewrite bdrv_close_all() Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 30/50] iotests: Add test for multiple BB on BDS tree Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 31/50] iotests: Add test for block jobs and BDS ejection Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 32/50] block: acquire in bdrv_query_image_info Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 33/50] block: Add "file" output parameter to block status query functions Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 34/50] qcow: Assign bs->file->bs to file in qcow_co_get_block_status Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 35/50] qcow2: Assign bs->file->bs to file in qcow2_co_get_block_status Max Reitz
2016-02-02 17:35 ` Max Reitz [this message]
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 37/50] iscsi: Assign bs to file in iscsi_co_get_block_status Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 38/50] parallels: Assign bs->file->bs to file in parallels_co_get_block_status Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 39/50] qed: Assign bs->file->bs to file in bdrv_qed_co_get_block_status Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 40/50] sheepdog: Assign bs to file in sd_co_get_block_status Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 41/50] vdi: Assign bs->file->bs to file in vdi_co_get_block_status Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 42/50] vpc: Assign bs->file->bs to file in vpc_co_get_block_status Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 43/50] vmdk: Fix calculation of block status's offset Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 44/50] vmdk: Return extent's file in bdrv_get_block_status Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 45/50] block: Use returned *file in bdrv_co_get_block_status Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 46/50] qemu-img: In "map", use the returned "file" from bdrv_get_block_status Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 47/50] qemu-img: Make MapEntry a QAPI struct Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 48/50] iotests: Add "qemu-img map" test for VMDK extents Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 49/50] block: set device_list.tqe_prev to NULL on BDS removal Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 50/50] block: qemu-iotests - add test for snapshot, commit, snapshot bug Max Reitz
2016-02-02 20:25 ` [Qemu-devel] [PULL v2 00/50] 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=1454434543-25963-37-git-send-email-mreitz@redhat.com \
    --to=mreitz@redhat.com \
    --cc=qemu-block@nongnu.org \
    --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).