On 2018-06-11 16:52, Max Reitz wrote: > On 2018-06-07 08:25, Markus Armbruster wrote: >> This series is RFC because: >> >> * It clashes with parts of Max's "[PATCH 00/13] block: Try to create >> well typed json:{} filenames". I missed that one until too late, >> sorry. >> >> - I stole "[PATCH 06/13] block: Add block-specific QDict header", >> and tacked on fixups I'd like to have. >> >> - My qobject_input_visitor_new_flat_confused() addresses the same >> general problem as Max's qdict_stringify_for_keyval(): the block >> layer's confused use of QObject types. My solution fixes a number >> of bugs in -blockdev, blockdev-add and -drive. If Max's solution >> adds further value, we need to merge the two somehow. > > So that looks trivial to change in my series (just merge the > qdict_stringify_for_keyval() + qdict_crumple() into one > qdict_crumple_for_keyval_qiv()).
Err, that's static, so actually "qdict_stringify_for_keyval() + qdict_crumple() + qobject_input_visitor_new_keyval()" -> "qobject_input_visitor_new_flat_confused()". > >> - I changed qdict_flatten() to fix -blockdev and blockdev-add for >> empty objects and arrays. Max fixed it to not mess up shallow >> clones. We need to merge the two. > > That seems possible. I suppose I'll just need to figure out the bugs > after your series and fix them again. ;-) I can now report that indeed all worked out fine, so I'll just base v2 of my series on yours. Max
signature.asc
Description: OpenPGP digital signature