qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] da92c3: block/vxhs.c: Add support for a new b


From: GitHub
Subject: [Qemu-commits] [qemu/qemu] da92c3: block/vxhs.c: Add support for a new block device t...
Date: Tue, 25 Apr 2017 03:15:39 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: da92c3ff60b20392dd34902fb96304c4633b5fba
      
https://github.com/qemu/qemu/commit/da92c3ff60b20392dd34902fb96304c4633b5fba
  Author: Ashish Mittal <address@hidden>
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
    M block/Makefile.objs
    M block/trace-events
    A block/vxhs.c
    M configure
    M qapi/block-core.json

  Log Message:
  -----------
  block/vxhs.c: Add support for a new block device type called "vxhs"

Source code for the qnio library that this code loads can be downloaded from:
https://github.com/VeritasHyperScale/libqnio.git

Sample command line using JSON syntax:
./x86_64-softmmu/qemu-system-x86_64 -name instance-00000008 -S -vnc 0.0.0.0:0
-k en-us -vga cirrus -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5
-msg timestamp=on
'json:{"driver":"vxhs","vdisk-id":"c3e9095a-a5ee-4dce-afeb-2a59fb387410",
"server":{"host":"172.172.17.4","port":"9999"}}'

Sample command line using URI syntax:
qemu-img convert -f raw -O raw -n
/var/lib/nova/instances/_base/0c5eacd5ebea5ed914b6a3e7b18f1ce734c386ad
vxhs://192.168.0.1:9999/c6718f6b-0401-441d-a8c3-1f0064d75ee0

Sample command line using TLS credentials (run in secure mode):
./qemu-io --object
tls-creds-x509,id=tls0,dir=/etc/pki/qemu/vxhs,endpoint=client -c 'read
-v 66000 2.5k' 'json:{"server.host": "127.0.0.1", "server.port": "9999",
"vdisk-id": "/test.raw", "driver": "vxhs", "tls-creds":"tls0"}'

[Jeff: Modified trace-events with the correct string formatting]

Signed-off-by: Ashish Mittal <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Jeff Cody <address@hidden>
Signed-off-by: Jeff Cody <address@hidden>
Message-id: address@hidden


  Commit: ae0c0a3decabba6b710d8e6902d43495f7490de2
      
https://github.com/qemu/qemu/commit/ae0c0a3decabba6b710d8e6902d43495f7490de2
  Author: Ashish Mittal <address@hidden>
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
    M tests/qemu-iotests/common
    M tests/qemu-iotests/common.config
    M tests/qemu-iotests/common.filter
    M tests/qemu-iotests/common.rc

  Log Message:
  -----------
  block/vxhs.c: Add qemu-iotests for new block device type "vxhs"

These changes use a vxhs test server that is a part of the following
repository:
https://github.com/VeritasHyperScale/libqnio.git

Signed-off-by: Ashish Mittal <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Jeff Cody <address@hidden>
Signed-off-by: Jeff Cody <address@hidden>
Message-id: address@hidden


  Commit: a98f49f46abb2034277633405479a4ab790c381e
      
https://github.com/qemu/qemu/commit/a98f49f46abb2034277633405479a4ab790c381e
  Author: Jeff Cody <address@hidden>
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
    M tests/qemu-iotests/017
    M tests/qemu-iotests/020
    M tests/qemu-iotests/029
    M tests/qemu-iotests/073
    M tests/qemu-iotests/114
    M tests/qemu-iotests/130
    M tests/qemu-iotests/134
    M tests/qemu-iotests/156
    M tests/qemu-iotests/158

  Log Message:
  -----------
  qemu-iotests: exclude vxhs from image creation via protocol

The protocol VXHS does not support image creation.  Some tests expect
to be able to create images through the protocol.  Exclude VXHS from
these tests.

Signed-off-by: Jeff Cody <address@hidden>


  Commit: fe5241bfe3fb61ec3f589ceacd91c1469bfd400f
      
https://github.com/qemu/qemu/commit/fe5241bfe3fb61ec3f589ceacd91c1469bfd400f
  Author: Jeff Cody <address@hidden>
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
    M block.c
    M block/bochs.c
    M block/cloop.c
    M block/dmg.c
    M block/rbd.c
    M block/vvfat.c
    M include/block/block.h

  Log Message:
  -----------
  block: add bdrv_set_read_only() helper function

We have a helper wrapper for checking for the BDS read_only flag,
add a helper wrapper to set the read_only flag as well.

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


  Commit: e2b8247a322cd92945785edf25f09e6b3e8285f9
      
https://github.com/qemu/qemu/commit/e2b8247a322cd92945785edf25f09e6b3e8285f9
  Author: Jeff Cody <address@hidden>
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
    M block.c
    M block/bochs.c
    M block/cloop.c
    M block/dmg.c
    M block/rbd.c
    M block/vvfat.c
    M include/block/block.h

  Log Message:
  -----------
  block: do not set BDS read_only if copy_on_read enabled

A few block drivers will set the BDS read_only flag from their
.bdrv_open() function.  This means the bs->read_only flag could
be set after we enable copy_on_read, as the BDRV_O_COPY_ON_READ
flag check occurs prior to the call to bdrv->bdrv_open().

This adds an error return to bdrv_set_read_only(), and an error will be
return if we try to set the BDS to read_only while copy_on_read is
enabled.

This patch also changes the behavior of vvfat.  Before, vvfat could
override the drive 'readonly' flag with its own, internal 'rw' flag.

For instance, this -drive parameter would result in a writable image:

"-drive format=vvfat,dir=/tmp/vvfat,rw,if=virtio,readonly=on"

This is not correct.  Now, attempting to use the above -drive parameter
will result in an error (i.e., 'rw' is incompatible with 'readonly=on').

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


  Commit: d6fcdf06d9fc7d72151cc2069dc5c1adf5c21707
      
https://github.com/qemu/qemu/commit/d6fcdf06d9fc7d72151cc2069dc5c1adf5c21707
  Author: Jeff Cody <address@hidden>
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
    M block.c

  Log Message:
  -----------
  block: honor BDRV_O_ALLOW_RDWR when clearing bs->read_only

The BDRV_O_ALLOW_RDWR flag allows / prohibits the changing of
the BDS 'read_only' state, but there are a few places where it
is ignored.  In the bdrv_set_read_only() helper, make sure to
honor the flag.

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


  Commit: 93ed524e3de732f70b3b042e3c56bc4ed719498d
      
https://github.com/qemu/qemu/commit/93ed524e3de732f70b3b042e3c56bc4ed719498d
  Author: Jeff Cody <address@hidden>
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
    M block.c

  Log Message:
  -----------
  block: code movement

Move bdrv_is_read_only() up with its friends.

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


  Commit: 45803a039670cbee914dcb54cf3952f9b2d64d1f
      
https://github.com/qemu/qemu/commit/45803a039670cbee914dcb54cf3952f9b2d64d1f
  Author: Jeff Cody <address@hidden>
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
    M block.c
    M include/block/block.h

  Log Message:
  -----------
  block: introduce bdrv_can_set_read_only()

Introduce check function for setting read_only flags.  Will return < 0 on
error, with appropriate Error value set.  Does not alter any flags.

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


  Commit: 3d8ce171cb4a62b55727bc949e2e9427f77de6fb
      
https://github.com/qemu/qemu/commit/3d8ce171cb4a62b55727bc949e2e9427f77de6fb
  Author: Jeff Cody <address@hidden>
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
    M block.c

  Log Message:
  -----------
  block: use bdrv_can_set_read_only() during reopen

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


  Commit: 80b61a27c69c67492ce87ddd63ee497b5bc00e7e
      
https://github.com/qemu/qemu/commit/80b61a27c69c67492ce87ddd63ee497b5bc00e7e
  Author: Jeff Cody <address@hidden>
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
    M block/rbd.c

  Log Message:
  -----------
  block/rbd - update variable names to more apt names

Update 'clientname' to be 'user', which tracks better with both
the QAPI and rados variable naming.

Update 'name' to be 'image_name', as it indicates the rbd image.
Naming it 'image' would have been ideal, but we are using that for
the rados_image_t value returned by rbd_open().

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


  Commit: 56e7cf8df03ae142c7797435dc0ece80a42f4fd0
      
https://github.com/qemu/qemu/commit/56e7cf8df03ae142c7797435dc0ece80a42f4fd0
  Author: Jeff Cody <address@hidden>
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
    M block/rbd.c

  Log Message:
  -----------
  block/rbd: Add support for reopen()

This adds support for reopen in rbd, for changing between r/w and r/o.

Note, that this is only a flag change, but we will block a change from
r/o to r/w if we are using an RBD internal snapshot.

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


  Commit: ecfa185400ade2abc9915efa924cbad1e15a21a4
      
https://github.com/qemu/qemu/commit/ecfa185400ade2abc9915efa924cbad1e15a21a4
  Author: Jeff Cody <address@hidden>
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
    M tests/qemu-iotests/028
    M tests/qemu-iotests/094
    M tests/qemu-iotests/102
    M tests/qemu-iotests/109
    M tests/qemu-iotests/117
    M tests/qemu-iotests/130
    M tests/qemu-iotests/140
    M tests/qemu-iotests/141
    M tests/qemu-iotests/143
    M tests/qemu-iotests/156

  Log Message:
  -----------
  qemu-iotests: _cleanup_qemu must be called on exit

For the tests that use the common.qemu functions for running a QEMU
process, _cleanup_qemu must be called in the exit function.

If it is not, if the qemu process aborts, then not all of the droppings
are cleaned up (e.g. pidfile, fifos).

This updates those tests that did not have a cleanup in qemu-iotests.

(I swapped spaces for tabs in test 102 as well)

Reported-by: Eric Blake <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Jeff Cody <address@hidden>
Message-id: address@hidden


  Commit: f4b5b021c847669b1c78050aea26fe9abceef6dd
      
https://github.com/qemu/qemu/commit/f4b5b021c847669b1c78050aea26fe9abceef6dd
  Author: Peter Maydell <address@hidden>
  Date:   2017-04-25 (Tue, 25 Apr 2017)

  Changed paths:
    M block.c
    M block/Makefile.objs
    M block/bochs.c
    M block/cloop.c
    M block/dmg.c
    M block/rbd.c
    M block/trace-events
    M block/vvfat.c
    A block/vxhs.c
    M configure
    M include/block/block.h
    M qapi/block-core.json
    M tests/qemu-iotests/017
    M tests/qemu-iotests/020
    M tests/qemu-iotests/028
    M tests/qemu-iotests/029
    M tests/qemu-iotests/073
    M tests/qemu-iotests/094
    M tests/qemu-iotests/102
    M tests/qemu-iotests/109
    M tests/qemu-iotests/114
    M tests/qemu-iotests/117
    M tests/qemu-iotests/130
    M tests/qemu-iotests/134
    M tests/qemu-iotests/140
    M tests/qemu-iotests/141
    M tests/qemu-iotests/143
    M tests/qemu-iotests/156
    M tests/qemu-iotests/158
    M tests/qemu-iotests/common
    M tests/qemu-iotests/common.config
    M tests/qemu-iotests/common.filter
    M tests/qemu-iotests/common.rc

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

# gpg: Signature made Mon 24 Apr 2017 20:18:05 BST
# gpg:                using RSA key 0xBDBE7B27C0DE3057
# gpg: Good signature from "Jeffrey Cody <address@hidden>"
# gpg:                 aka "Jeffrey Cody <address@hidden>"
# gpg:                 aka "Jeffrey Cody <address@hidden>"
# Primary key fingerprint: 9957 4B4D 3474 90E7 9D98  D624 BDBE 7B27 C0DE 3057

* remotes/cody/tags/block-pull-request:
  qemu-iotests: _cleanup_qemu must be called on exit
  block/rbd: Add support for reopen()
  block/rbd - update variable names to more apt names
  block: use bdrv_can_set_read_only() during reopen
  block: introduce bdrv_can_set_read_only()
  block: code movement
  block: honor BDRV_O_ALLOW_RDWR when clearing bs->read_only
  block: do not set BDS read_only if copy_on_read enabled
  block: add bdrv_set_read_only() helper function
  qemu-iotests: exclude vxhs from image creation via protocol
  block/vxhs.c: Add qemu-iotests for new block device type "vxhs"
  block/vxhs.c: Add support for a new block device type called "vxhs"

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


Compare: https://github.com/qemu/qemu/compare/eab1e53cacfb...f4b5b021c847

reply via email to

[Prev in Thread] Current Thread [Next in Thread]