This patch series is to replace QEMUOptionParameter with QemuOpts, so that only one Qemu Option structure is kept in QEMU code.
--- Changes to v19: * fix format issue * according to Kevin's comments, add convert functions (params_to_opts and opts_to_params) to simplify the block layer patch (patch 06/25), so that it could be easier for review * add patch to remove assertion in qemu_opts_get function to fix vvfat issue * rebase to latest code * v19 is here: https://lists.endsoftwarepatents.org/archive/html/qemu-devel/2014-01/msg02409.html Chunyan Liu (26): add def_value_str to QemuOptDesc qapi: output def_value_str when query command line options improve some functions in qemu-option.c add some QemuOpts functions for replace work remove assertion of qemu_opt_get functions change block layer to support both QemuOpts and QEMUOptionParameter cow.c: replace QEMUOptionParameter with QemuOpts gluster.c: replace QEMUOptionParameter with QemuOpts iscsi.c: replace QEMUOptionParameter with QemuOpts qcow.c: replace QEMUOptionParameter with QemuOpts qcow2.c: replace QEMUOptionParameter with QemuOpts in create qcow2.c: replace QEMUOptionParameter with QemuOpts in amend options qed.c: replace QEMUOptionParameter with QemuOpts raw-posix.c: replace QEMUOptionParameter with QemuOpts raw-win32.c: replace QEMUOptionParameter with QemuOpts raw_bsd.c: replace QEMUOptionParameter with QemuOpts rbd.c: replace QEMUOptionParameter with QemuOpts sheepdog.c: replace QEMUOptionParameter with QemuOpts ssh.c: replace QEMUOptionParameter with QemuOpts vdi.c: replace QEMUOptionParameter with QemuOpts vmdk.c: replace QEMUOptionParameter with QemuOpts vpc.c: replace QEMUOptionParameter with QemuOpts vhdx.c: replace QEMUOptionParameter with QemuOpts vvfat.c: replace QEMUOptionParameter with QemuOpts cleanup QEMUOptionParameter change back to original name from bdrv_create2 to bdrv_create block.c | 95 ++++---- block/cow.c | 44 ++-- block/gluster.c | 78 ++++--- block/iscsi.c | 29 ++-- block/qcow.c | 61 +++--- block/qcow2.c | 262 +++++++++++----------- block/qed.c | 89 ++++---- block/qed.h | 3 +- block/raw-posix.c | 48 ++--- block/raw-win32.c | 33 ++-- block/raw_bsd.c | 27 ++- block/rbd.c | 63 +++--- block/sheepdog.c | 101 ++++----- block/ssh.c | 31 ++-- block/vdi.c | 69 +++--- block/vhdx.c | 93 ++++---- block/vhdx.h | 1 + block/vmdk.c | 109 +++++----- block/vpc.c | 52 +++-- block/vvfat.c | 10 +- include/block/block.h | 8 +- include/block/block_int.h | 7 +- include/qemu/option.h | 47 +--- qapi-schema.json | 8 +- qemu-img.c | 89 ++++---- qmp-commands.hx | 2 + util/qemu-config.c | 4 + util/qemu-option.c | 547 ++++++++++++++++++++------------------------- 28 files changed, 955 insertions(+), 1055 deletions(-)