[Qemu-commits] [qemu/qemu] 6bb451: block: kill tail whitespace in block.c

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 6bb4515849315460bdea45fa56ca656cead7c8ed
      
https://github.com/qemu/qemu/commit/6bb4515849315460bdea45fa56ca656cead7c8ed
  Author: Liu Yuan <address@hidden>
  Date:   2014-09-08 (Mon, 08 Sep 2014)

  Changed paths:
    M block.c

  Log Message:
  -----------
  block: kill tail whitespace in block.c

Cc: Kevin Wolf <address@hidden>
Cc: Stefan Hajnoczi <address@hidden>
Signed-off-by: Liu Yuan <address@hidden>
Reviewed-by: Benoît Canet <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: afeb25f9263e470ad715cab2b79b8965c0519fb7
      
https://github.com/qemu/qemu/commit/afeb25f9263e470ad715cab2b79b8965c0519fb7
  Author: Laszlo Ersek <address@hidden>
  Date:   2014-09-08 (Mon, 08 Sep 2014)

  Changed paths:
    M hw/block/pflash_cfi01.c

  Log Message:
  -----------
  pflash_cfi01: fixup stale DPRINTF() calls

Signed-off-by: Laszlo Ersek <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 4c0cfc72b31a79f737a64ebbe0411e4b83e25771
      
https://github.com/qemu/qemu/commit/4c0cfc72b31a79f737a64ebbe0411e4b83e25771
  Author: Laszlo Ersek <address@hidden>
  Date:   2014-09-08 (Mon, 08 Sep 2014)

  Changed paths:
    M hw/block/pflash_cfi01.c

  Log Message:
  -----------
  pflash_cfi01: write flash contents to bdrv on incoming migration

A drive that backs a pflash device is special:
- it is very small,
- its entire contents are kept in a RAMBlock at all times, covering the
  guest-phys address range that provides the guest's view of the emulated
  flash chip.

The pflash device model keeps the drive (the host-side file) and the
guest-visible flash contents in sync. When migrating the guest, the
guest-visible flash contents (the RAMBlock) is migrated by default, but on
the target host, the drive (the host-side file) remains in full sync with
the RAMBlock only if:
- the source and target hosts share the storage underlying the pflash
  drive,
- or the migration requests full or incremental block migration too, which
  then covers all drives.

Due to the special nature of pflash drives, the following scenario makes
sense as well:
- no full nor incremental block migration, covering all drives, alongside
  the base migration (justified eg. by shared storage for "normal" (big)
  drives),
- non-shared storage for pflash drives.

In this case, currently only those portions of the flash drive are updated
on the target disk that the guest reprograms while running on the target
host.

In order to restore accord, dump the entire flash contents to the bdrv in
a post_load() callback.

- The read-only check follows the other call-sites of pflash_update();
- both "pfl->ro" and pflash_update() reflect / consider the case when
  "pfl->bs" is NULL;
- the total size of the flash device is calculated as in
  pflash_cfi01_realize().

When using shared storage, or requesting full or incremental block
migration along with the normal migration, the patch should incur a
harmless rewrite from the target side.

It is assumed that, on the target host, RAM is loaded ahead of the call to
pflash_post_load().

Suggested-by: Paolo Bonzini <address@hidden>
Signed-off-by: Laszlo Ersek <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 311e666aea7164b6d3b8a7e845fb32a509bfdf08
      
https://github.com/qemu/qemu/commit/311e666aea7164b6d3b8a7e845fb32a509bfdf08
  Author: Marc Marí <address@hidden>
  Date:   2014-09-08 (Mon, 08 Sep 2014)

  Changed paths:
    M tests/Makefile
    A tests/libqos/virtio-pci.c
    A tests/libqos/virtio-pci.h
    A tests/libqos/virtio.h
    M tests/virtio-blk-test.c

  Log Message:
  -----------
  tests: Functions bus_foreach and device_find from libqos virtio API

Virtio header has been changed to compile and work with a real device.
Functions bus_foreach and device_find have been implemented for PCI.
Virtio-blk test case now opens a fake device.

Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Marc Marí <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 46e0cf762985e0a85529efd454402998c5021212
      
https://github.com/qemu/qemu/commit/46e0cf762985e0a85529efd454402998c5021212
  Author: Marc Marí <address@hidden>
  Date:   2014-09-08 (Mon, 08 Sep 2014)

  Changed paths:
    M tests/Makefile
    M tests/libqos/virtio-pci.c
    M tests/libqos/virtio-pci.h
    A tests/libqos/virtio.c
    M tests/libqos/virtio.h
    M tests/libqtest.c
    M tests/libqtest.h
    M tests/virtio-blk-test.c

  Log Message:
  -----------
  tests: Add virtio device initialization

Add functions to read and write virtio header fields.
Add status bit setting in virtio-blk-device.

Signed-off-by: Marc Marí <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: bf3c63d2010c5ef52f8b988bee2a1486a056795f
      
https://github.com/qemu/qemu/commit/bf3c63d2010c5ef52f8b988bee2a1486a056795f
  Author: Marc Marí <address@hidden>
  Date:   2014-09-08 (Mon, 08 Sep 2014)

  Changed paths:
    M tests/libqos/virtio-pci.c
    M tests/libqos/virtio-pci.h
    M tests/libqos/virtio.c
    M tests/libqos/virtio.h
    M tests/virtio-blk-test.c

  Log Message:
  -----------
  libqos: Added basic virtqueue support to virtio implementation

Add status changing and feature negotiation.
Add basic virtqueue support for adding and sending virtqueue requests.
Add ISR checking.

[Squashed request endianness fix by Greg Kurz <address@hidden>
--Stefan]

Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Marc Marí <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: f294b029aa2beb1c67116e04bff5d331f0b18288
      
https://github.com/qemu/qemu/commit/f294b029aa2beb1c67116e04bff5d331f0b18288
  Author: Marc Marí <address@hidden>
  Date:   2014-09-08 (Mon, 08 Sep 2014)

  Changed paths:
    M tests/libqos/virtio-pci.c
    M tests/libqos/virtio.c
    M tests/libqos/virtio.h
    M tests/virtio-blk-test.c

  Log Message:
  -----------
  libqos: Added indirect descriptor support to virtio implementation

Add functions necessary for working with indirect descriptors.
Add test using new functions.

Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Marc Marí <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: e11199554c568822c3ede3e3b4820ac3a146b1d9
      
https://github.com/qemu/qemu/commit/e11199554c568822c3ede3e3b4820ac3a146b1d9
  Author: Marc Marí <address@hidden>
  Date:   2014-09-08 (Mon, 08 Sep 2014)

  Changed paths:
    M tests/virtio-blk-test.c

  Log Message:
  -----------
  libqos: Added test case for configuration changes in virtio-blk test

Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Marc Marí <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 58368113989403775496b3422f22094713703157
      
https://github.com/qemu/qemu/commit/58368113989403775496b3422f22094713703157
  Author: Marc Marí <address@hidden>
  Date:   2014-09-08 (Mon, 08 Sep 2014)

  Changed paths:
    M tests/libqos/pci.c
    M tests/libqos/pci.h
    M tests/libqos/virtio-pci.c
    M tests/libqos/virtio-pci.h
    M tests/libqos/virtio.c
    M tests/libqos/virtio.h
    M tests/virtio-blk-test.c

  Log Message:
  -----------
  libqos: Added MSI-X support

Added MSI-X support for qtest PCI.
Added MSI-X support for virtio-pci.
Added MSI-X test case in virtio-blk-test.

Signed-off-by: Marc Marí <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 1053587c3fb50fb78e18a2e32b90e272c1796de0
      
https://github.com/qemu/qemu/commit/1053587c3fb50fb78e18a2e32b90e272c1796de0
  Author: Marc Marí <address@hidden>
  Date:   2014-09-08 (Mon, 08 Sep 2014)

  Changed paths:
    M tests/libqos/virtio-pci.c
    M tests/libqos/virtio.c
    M tests/libqos/virtio.h
    M tests/virtio-blk-test.c

  Log Message:
  -----------
  libqos: Added EVENT_IDX support

Added avail_event and NO_NOTIFY check before notifying.
Added used_event setting.

Signed-off-by: Marc Marí <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: bb87fdf871d321895b8f5c481977df7a3f74a765
      
https://github.com/qemu/qemu/commit/bb87fdf871d321895b8f5c481977df7a3f74a765
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2014-09-08 (Mon, 08 Sep 2014)

  Changed paths:
    M qemu-img.c
    M qemu-img.texi

  Log Message:
  -----------
  qemu-img: clarify src_cache option documentation

The source cache option takes the same values as the cache option.  The
documentation reads a little strange because it starts with "In contrast
the src_cache option ...".  The fact that this is comparing with the
previous documented option (the 'cache' option) is implicit.  Readers
may be confused, especially if they jump to src_cache without reading
cache documentation first.

Suggested-by: Jeff Nelson <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Max Reitz <address@hidden>


  Commit: 3ba6796d080a90440573ef29d657e4902be7e238
      
https://github.com/qemu/qemu/commit/3ba6796d080a90440573ef29d657e4902be7e238
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2014-09-08 (Mon, 08 Sep 2014)

  Changed paths:
    M qemu-img.texi

  Log Message:
  -----------
  qemu-img: fix rebase src_cache option documentation

The src_cache option (-T) specifies the cache mode for backing files.
It applies both the image's old backing file as well as the new backing
file:

  ret = bdrv_open(&bs_old_backing, backing_name, NULL, NULL, src_flags,
            old_backing_drv, &local_err);
  if (ret) {
      ...
  }
  if (out_baseimg[0]) {
      bs_new_backing = bdrv_new("new_backing", &error_abort);
      ret = bdrv_open(&bs_new_backing, out_baseimg, NULL, NULL, src_flags,
                new_backing_drv, &local_err);
      if (ret) {
    ...
      }
  }

The documentation only mentions the new backing file but it really
applies to both.

Suggested-by: Jeff Nelson <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Max Reitz <address@hidden>


  Commit: 072f9ac44aac54ee9ac006e8b42841abfde48a8b
      
https://github.com/qemu/qemu/commit/072f9ac44aac54ee9ac006e8b42841abfde48a8b
  Author: Chrysostomos Nanakos <address@hidden>
  Date:   2014-09-08 (Mon, 08 Sep 2014)

  Changed paths:
    M block/archipelago.c

  Log Message:
  -----------
  block/archipelago: Use QEMU atomic builtins

Replace __sync builtins with ones provided by QEMU
for atomic operations.

Special thanks goes to Paolo Bonzini for his refactoring
suggestion in order to use the already existing atomic builtins
interface.

Signed-off-by: Chrysostomos Nanakos <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 9e7dac7c6c6003ad9d4aca0125f0278233fcf761
      
https://github.com/qemu/qemu/commit/9e7dac7c6c6003ad9d4aca0125f0278233fcf761
  Author: Peter Lieven <address@hidden>
  Date:   2014-09-08 (Mon, 08 Sep 2014)

  Changed paths:
    M blockdev.c
    A include/qapi/util.h
    M qapi/Makefile.objs
    A qapi/qapi-util.c

  Log Message:
  -----------
  rename parse_enum_option to qapi_enum_parse and make it public

relaxing the license to LGPLv2+ is intentional.

Suggested-by: Markus Armbruster <address@hidden>
Signed-off-by: Hu Tao <address@hidden>
Signed-off-by: Peter Lieven <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Benoit Canet <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: b3838a4088865d1767e137d2b7974b6885822eb2
      
https://github.com/qemu/qemu/commit/b3838a4088865d1767e137d2b7974b6885822eb2
  Author: Peter Lieven <address@hidden>
  Date:   2014-09-08 (Mon, 08 Sep 2014)

  Changed paths:
    M qemu-nbd.c

  Log Message:
  -----------
  qemu-nbd: add option to set detect-zeroes mode

Signed-off-by: Peter Lieven <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Benoit Canet <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 713cc671f107eb8f6ced6ff1e7cf088029619731
      
https://github.com/qemu/qemu/commit/713cc671f107eb8f6ced6ff1e7cf088029619731
  Author: Peter Lieven <address@hidden>
  Date:   2014-09-08 (Mon, 08 Sep 2014)

  Changed paths:
    M qemu-nbd.c

  Log Message:
  -----------
  qemu-nbd: fix indentation and coding style

Signed-off-by: Peter Lieven <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Benoit Canet <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 53b33231f76e85984eb18a4c63fd132d0d4e3f40
      
https://github.com/qemu/qemu/commit/53b33231f76e85984eb18a4c63fd132d0d4e3f40
  Author: MORITA Kazutaka <address@hidden>
  Date:   2014-09-08 (Mon, 08 Sep 2014)

  Changed paths:
    M MAINTAINERS

  Log Message:
  -----------
  MAINTAINERS: update sheepdog maintainer

Hitoshi takes over sheepdog maintenance from me.

Signed-off-by: MORITA Kazutaka <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: ec2f160538a24b72767e2afd1f0ba3085a35b79d
      
https://github.com/qemu/qemu/commit/ec2f160538a24b72767e2afd1f0ba3085a35b79d
  Author: John Snow <address@hidden>
  Date:   2014-09-08 (Mon, 08 Sep 2014)

  Changed paths:
    M tests/libqos/malloc-pc.c
    M tests/libqos/malloc-pc.h

  Log Message:
  -----------
  libqos: add a simple first-fit memory allocator

Implement a simple first-fit memory allocator that
attempts to keep track of leased blocks of memory
in order to be able to re-use blocks.

Additionally, allow the user to specify when
initializing the device that upon cleanup,
we would like to assert that there are no
blocks in use. This may be useful for identifying
problems in qtests that use more complicated
set-up and tear-down routines.

This functionality is used in my upcoming ahci-test v2
patch set, but I didn't see fit to enable it for any
existing tests, which will continue to operate the
same as they have prior.

Signed-off-by: John Snow <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 0142f88bff3dd5cb819c9900da1c1e0a4aae9c44
      
https://github.com/qemu/qemu/commit/0142f88bff3dd5cb819c9900da1c1e0a4aae9c44
  Author: John Snow <address@hidden>
  Date:   2014-09-08 (Mon, 08 Sep 2014)

  Changed paths:
    M tests/ide-test.c

  Log Message:
  -----------
  qtest/ide: Uninitialize PC allocator

Use the new call to pc_alloc_uninit
as a test for the new pathways.

The leak checking / assert pathways are
not enabled in this patch, leaving this
as an option to future test writers.

Signed-off-by: John Snow <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: c5fe97e359bf03db9a005433092f25d27d57398f
      
https://github.com/qemu/qemu/commit/c5fe97e359bf03db9a005433092f25d27d57398f
  Author: John Snow <address@hidden>
  Date:   2014-09-08 (Mon, 08 Sep 2014)

  Changed paths:
    M hw/ide/core.c

  Log Message:
  -----------
  ide: Add wwn support to IDE-ATAPI drive

Although it is possible to specify the wwn
property for cdrom devices on the command line,
the underlying driver fails to relay this information
to the guest operating system via IDENTIFY.

This is a simple patch to correct that.

See ATA8-ACS, Table 22 parts 5, 6, and 9.

Signed-off-by: John Snow <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: ff74f33c310892c90c4439d963a6ce67f47ce18c
      
https://github.com/qemu/qemu/commit/ff74f33c310892c90c4439d963a6ce67f47ce18c
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2014-09-08 (Mon, 08 Sep 2014)

  Changed paths:
    M block/vmdk.c

  Log Message:
  -----------
  vmdk: fix vmdk_parse_extents() extent_file leaks

Signed-off-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>


  Commit: b6b1d31f098eef8cd13556d343e46c213fac972a
      
https://github.com/qemu/qemu/commit/b6b1d31f098eef8cd13556d343e46c213fac972a
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2014-09-08 (Mon, 08 Sep 2014)

  Changed paths:
    M block/vmdk.c

  Log Message:
  -----------
  vmdk: fix buf leak in vmdk_parse_extents()

vmdk_open_sparse() does not take ownership of buf so the caller always
needs to free it.

Signed-off-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>


  Commit: 4bf6637d35723f92e03f427c78d7ad130be41e6f
      
https://github.com/qemu/qemu/commit/4bf6637d35723f92e03f427c78d7ad130be41e6f
  Author: John Snow <address@hidden>
  Date:   2014-09-08 (Mon, 08 Sep 2014)

  Changed paths:
    M hw/ide/core.c

  Log Message:
  -----------
  IDE: Fill the IDENTIFY request consistently

IDE-HD, IDE-ATAPI and IDE-CFATA all fill the
identify buffer in slightly different ways,
this is a relatively minor patch to make them
uniform, to emphasize that:

(1) We build the s->identify_data cache first, then
(2) We copy it to s->io_buffer to fulfill the request.

Signed-off-by: John Snow <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 01ce352e62c3f86df6f4ad32c3ab9353e55af799
      
https://github.com/qemu/qemu/commit/01ce352e62c3f86df6f4ad32c3ab9353e55af799
  Author: John Snow <address@hidden>
  Date:   2014-09-08 (Mon, 08 Sep 2014)

  Changed paths:
    M hw/ide/core.c

  Log Message:
  -----------
  ide: Add resize callback to ide/core

Currently, if the block device backing the IDE drive is resized,
the information about the device as cached inside of the IDEState
structure is not updated, thus when a guest OS re-queries the drive,
it is unable to see the expanded size.

This patch adds a resize callback that updates the IDENTIFY data
buffer in order to correct this.

Lastly, a Linux guest as-is cannot resize a libata drive while in-use,
but it can see the expanded size as part of a bus rescan event.
This patch also allows guests such as Linux to see the new drive size
after a soft reboot event, without having to exit the QEMU process.

Signed-off-by: John Snow <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 1bc0e405816c9c6bde5695af20b07a1491ce1f9f
      
https://github.com/qemu/qemu/commit/1bc0e405816c9c6bde5695af20b07a1491ce1f9f
  Author: Peter Maydell <address@hidden>
  Date:   2014-09-08 (Mon, 08 Sep 2014)

  Changed paths:
    M MAINTAINERS
    M block.c
    M block/archipelago.c
    M block/vmdk.c
    M blockdev.c
    M hw/block/pflash_cfi01.c
    M hw/ide/core.c
    A include/qapi/util.h
    M qapi/Makefile.objs
    A qapi/qapi-util.c
    M qemu-img.c
    M qemu-img.texi
    M qemu-nbd.c
    M tests/Makefile
    M tests/ide-test.c
    M tests/libqos/malloc-pc.c
    M tests/libqos/malloc-pc.h
    M tests/libqos/pci.c
    M tests/libqos/pci.h
    A tests/libqos/virtio-pci.c
    A tests/libqos/virtio-pci.h
    A tests/libqos/virtio.c
    A tests/libqos/virtio.h
    M tests/libqtest.c
    M tests/libqtest.h
    M tests/virtio-blk-test.c

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

Block pull request

# gpg: Signature made Mon 08 Sep 2014 11:49:31 BST using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <address@hidden>"
# gpg:                 aka "Stefan Hajnoczi <address@hidden>"

* remotes/stefanha/tags/block-pull-request: (24 commits)
  ide: Add resize callback to ide/core
  IDE: Fill the IDENTIFY request consistently
  vmdk: fix buf leak in vmdk_parse_extents()
  vmdk: fix vmdk_parse_extents() extent_file leaks
  ide: Add wwn support to IDE-ATAPI drive
  qtest/ide: Uninitialize PC allocator
  libqos: add a simple first-fit memory allocator
  MAINTAINERS: update sheepdog maintainer
  qemu-nbd: fix indentation and coding style
  qemu-nbd: add option to set detect-zeroes mode
  rename parse_enum_option to qapi_enum_parse and make it public
  block/archipelago: Use QEMU atomic builtins
  qemu-img: fix rebase src_cache option documentation
  qemu-img: clarify src_cache option documentation
  libqos: Added EVENT_IDX support
  libqos: Added MSI-X support
  libqos: Added test case for configuration changes in virtio-blk test
  libqos: Added indirect descriptor support to virtio implementation
  libqos: Added basic virtqueue support to virtio implementation
  tests: Add virtio device initialization
  ...

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


Compare: https://github.com/qemu/qemu/compare/2d6838e86ce9...1bc0e405816c