[Qemu-commits] [qemu/qemu] 269ee2: nbd/server: Kill pointless shadowed variable

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 269ee27e99cfbff983a9ab067ae22f6182f11fe2
      
https://github.com/qemu/qemu/commit/269ee27e99cfbff983a9ab067ae22f6182f11fe2
  Author: Eric Blake <address@hidden>
  Date:   2019-02-11 (Mon, 11 Feb 2019)

  Changed paths:
    M nbd/server.c

  Log Message:
  -----------
  nbd/server: Kill pointless shadowed variable

lgtm.com pointed out that commit 678ba275 introduced a shadowed
declaration of local variable 'bs'; thankfully, the inner 'bs'
obtained by 'blk_bs(blk)' matches the outer one given that we had
'blk_insert_bs(blk, bs, errp)' a few lines earlier, and there are
no later uses of 'bs' beyond the scope of the 'if (bitmap)' to
care if we change the value stored in 'bs' while traveling the
backing chain to find a bitmap.  So simply get rid of the extra
declaration.

Reported-by: Peter Maydell <address@hidden>
Signed-off-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Eric Blake <address@hidden>


  Commit: 1bf6e9ca9234e1dbcaa18baa06eca9d55cc2dbbb
      
https://github.com/qemu/qemu/commit/1bf6e9ca9234e1dbcaa18baa06eca9d55cc2dbbb
  Author: Andrey Shinkevich <address@hidden>
  Date:   2019-02-11 (Mon, 11 Feb 2019)

  Changed paths:
    M block.c
    M block/crypto.c
    M block/qapi.c
    M block/qcow2.c
    M block/vmdk.c
    M include/block/block.h
    M include/block/block_int.h
    M qemu-io-cmds.c

  Log Message:
  -----------
  bdrv_query_image_info Error parameter added

Inform a user in case qcow2_get_specific_info fails to obtain
QCOW2 image specific information. This patch is preliminary to
the one "qcow2: Add list of bitmaps to ImageInfoSpecificQCow2".

Signed-off-by: Andrey Shinkevich <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Eric Blake <address@hidden>


  Commit: b8968c875f4030dd6924d6971bb3d92dfa3d2f65
      
https://github.com/qemu/qemu/commit/b8968c875f4030dd6924d6971bb3d92dfa3d2f65
  Author: Andrey Shinkevich <address@hidden>
  Date:   2019-02-11 (Mon, 11 Feb 2019)

  Changed paths:
    M block/qcow2-bitmap.c
    M block/qcow2.c
    M block/qcow2.h
    M qapi/block-core.json

  Log Message:
  -----------
  qcow2: Add list of bitmaps to ImageInfoSpecificQCow2

In the 'Format specific information' section of the 'qemu-img info'
command output, the supplemental information about existing QCOW2
bitmaps will be shown, such as a bitmap name, flags and granularity:

image: /vz/vmprivate/VM1/harddisk.hdd
file format: qcow2
virtual size: 64G (68719476736 bytes)
disk size: 3.0M
cluster_size: 1048576
Format specific information:
    compat: 1.1
    lazy refcounts: true
    bitmaps:
        [0]:
            flags:
                [0]: in-use
                [1]: auto
            name: back-up1
            granularity: 65536
        [1]:
            flags:
                [0]: in-use
                [1]: auto
            name: back-up2
            granularity: 65536
    refcount bits: 16
    corrupt: false

Signed-off-by: Andrey Shinkevich <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Eric Blake <address@hidden>


  Commit: ddd113beedd22908e676d53803843d2f85bf91ab
      
https://github.com/qemu/qemu/commit/ddd113beedd22908e676d53803843d2f85bf91ab
  Author: Andrey Shinkevich <address@hidden>
  Date:   2019-02-11 (Mon, 11 Feb 2019)

  Changed paths:
    A tests/qemu-iotests/242
    A tests/qemu-iotests/242.out
    M tests/qemu-iotests/group

  Log Message:
  -----------
  qcow2: list of bitmaps new test 242

A new test file 242 added to the qemu-iotests set. It checks
the format of qcow2 specific information for the new added
section that lists details of bitmaps.

Signed-off-by: Andrey Shinkevich <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
[eblake: pep8 compliance, avoid trailing blank line]
Reviewed-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Signed-off-by: Eric Blake <address@hidden>


  Commit: d85e60e993808d69287dd5e3734642421e23ec45
      
https://github.com/qemu/qemu/commit/d85e60e993808d69287dd5e3734642421e23ec45
  Author: Peter Maydell <address@hidden>
  Date:   2019-02-12 (Tue, 12 Feb 2019)

  Changed paths:
    M block.c
    M block/crypto.c
    M block/qapi.c
    M block/qcow2-bitmap.c
    M block/qcow2.c
    M block/qcow2.h
    M block/vmdk.c
    M include/block/block.h
    M include/block/block_int.h
    M nbd/server.c
    M qapi/block-core.json
    M qemu-io-cmds.c
    A tests/qemu-iotests/242
    A tests/qemu-iotests/242.out
    M tests/qemu-iotests/group

  Log Message:
  -----------
  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 <address@hidden>" [full]
# gpg:                 aka "Eric Blake (Free Software Programmer) 
<address@hidden>" [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 <address@hidden>


Compare: https://github.com/qemu/qemu/compare/22c5f446514a...d85e60e99380