diff options
| author | Peter Maydell | 2019-02-12 10:51:50 +0100 |
|---|---|---|
| committer | Peter Maydell | 2019-02-12 10:51:50 +0100 |
| commit | d85e60e993808d69287dd5e3734642421e23ec45 (patch) | |
| tree | 9221f570449fe6983510ee7d7482110ddbd63abe /nbd/server.c | |
| parent | Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20190211' into staging (diff) | |
| parent | qcow2: list of bitmaps new test 242 (diff) | |
| download | qemu-d85e60e993808d69287dd5e3734642421e23ec45.tar.gz qemu-d85e60e993808d69287dd5e3734642421e23ec45.tar.xz qemu-d85e60e993808d69287dd5e3734642421e23ec45.zip | |
Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2019-02-11' into staging
nbd patches for 2019-02-11
- Add qcow2 bitmap details to 'qemu-img info'
# gpg: Signature made Mon 11 Feb 2019 20:38:32 GMT
# gpg: using RSA key A7A16B4A2527436A
# gpg: Good signature from "Eric Blake <eblake@redhat.com>" [full]
# gpg: aka "Eric Blake (Free Software Programmer) <ebb9@byu.net>" [full]
# gpg: aka "[jpeg image of size 6874]" [full]
# Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2 F3AA A7A1 6B4A 2527 436A
* remotes/ericb/tags/pull-nbd-2019-02-11:
qcow2: list of bitmaps new test 242
qcow2: Add list of bitmaps to ImageInfoSpecificQCow2
bdrv_query_image_info Error parameter added
nbd/server: Kill pointless shadowed variable
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'nbd/server.c')
| -rw-r--r-- | nbd/server.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/nbd/server.c b/nbd/server.c index 838c150d8c..0910d09a6d 100644 --- a/nbd/server.c +++ b/nbd/server.c @@ -1495,7 +1495,6 @@ NBDExport *nbd_export_new(BlockDriverState *bs, uint64_t dev_offset, if (bitmap) { BdrvDirtyBitmap *bm = NULL; - BlockDriverState *bs = blk_bs(blk); while (true) { bm = bdrv_find_dirty_bitmap(bs, bitmap); |