[Qemu-commits] [qemu/qemu] 7725b8: block/nfs: add support for setting debug level

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 7725b8bf129de6887fb680da28775fab5eded914
      
https://github.com/qemu/qemu/commit/7725b8bf129de6887fb680da28775fab5eded914
  Author: Peter Lieven <address@hidden>
  Date:   2016-02-29 (Mon, 29 Feb 2016)

  Changed paths:
    M block/nfs.c

  Log Message:
  -----------
  block/nfs: add support for setting debug level

recent libnfs versions support logging debug messages. Add
support for it in qemu through an URL parameter.

Example:
 qemu -cdrom nfs://127.0.0.1/iso/my.iso?debug=2

Signed-off-by: Peter Lieven <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Message-id: address@hidden
Signed-off-by: Jeff Cody <address@hidden>


  Commit: eab8eb8db39813a4ef4655f04128058494a3c4d3
      
https://github.com/qemu/qemu/commit/eab8eb8db39813a4ef4655f04128058494a3c4d3
  Author: Vasiliy Tolstov <address@hidden>
  Date:   2016-02-29 (Mon, 29 Feb 2016)

  Changed paths:
    M block/sheepdog.c

  Log Message:
  -----------
  sheepdog: allow to delete snapshot

This patch implements a blockdriver function bdrv_snapshot_delete() in
the sheepdog driver. With the new function, snapshots of sheepdog can
be deleted from libvirt.

Cc: Jeff Cody <address@hidden>
Signed-off-by: Hitoshi Mitake <address@hidden>
Signed-off-by: Vasiliy Tolstov <address@hidden>
Message-id: address@hidden
Signed-off-by: Jeff Cody <address@hidden>


  Commit: 60390a2192e7b38aee18db6ce7fb740498709737
      
https://github.com/qemu/qemu/commit/60390a2192e7b38aee18db6ce7fb740498709737
  Author: Daniel P. Berrange <address@hidden>
  Date:   2016-02-29 (Mon, 29 Feb 2016)

  Changed paths:
    M block/rbd.c

  Log Message:
  -----------
  rbd: add support for getting password from QCryptoSecret object

Currently RBD passwords must be provided on the command line
via

  $QEMU -drive file=rbd:pool/image:id=myname:\
         key=QVFDVm41aE82SHpGQWhBQXEwTkN2OGp0SmNJY0UrSE9CbE1RMUE=:\
         auth_supported=cephx

This is insecure because the key is visible in the OS process
listing.

This adds support for an 'password-secret' parameter in the RBD
parameters that can be used with the QCryptoSecret object to
provide the password via a file:

  echo "QVFDVm41aE82SHpGQWhBQXEwTkN2OGp0SmNJY0UrSE9CbE1RMUE=" > poolkey.b64
  $QEMU -object secret,id=secret0,file=poolkey.b64,format=base64 \
  -drive driver=rbd,filename=rbd:pool/image:id=myname:\
         auth_supported=cephx,password-secret=secret0

Reviewed-by: Josh Durgin <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>
Message-id: address@hidden
Signed-off-by: Jeff Cody <address@hidden>


  Commit: 1bff96064290b2e9594dcbeea967b3d8cc76e2b2
      
https://github.com/qemu/qemu/commit/1bff96064290b2e9594dcbeea967b3d8cc76e2b2
  Author: Daniel P. Berrange <address@hidden>
  Date:   2016-02-29 (Mon, 29 Feb 2016)

  Changed paths:
    M block/curl.c

  Log Message:
  -----------
  curl: add support for HTTP authentication parameters

If connecting to a web server which has authentication
turned on, QEMU gets a 401 as curl has not been configured
with any authentication credentials.

This adds 4 new parameters to the curl block driver
options 'username', 'password-secret', 'proxy-username'
and 'proxy-password-secret'. Passwords are provided using
the recently added 'secret' object type

 $QEMU \
     -object secret,id=sec0,filename=/home/berrange/example.pw \
     -object secret,id=sec1,filename=/home/berrange/proxy.pw \
     -drive driver=http,url=http://example.com/some.img,\
      username=dan,password-secret=sec0,\
      proxy-username=dan,proxy-password-secret=sec1

Of course it is possible to use the same secret for both the
proxy & server passwords if desired, or omit the proxy auth
details, or the server auth details as required.

Signed-off-by: Daniel P. Berrange <address@hidden>
Message-id: address@hidden
Signed-off-by: Jeff Cody <address@hidden>


  Commit: b189346eb1784df95ed6fed610411dbf23d19e1f
      
https://github.com/qemu/qemu/commit/b189346eb1784df95ed6fed610411dbf23d19e1f
  Author: Daniel P. Berrange <address@hidden>
  Date:   2016-02-29 (Mon, 29 Feb 2016)

  Changed paths:
    M block/iscsi.c

  Log Message:
  -----------
  iscsi: add support for getting CHAP password via QCryptoSecret API

The iSCSI driver currently accepts the CHAP password in plain text
as a block driver property. This change adds a new "password-secret"
property that accepts the ID of a QCryptoSecret instance.

  $QEMU \
     -object secret,id=sec0,filename=/home/berrange/example.pw \
     -drive driver=iscsi,url=iscsi://example.com/target-foo/lun1,\
      user=dan,password-secret=sec0

Signed-off-by: Daniel P. Berrange <address@hidden>
Message-id: address@hidden
Signed-off-by: Jeff Cody <address@hidden>


  Commit: 939901dcd2093a5d6b40420314d1af8b185ec43c
      
https://github.com/qemu/qemu/commit/939901dcd2093a5d6b40420314d1af8b185ec43c
  Author: Max Reitz <address@hidden>
  Date:   2016-02-29 (Mon, 29 Feb 2016)

  Changed paths:
    M block/vhdx.c

  Log Message:
  -----------
  vhdx: DIV_ROUND_UP() in vhdx_calc_bat_entries()

We have DIV_ROUND_UP(), so we can use it to produce more easily readable
code. It may be slower than the bit shifting currently performed
(because it actually performs a division), but since
vhdx_calc_bat_entries() is never used in a hot path, this is completely
fine.

Signed-off-by: Max Reitz <address@hidden>
Message-id: address@hidden
Signed-off-by: Jeff Cody <address@hidden>


  Commit: 04a3615860d693cbf5da015ee136a313628a42be
      
https://github.com/qemu/qemu/commit/04a3615860d693cbf5da015ee136a313628a42be
  Author: Max Reitz <address@hidden>
  Date:   2016-02-29 (Mon, 29 Feb 2016)

  Changed paths:
    M block/vhdx.c

  Log Message:
  -----------
  vhdx: Simplify vhdx_set_shift_bits()

For values which are powers of two (and we do assume all of these to
be), sizeof(x) * 8 - 1 - clz(x) == ctz(x). Therefore, use ctz().

Signed-off-by: Max Reitz <address@hidden>
Message-id: address@hidden
Signed-off-by: Jeff Cody <address@hidden>


  Commit: e5b43573e28b226621ac6ed9ad71e1a72d71922d
      
https://github.com/qemu/qemu/commit/e5b43573e28b226621ac6ed9ad71e1a72d71922d
  Author: Fam Zheng <address@hidden>
  Date:   2016-02-29 (Mon, 29 Feb 2016)

  Changed paths:
    M block/mirror.c
    M tests/qemu-iotests/109.out
    M trace-events

  Log Message:
  -----------
  mirror: Rewrite mirror_iteration

The "pnum < nb_sectors" condition in deciding whether to actually copy
data is unnecessarily strict, and the qiov initialization is
unnecessarily for bdrv_aio_write_zeroes and bdrv_aio_discard.

Rewrite mirror_iteration to fix both flaws.

The output of iotests 109 is updated because we now report the offset
and len slightly differently in mirroring progress.

Signed-off-by: Fam Zheng <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Message-id: address@hidden
Signed-off-by: Jeff Cody <address@hidden>


  Commit: 21cd917ff5ff30dbba49dd805da033f8c92fa958
      
https://github.com/qemu/qemu/commit/21cd917ff5ff30dbba49dd805da033f8c92fa958
  Author: Fam Zheng <address@hidden>
  Date:   2016-02-29 (Mon, 29 Feb 2016)

  Changed paths:
    M block/mirror.c

  Log Message:
  -----------
  mirror: Add mirror_wait_for_io

The three lines are duplicated a number of times now, refactor a
function.

Signed-off-by: Fam Zheng <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Message-id: address@hidden
Signed-off-by: Jeff Cody <address@hidden>


  Commit: 16096a4d4789ef1f260484b4cc18b8327cf0c928
      
https://github.com/qemu/qemu/commit/16096a4d4789ef1f260484b4cc18b8327cf0c928
  Author: John Snow <address@hidden>
  Date:   2016-02-29 (Mon, 29 Feb 2016)

  Changed paths:
    M block/backup.c

  Log Message:
  -----------
  block/backup: make backup cluster size configurable

64K might not always be appropriate, make this a runtime value.

Signed-off-by: John Snow <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Message-id: address@hidden
Signed-off-by: Jeff Cody <address@hidden>


  Commit: 4c9bca7e39a6e07ad02c1dcde3478363344ec60b
      
https://github.com/qemu/qemu/commit/4c9bca7e39a6e07ad02c1dcde3478363344ec60b
  Author: John Snow <address@hidden>
  Date:   2016-02-29 (Mon, 29 Feb 2016)

  Changed paths:
    M block/backup.c

  Log Message:
  -----------
  block/backup: avoid copying less than full target clusters

During incremental backups, if the target has a cluster size that is
larger than the backup cluster size and we are backing up to a target
that cannot (for whichever reason) pull clusters up from a backing image,
we may inadvertantly create unusable incremental backup images.

For example:

If the bitmap tracks changes at a 64KB granularity and we transmit 64KB
of data at a time but the target uses a 128KB cluster size, it is
possible that only half of a target cluster will be recognized as dirty
by the backup block job. When the cluster is allocated on the target
image but only half populated with data, we lose the ability to
distinguish between zero padding and uninitialized data.

This does not happen if the target image has a backing file that points
to the last known good backup.

Even if we have a backing file, though, it's likely going to be faster
to just buffer the redundant data ourselves from the live image than
fetching it from the backing file, so let's just always round up to the
target granularity.

The same logic applies to backup modes top, none, and full. Copying
fractional clusters without the guarantee of COW is dangerous, but even
if we can rely on COW, it's likely better to just re-copy the data.

Reported-by: Fam Zheng <address@hidden>
Signed-off-by: John Snow <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Message-id: address@hidden
Signed-off-by: Jeff Cody <address@hidden>


  Commit: cc199b16cf4cb9279aca73f5f5dce2cc337b9079
      
https://github.com/qemu/qemu/commit/cc199b16cf4cb9279aca73f5f5dce2cc337b9079
  Author: John Snow <address@hidden>
  Date:   2016-02-29 (Mon, 29 Feb 2016)

  Changed paths:
    M tests/qemu-iotests/124
    M tests/qemu-iotests/124.out

  Log Message:
  -----------
  iotests/124: Add cluster_size mismatch test

If a backing file isn't specified in the target image and the
cluster_size is larger than the bitmap granularity, we run the risk of
creating bitmaps with allocated clusters but empty/no data which will
prevent the proper reading of the backup in the future.

Signed-off-by: John Snow <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Message-id: address@hidden
Signed-off-by: Jeff Cody <address@hidden>


  Commit: 9c74a853048f14fd9a3e2efa1e3a6935d00e7495
      
https://github.com/qemu/qemu/commit/9c74a853048f14fd9a3e2efa1e3a6935d00e7495
  Author: Peter Maydell <address@hidden>
  Date:   2016-03-01 (Tue, 01 Mar 2016)

  Changed paths:
    M block/backup.c
    M block/curl.c
    M block/iscsi.c
    M block/mirror.c
    M block/nfs.c
    M block/rbd.c
    M block/sheepdog.c
    M block/vhdx.c
    M tests/qemu-iotests/109.out
    M tests/qemu-iotests/124
    M tests/qemu-iotests/124.out
    M trace-events

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into 
staging

# gpg: Signature made Mon 29 Feb 2016 20:08:16 GMT using RSA key ID C0DE3057
# gpg: Good signature from "Jeffrey Cody <address@hidden>"
# gpg:                 aka "Jeffrey Cody <address@hidden>"
# gpg:                 aka "Jeffrey Cody <address@hidden>"

* remotes/cody/tags/block-pull-request:
  iotests/124: Add cluster_size mismatch test
  block/backup: avoid copying less than full target clusters
  block/backup: make backup cluster size configurable
  mirror: Add mirror_wait_for_io
  mirror: Rewrite mirror_iteration
  vhdx: Simplify vhdx_set_shift_bits()
  vhdx: DIV_ROUND_UP() in vhdx_calc_bat_entries()
  iscsi: add support for getting CHAP password via QCryptoSecret API
  curl: add support for HTTP authentication parameters
  rbd: add support for getting password from QCryptoSecret object
  sheepdog: allow to delete snapshot
  block/nfs: add support for setting debug level

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/071608b519ad...9c74a853048f