Message ID | 1500409760-20730-1-git-send-email-armbru@redhat.com |
---|---|
State | New |
Headers | show |
On 18 July 2017 at 21:29, Markus Armbruster <armbru@redhat.com> wrote: > The following changes since commit 49bcce4b9c11759678fd223aefb48691c4959d4f: > > Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2017-07-12' into staging (2017-07-13 16:56:06 +0100) > > are available in the git repository at: > > git://repo.or.cz/qemu/armbru.git tags/pull-qapi-2017-07-18 > > for you to fetch changes up to 4f11e88cbda71af50302c32d97b4f8122555027e: > > migration: Use JSON null instead of "" to reset parameter to default (2017-07-18 22:21:58 +0200) > > ---------------------------------------------------------------- > QAPI patches for 2017-07-18 > > ---------------------------------------------------------------- > Markus Armbruster (10): > qapi: Separate type QNull from QObject > qapi: Use QNull for a more regular visit_type_null() > qapi: Introduce a first class 'null' type > tests/test-qobject-input-visitor: Drop redundant test > block: Use JSON null instead of "" to disable backing file > hmp: Clean up and simplify hmp_migrate_set_parameter() > migration: Clean up around tls_creds, tls_hostname > migration: Add TODO comments on duplication of QAPI_CLONE() > migration: Unshare MigrationParameters struct for now > migration: Use JSON null instead of "" to reset parameter to default Hi -- I'm afraid this has a merge conflict in migration/migration.c that looks too complicated for me to sort out. Can you rebase and resend, please? thanks -- PMM