bdrv_reopen_prepare() assumes that all BDS options are strings, which is not necessarily correct. This series introduces a new qobject_is_equal() function which can be used to test whether any options have changed, independently of their type.
v2: - Add comments detailing when QDicts and QLists are considered equal [Kevin] git-backport-diff against v1: Key: [----] : patches are identical [####] : number of functional differences between upstream/downstream patch [down] : patch is downstream-only The flags [FC] indicate (F)unctional and (C)ontextual differences, respectively 001/4:[----] [--] 'qapi/qnull: Add own header' 002/4:[0009] [FC] 'qapi: Add qobject_is_equal()' 003/4:[----] [--] 'block: qobject_is_equal() in bdrv_reopen_prepare()' 004/4:[----] [--] 'iotests: Add test for non-string option reopening' Max Reitz (4): qapi/qnull: Add own header qapi: Add qobject_is_equal() block: qobject_is_equal() in bdrv_reopen_prepare() iotests: Add test for non-string option reopening include/qapi/qmp/qbool.h | 1 + include/qapi/qmp/qdict.h | 1 + include/qapi/qmp/qfloat.h | 1 + include/qapi/qmp/qint.h | 1 + include/qapi/qmp/qlist.h | 1 + include/qapi/qmp/qnull.h | 28 ++++++++++++++++++++++++++++ include/qapi/qmp/qobject.h | 17 +++++++++-------- include/qapi/qmp/qstring.h | 1 + include/qapi/qmp/types.h | 1 + block.c | 15 +++------------ qobject/qbool.c | 8 ++++++++ qobject/qdict.c | 28 ++++++++++++++++++++++++++++ qobject/qfloat.c | 8 ++++++++ qobject/qint.c | 8 ++++++++ qobject/qlist.c | 30 ++++++++++++++++++++++++++++++ qobject/qnull.c | 6 ++++++ qobject/qobject.c | 30 ++++++++++++++++++++++++++++++ qobject/qstring.c | 9 +++++++++ target/i386/cpu.c | 6 +----- tests/check-qnull.c | 2 +- tests/qemu-iotests/133 | 9 +++++++++ tests/qemu-iotests/133.out | 5 +++++ 22 files changed, 190 insertions(+), 26 deletions(-) create mode 100644 include/qapi/qmp/qnull.h -- 2.9.4
