This patch series is to replace QEMUOptionParameter with QemuOpts, so that only one Qemu Option structure is kept in QEMU code.
--- Changes to v20: * fix Eric's comments * rebase to latest source Chunyan Liu (25): add def_value_str to QemuOptDesc qapi: output def_value_str when query command line options improve some functions in qemu-option.c improve assertion in qemu_opt_get functions add some QemuOpts functions for replace work add convert functions between QEMUOptionParameter to QemuOpts change block layer to support both QemuOpts and QEMUOptionParamter 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 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 block.c | 96 ++++---- block/cow.c | 52 ++--- block/gluster.c | 73 +++--- block/iscsi.c | 29 ++-- block/qcow.c | 72 +++--- block/qcow2.c | 325 ++++++++++++++------------- block/qed.c | 111 +++++----- block/qed.h | 3 +- block/raw-posix.c | 55 ++--- block/raw-win32.c | 34 ++-- block/raw_bsd.c | 25 ++- block/rbd.c | 61 +++--- block/sheepdog.c | 102 +++++---- block/ssh.c | 30 ++-- block/vdi.c | 70 +++--- block/vhdx.c | 97 ++++---- block/vhdx.h | 1 + block/vmdk.c | 121 +++++----- block/vpc.c | 60 +++--- block/vvfat.c | 10 +- include/block/block.h | 7 +- include/block/block_int.h | 9 +- include/qemu/option.h | 54 +---- include/qemu/option_int.h | 4 +- qapi-schema.json | 8 +- qemu-img.c | 89 ++++---- qmp-commands.hx | 2 + util/qemu-config.c | 4 + util/qemu-option.c | 558 +++++++++++++++++++++------------------------ 29 files changed, 1052 insertions(+), 1110 deletions(-)
