[Qemu-commits] [qemu/qemu] b25c9d: configure: Enable dead code (lzo, snappy, quorum)

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: b25c9dff3599892a16f824b5df643e0fc1acbfc1
      
https://github.com/qemu/qemu/commit/b25c9dff3599892a16f824b5df643e0fc1acbfc1
  Author: Stefan Weil <address@hidden>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M configure
    M tests/qemu-iotests/081.out

  Log Message:
  -----------
  configure: Enable dead code (lzo, snappy, quorum)

Those options were not enabled by default, even when the build
environment would have supported them, so the corresponding
code was not compiled in normal test builds like on build bots.

[Building quorum by default "broke" qemu-iotests ./check 081.  It turns
out the 081.out master output was just bitrotted.  Fix this by updating
the error message.
--Stefan]

Signed-off-by: Stefan Weil <address@hidden>
Reviewed-by: Qiao Nuohan <address@hidden>
Reviewed-by: Benoit Canet <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: f7047c2daf760385edf83df10be4259bea190e75
      
https://github.com/qemu/qemu/commit/f7047c2daf760385edf83df10be4259bea190e75
  Author: Markus Armbruster <address@hidden>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M block/curl.c
    M block/iscsi.c
    M hw/block/onenand.c

  Log Message:
  -----------
  block: Drop superfluous conditionals around g_free()

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: bcf831585751508bddf4ef6823f2295d850509b9
      
https://github.com/qemu/qemu/commit/bcf831585751508bddf4ef6823f2295d850509b9
  Author: Kevin Wolf <address@hidden>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M blockdev.c

  Log Message:
  -----------
  blockdev: Move 'serial' option to drive_init()

It is not available with blockdev-add.

Signed-off-by: Kevin Wolf <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 60e19e06a4a28935c94e39d40c80193759af88ce
      
https://github.com/qemu/qemu/commit/60e19e06a4a28935c94e39d40c80193759af88ce
  Author: Markus Armbruster <address@hidden>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M blockdev.c
    M device-hotplug.c
    M hw/usb/dev-storage.c
    M include/sysemu/blockdev.h
    M vl.c

  Log Message:
  -----------
  blockdev: Rename drive_init(), drive_uninit() to drive_new(), drive_del()

"Init" and "uninit" suggest the functions don't allocate / free
storage.  But they do.

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Benoit Canet <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: ae60e8e3783a66463d0736f3a48da9a66fd5cbd3
      
https://github.com/qemu/qemu/commit/ae60e8e3783a66463d0736f3a48da9a66fd5cbd3
  Author: Markus Armbruster <address@hidden>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M blockdev.c
    M device-hotplug.c
    M hw/ide/piix.c
    M include/sysemu/blockdev.h

  Log Message:
  -----------
  blockdev: Remove unused DriveInfo reference count

It's always one since commit fa510eb dropped the last drive_get_ref().

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Benoit Canet <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: a2c0fe2fd26e3e10753660019da9366f7b19c286
      
https://github.com/qemu/qemu/commit/a2c0fe2fd26e3e10753660019da9366f7b19c286
  Author: Peter Lieven <address@hidden>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M block/nfs.c

  Log Message:
  -----------
  block/nfs: fix potential segfault on early callback

it will happen in the future that the callback of a libnfs call
directly invokes the callback. In this case we end up in a segfault
because the NFSRPC is gone when we the BH is scheduled.

Signed-off-by: Peter Lieven <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 5e89db7641fdf61f066119e4d8864ad7be1e32f0
      
https://github.com/qemu/qemu/commit/5e89db7641fdf61f066119e4d8864ad7be1e32f0
  Author: Chunyan Liu <address@hidden>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M util/qemu-option.c

  Log Message:
  -----------
  QemuOpts: move find_desc_by_name ahead for later calling

Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Chunyan Liu <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: e67905426bf3cf811d31c87789c1c7e986849d66
      
https://github.com/qemu/qemu/commit/e67905426bf3cf811d31c87789c1c7e986849d66
  Author: Chunyan Liu <address@hidden>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M include/qemu/option.h
    M util/qemu-option.c

  Log Message:
  -----------
  QemuOpts: repurpose qemu_opts_print to replace print_option_parameters

Currently this function is not used anywhere. In later patches, it will
replace print_option_parameters. To avoid print info changes, change
qemu_opts_print from fprintf stderr to printf, and remove last printf.

Signed-off-by: Chunyan Liu <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 09722032e15669e653991923613761602c745fa0
      
https://github.com/qemu/qemu/commit/09722032e15669e653991923613761602c745fa0
  Author: Chunyan Liu <address@hidden>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M include/qemu/option.h
    M util/qemu-option.c

  Log Message:
  -----------
  QemuOpts: add def_value_str to QemuOptDesc

Add def_value_str (default value) to QemuOptDesc, to replace function of the
default value in QEMUOptionParameter.

Improve qemu_opts_get_* functions: if find opt, return opt->str; otherwise,
if desc->def_value_str is set, return desc->def_value_str; otherwise, return
input defval.

Improve qemu_opts_print: if option is set, print opt->str; otherwise, if
desc->def_value_str is set, print it.

Signed-off-by: Dong Xu Wang <address@hidden>
Signed-off-by: Chunyan Liu <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: e36af94f868fe5b897c4903126e11fdf25fa4739
      
https://github.com/qemu/qemu/commit/e36af94f868fe5b897c4903126e11fdf25fa4739
  Author: Chunyan Liu <address@hidden>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M qapi-schema.json
    M qmp-commands.hx
    M util/qemu-config.c

  Log Message:
  -----------
  qapi: output def_value_str when query command line options

Change qapi interfaces to output the newly added def_value_str when querying
command line options.

Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Leandro Dorileo <address@hidden>
Signed-off-by: Dong Xu Wang <address@hidden>
Signed-off-by: Chunyan Liu <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: dc8622f2bf9174cd42932ad86bcc98c6f7c98832
      
https://github.com/qemu/qemu/commit/dc8622f2bf9174cd42932ad86bcc98c6f7c98832
  Author: Chunyan Liu <address@hidden>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M include/qemu/option_int.h
    M qapi/opts-visitor.c
    M util/qemu-option.c

  Log Message:
  -----------
  QemuOpts: change opt->name|str from (const char *) to (char *)

qemu_opt_del() already assumes that all QemuOpt instances contain
malloc'd name and value; but it had to cast away const because
opts_start_struct() was doing its own thing and using static storage
instead.  By using the correct type and malloced strings everywhere, the
usage of this struct becomes clearer.

Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Leandro Dorileo <address@hidden>
Signed-off-by: Chunyan Liu <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: fc345512c59da62eb2dde3f0a51137a2f848c589
      
https://github.com/qemu/qemu/commit/fc345512c59da62eb2dde3f0a51137a2f848c589
  Author: Chunyan Liu <address@hidden>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M util/qemu-option.c

  Log Message:
  -----------
  QemuOpts: move qemu_opt_del ahead for later calling

In later patch, qemu_opt_get_del functions will be added, they will
first get the option value, then call qemu_opt_del to remove the option
from opt list. To prepare for that purpose, move qemu_opt_del ahead first.

Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Leandro Dorileo <address@hidden>
Signed-off-by: Chunyan Liu <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 782730b0bcde44eef8eb5b2d4200eff318ec77cd
      
https://github.com/qemu/qemu/commit/782730b0bcde44eef8eb5b2d4200eff318ec77cd
  Author: Chunyan Liu <address@hidden>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M include/qemu/option.h
    M util/qemu-option.c

  Log Message:
  -----------
  QemuOpts: add qemu_opt_get_*_del functions for replace work

Add qemu_opt_get_del, qemu_opt_get_bool_del, qemu_opt_get_number_del and
qemu_opt_get_size_del to replace the same handling of QEMUOptionParameter
(get and delete).

Several drivers are coded to parse a known subset of options, then
remove them from the list before handing all remaining options to a
second driver for further option processing.  get_*_del makes it easier
to retrieve a known option (or its default) and remove it from the list
all in one action.

Share common helper function:

For qemu_opt_get_bool/size/number, they and their get_*_del counterpart
could share most of the code except whether or not deleting the opt from
option list, so generate common helper functions.

For qemu_opt_get and qemu_opt_get_del, keep code duplication, since
1. qemu_opt_get_del returns malloc'd memory while qemu_opt_get returns
in-place memory
2. qemu_opt_get_del returns (char *), qemu_opt_get returns (const char *),
and could not change to (char *), since in one case, it will return
desc->def_value_str, which is (const char *).

Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Dong Xu Wang <address@hidden>
Signed-off-by: Chunyan Liu <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 504189a96fdee5916073858f0e60f33e0275454a
      
https://github.com/qemu/qemu/commit/504189a96fdee5916073858f0e60f33e0275454a
  Author: Chunyan Liu <address@hidden>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M include/qemu/option.h
    M util/qemu-option.c

  Log Message:
  -----------
  QemuOpts: add qemu_opts_print_help to replace print_option_help

print_option_help takes QEMUOptionParameter as parameter, add
qemu_opts_print_help to take QemuOptsList as parameter for later
replace work.

Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Leandro Dorileo <address@hidden>
Signed-off-by: Dong Xu Wang <address@hidden>
Signed-off-by: Chunyan Liu <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 8559e45e51edd22dd48d54cce8b0521e6339f3e9
      
https://github.com/qemu/qemu/commit/8559e45e51edd22dd48d54cce8b0521e6339f3e9
  Author: Chunyan Liu <address@hidden>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M include/qemu/option.h
    M util/qemu-option.c

  Log Message:
  -----------
  QemuOpts: add conversion between QEMUOptionParameter to QemuOpts

Add two temp conversion functions between QEMUOptionParameter to QemuOpts,
so that next patch can use it. It will simplify later patch for easier
review. And will be finally removed after all backend drivers switch to
QemuOpts.

Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Leandro Dorileo <address@hidden>
Signed-off-by: Chunyan Liu <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: a1097a2614c3ff772e450454417bb1b51d6a01bc
      
https://github.com/qemu/qemu/commit/a1097a2614c3ff772e450454417bb1b51d6a01bc
  Author: Chunyan Liu <address@hidden>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M include/qemu/option.h
    M util/qemu-option.c

  Log Message:
  -----------
  QemuOpts: add qemu_opts_append to replace append_option_parameters

For later merge .create_opts of drv and proto_drv in qemu-img commands.

Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Leandro Dorileo <address@hidden>
Signed-off-by: Chunyan Liu <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 4782183da39ec988b8290bbc0289c9f50ba33ea4
      
https://github.com/qemu/qemu/commit/4782183da39ec988b8290bbc0289c9f50ba33ea4
  Author: Chunyan Liu <address@hidden>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M util/qemu-option.c

  Log Message:
  -----------
  QemuOpts: check NULL input for qemu_opts_del

To simplify later using of qemu_opts_del, accept NULL input.

Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Leandro Dorileo <address@hidden>
Signed-off-by: Chunyan Liu <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 83d0521a1e35989b0cb7235aef48455fedda3ca4
      
https://github.com/qemu/qemu/commit/83d0521a1e35989b0cb7235aef48455fedda3ca4
  Author: Chunyan Liu <address@hidden>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M block.c
    M block/cow.c
    M block/qcow.c
    M block/qcow2.c
    M block/qed.c
    M block/raw_bsd.c
    M block/vhdx.c
    M block/vmdk.c
    M block/vvfat.c
    M include/block/block.h
    M include/block/block_int.h
    M qemu-img.c
    M tests/qemu-iotests/049.out
    M tests/qemu-iotests/061.out

  Log Message:
  -----------
  change block layer to support both QemuOpts and QEMUOptionParamter

Change block layer to support both QemuOpts and QEMUOptionParameter.
After this patch, it will change backend drivers one by one. At the end,
QEMUOptionParameter will be removed and only QemuOpts is kept.

Signed-off-by: Dong Xu Wang <address@hidden>
Signed-off-by: Chunyan Liu <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: facdbb0272402618b6ca3b306a933e56dc4085c5
      
https://github.com/qemu/qemu/commit/facdbb0272402618b6ca3b306a933e56dc4085c5
  Author: Chunyan Liu <address@hidden>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M block/vvfat.c

  Log Message:
  -----------
  vvfat.c: handle cross_driver's create_options and create_opts

vvfat shares create options of qcow driver. To avoid vvfat breaking when
qcow driver changes from QEMUOptionParameter to QemuOpts, let it able
to handle both cases.

Signed-off-by: Chunyan Liu <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 25814e89871b4462638b290a4b17212526a01af3
      
https://github.com/qemu/qemu/commit/25814e89871b4462638b290a4b17212526a01af3
  Author: Chunyan Liu <address@hidden>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M block/cow.c

  Log Message:
  -----------
  cow.c: replace QEMUOptionParameter with QemuOpts

Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Dong Xu Wang <address@hidden>
Signed-off-by: Chunyan Liu <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 90c772de56a810265c52fd55ca384b01ab74e35d
      
https://github.com/qemu/qemu/commit/90c772de56a810265c52fd55ca384b01ab74e35d
  Author: Chunyan Liu <address@hidden>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M block/gluster.c

  Log Message:
  -----------
  gluster.c: replace QEMUOptionParameter with QemuOpts

Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Dong Xu Wang <address@hidden>
Signed-off-by: Chunyan Liu <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: a59479e3f3dc4da005735b603b2770902556fe7a
      
https://github.com/qemu/qemu/commit/a59479e3f3dc4da005735b603b2770902556fe7a
  Author: Chunyan Liu <address@hidden>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M block/iscsi.c

  Log Message:
  -----------
  iscsi.c: replace QEMUOptionParameter with QemuOpts

Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Dong Xu Wang <address@hidden>
Signed-off-by: Chunyan Liu <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 98c10b810a83a0f52b4b5a14a8a36ce0622cb01f
      
https://github.com/qemu/qemu/commit/98c10b810a83a0f52b4b5a14a8a36ce0622cb01f
  Author: Chunyan Liu <address@hidden>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M block/nfs.c

  Log Message:
  -----------
  nfs.c: replace QEMUOptionParameter with QemuOpts

Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Chunyan Liu <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 16d12159e207a167bd4f417fbd199736ad2da2d0
      
https://github.com/qemu/qemu/commit/16d12159e207a167bd4f417fbd199736ad2da2d0
  Author: Chunyan Liu <address@hidden>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M block/qcow.c

  Log Message:
  -----------
  qcow.c: replace QEMUOptionParameter with QemuOpts

Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Dong Xu Wang <address@hidden>
Signed-off-by: Chunyan Liu <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 74c3c19765c1abf202561af20dfc8f52d9cff808
      
https://github.com/qemu/qemu/commit/74c3c19765c1abf202561af20dfc8f52d9cff808
  Author: Chunyan Liu <address@hidden>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M include/qemu/option.h
    M util/qemu-option.c

  Log Message:
  -----------
  QemuOpts: export qemu_opt_find

Export qemu_opt_find for qcow2 driver using it.
After replacing QEMUOptionParameter with QemuOpts, qcow2 driver will
use qemu_opt_find to judge if an option is explicitly set, to replace
the usage of .assigned in QEMUOptionParameter.

Signed-off-by: Chunyan Liu <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 1bd0e2d1c40ef1dbe717728197071e931abe22a4
      
https://github.com/qemu/qemu/commit/1bd0e2d1c40ef1dbe717728197071e931abe22a4
  Author: Chunyan Liu <address@hidden>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M block/qcow2.c

  Log Message:
  -----------
  qcow2.c: replace QEMUOptionParameter with QemuOpts

Signed-off-by: Dong Xu Wang <address@hidden>
Signed-off-by: Chunyan Liu <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 7ab74849a5724452b35982a6e7d658c25839f5e5
      
https://github.com/qemu/qemu/commit/7ab74849a5724452b35982a6e7d658c25839f5e5
  Author: Chunyan Liu <address@hidden>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

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

  Log Message:
  -----------
  qed.c: replace QEMUOptionParameter with QemuOpts

One extra change is to define QED_DEFAULT_CLUSTER_SIZE = 65536 instead
of 64 * 1024; because:
according to existing create_options, "cluster size" has default value =
QED_DEFAULT_CLUSTER_SIZE, after switching to create_opts, this has to be
stringized and set to .def_value_str. That is,
  .def_value_str = stringify(QED_DEFAULT_CLUSTER_SIZE),
so the QED_DEFAULT_CLUSTER_SIZE could not be a expression.

Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Dong Xu Wang <address@hidden>
Signed-off-by: Chunyan Liu <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 6f482f742dd841b45297fb0e5f3d2c81779253be
      
https://github.com/qemu/qemu/commit/6f482f742dd841b45297fb0e5f3d2c81779253be
  Author: Chunyan Liu <address@hidden>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M block/raw-posix.c

  Log Message:
  -----------
  raw-posix.c: replace QEMUOptionParameter with QemuOpts

Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Dong Xu Wang <address@hidden>
Signed-off-by: Chunyan Liu <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: ddef76999396d93b2c7ddfc7e95d5c4bcdeac55a
      
https://github.com/qemu/qemu/commit/ddef76999396d93b2c7ddfc7e95d5c4bcdeac55a
  Author: Chunyan Liu <address@hidden>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M block/raw-win32.c

  Log Message:
  -----------
  raw-win32.c: replace QEMUOptionParameter with QemuOpts

Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Dong Xu Wang <address@hidden>
Signed-off-by: Chunyan Liu <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: cd3a4cf631644636b098243fd118980100efbe01
      
https://github.com/qemu/qemu/commit/cd3a4cf631644636b098243fd118980100efbe01
  Author: Chunyan Liu <address@hidden>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M block/raw_bsd.c

  Log Message:
  -----------
  raw_bsd.c: replace QEMUOptionParameter with QemuOpts

Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Dong Xu Wang <address@hidden>
Signed-off-by: Chunyan Liu <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: bd0cf596fd1200d162e5655adff9c06d40dbdd14
      
https://github.com/qemu/qemu/commit/bd0cf596fd1200d162e5655adff9c06d40dbdd14
  Author: Chunyan Liu <address@hidden>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M block/rbd.c

  Log Message:
  -----------
  rbd.c: replace QEMUOptionParameter with QemuOpts

Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Dong Xu Wang <address@hidden>
Signed-off-by: Chunyan Liu <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: b222237b7bcddc337625201159d9ddbb096043bf
      
https://github.com/qemu/qemu/commit/b222237b7bcddc337625201159d9ddbb096043bf
  Author: Chunyan Liu <address@hidden>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M block/sheepdog.c

  Log Message:
  -----------
  sheepdog.c: replace QEMUOptionParameter with QemuOpts

Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Dong Xu Wang <address@hidden>
Signed-off-by: Chunyan Liu <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 766181fe5789da07ff1fe76986e63f91ccdc2c65
      
https://github.com/qemu/qemu/commit/766181fe5789da07ff1fe76986e63f91ccdc2c65
  Author: Chunyan Liu <address@hidden>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M block/ssh.c

  Log Message:
  -----------
  ssh.c: replace QEMUOptionParameter with QemuOpts

Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Dong Xu Wang <address@hidden>
Signed-off-by: Chunyan Liu <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 004b7f2522368a8cb64bfb18b904acee99e12838
      
https://github.com/qemu/qemu/commit/004b7f2522368a8cb64bfb18b904acee99e12838
  Author: Chunyan Liu <address@hidden>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M block/vdi.c

  Log Message:
  -----------
  vdi.c: replace QEMUOptionParameter with QemuOpts

Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Dong Xu Wang <address@hidden>
Signed-off-by: Chunyan Liu <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 5366092c7acae8d7d5a8188c06933deffdca6e44
      
https://github.com/qemu/qemu/commit/5366092c7acae8d7d5a8188c06933deffdca6e44
  Author: Chunyan Liu <address@hidden>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

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

  Log Message:
  -----------
  vhdx.c: replace QEMUOptionParameter with QemuOpts

Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Dong Xu Wang <address@hidden>
Signed-off-by: Chunyan Liu <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 5820f1da5130e2afdacd6d8886a67cf95ddc5878
      
https://github.com/qemu/qemu/commit/5820f1da5130e2afdacd6d8886a67cf95ddc5878
  Author: Chunyan Liu <address@hidden>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M block/vmdk.c

  Log Message:
  -----------
  vmdk.c: replace QEMUOptionParameter with QemuOpts

Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Dong Xu Wang <address@hidden>
Signed-off-by: Chunyan Liu <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: fec9921f0a331716c898d1f823682de2ecfa3d2a
      
https://github.com/qemu/qemu/commit/fec9921f0a331716c898d1f823682de2ecfa3d2a
  Author: Chunyan Liu <address@hidden>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M block/vpc.c

  Log Message:
  -----------
  vpc.c: replace QEMUOptionParameter with QemuOpts

Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Dong Xu Wang <address@hidden>
Signed-off-by: Chunyan Liu <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: c282e1fdf7ec9659c7f320123be397477a359d01
      
https://github.com/qemu/qemu/commit/c282e1fdf7ec9659c7f320123be397477a359d01
  Author: Chunyan Liu <address@hidden>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M block.c
    M block/cow.c
    M block/gluster.c
    M block/iscsi.c
    M block/nfs.c
    M block/qcow.c
    M block/qcow2.c
    M block/qed.c
    M block/raw-posix.c
    M block/raw-win32.c
    M block/raw_bsd.c
    M block/rbd.c
    M block/sheepdog.c
    M block/ssh.c
    M block/vdi.c
    M block/vhdx.c
    M block/vmdk.c
    M block/vpc.c
    M block/vvfat.c
    M include/block/block.h
    M include/block/block_int.h
    M include/qemu/option.h
    M qemu-img.c
    M util/qemu-option.c

  Log Message:
  -----------
  cleanup QEMUOptionParameter

Now that all backend drivers are using QemuOpts, remove all
QEMUOptionParameter related codes.

Signed-off-by: Dong Xu Wang <address@hidden>
Signed-off-by: Chunyan Liu <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 98d896d978eef0fd6ff8d93a1ccea34e00b97f8c
      
https://github.com/qemu/qemu/commit/98d896d978eef0fd6ff8d93a1ccea34e00b97f8c
  Author: Chunyan Liu <address@hidden>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M include/qemu/option.h
    M util/qemu-option.c

  Log Message:
  -----------
  QemuOpts: cleanup tmp 'allocated' member from QemuOptsList

Now only qemu_opts_append uses 'allocated' to indicate free memory.
For this function only, we can also let result list's (const char *)
members point to input list's members, only if the input list has
longer lifetime than result list. In current code, that is true.
So, we can remove the 'allocated' member from QemuOptsList definition
to keep code clean.

Signed-off-by: Chunyan Liu <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 84219c5a21399e8d4d0e373168f610f65684c318
      
https://github.com/qemu/qemu/commit/84219c5a21399e8d4d0e373168f610f65684c318
  Author: Peter Maydell <address@hidden>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M block.c
    M block/cow.c
    M block/curl.c
    M block/gluster.c
    M block/iscsi.c
    M block/nfs.c
    M block/qcow.c
    M block/qcow2.c
    M block/qed.c
    M block/qed.h
    M block/raw-posix.c
    M block/raw-win32.c
    M block/raw_bsd.c
    M block/rbd.c
    M block/sheepdog.c
    M block/ssh.c
    M block/vdi.c
    M block/vhdx.c
    M block/vhdx.h
    M block/vmdk.c
    M block/vpc.c
    M block/vvfat.c
    M blockdev.c
    M configure
    M device-hotplug.c
    M hw/block/onenand.c
    M hw/ide/piix.c
    M hw/usb/dev-storage.c
    M include/block/block.h
    M include/block/block_int.h
    M include/qemu/option.h
    M include/qemu/option_int.h
    M include/sysemu/blockdev.h
    M qapi-schema.json
    M qapi/opts-visitor.c
    M qemu-img.c
    M qmp-commands.hx
    M tests/qemu-iotests/049.out
    M tests/qemu-iotests/061.out
    M tests/qemu-iotests/081.out
    M util/qemu-config.c
    M util/qemu-option.c
    M vl.c

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

Block pull request

# gpg: Signature made Mon 16 Jun 2014 12:22:22 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: (39 commits)
  QemuOpts: cleanup tmp 'allocated' member from QemuOptsList
  cleanup QEMUOptionParameter
  vpc.c: replace QEMUOptionParameter with QemuOpts
  vmdk.c: replace QEMUOptionParameter with QemuOpts
  vhdx.c: replace QEMUOptionParameter with QemuOpts
  vdi.c: replace QEMUOptionParameter with QemuOpts
  ssh.c: replace QEMUOptionParameter with QemuOpts
  sheepdog.c: replace QEMUOptionParameter with QemuOpts
  rbd.c: replace QEMUOptionParameter with QemuOpts
  raw_bsd.c: replace QEMUOptionParameter with QemuOpts
  raw-win32.c: replace QEMUOptionParameter with QemuOpts
  raw-posix.c: replace QEMUOptionParameter with QemuOpts
  qed.c: replace QEMUOptionParameter with QemuOpts
  qcow2.c: replace QEMUOptionParameter with QemuOpts
  QemuOpts: export qemu_opt_find
  qcow.c: replace QEMUOptionParameter with QemuOpts
  nfs.c: replace QEMUOptionParameter with QemuOpts
  iscsi.c: replace QEMUOptionParameter with QemuOpts
  gluster.c: replace QEMUOptionParameter with QemuOpts
  cow.c: replace QEMUOptionParameter with QemuOpts
  ...

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


Compare: https://github.com/qemu/qemu/compare/0bbac6261835...84219c5a2139