From: Anthony Liguori Date: Wed, 10 Jul 2013 19:34:32 +0000 (-0500) Subject: Merge remote-tracking branch 'luiz/queue/qmp' into staging X-Git-Tag: qemu-xen-4.4.0-rc1~6^2~215 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=c170a23ca0097a95b44fc7cc604018cd3c3b7d44;p=qemu-upstream-4.4-testing.git Merge remote-tracking branch 'luiz/queue/qmp' into staging # By Kevin Wolf (4) and others # Via Luiz Capitulino * luiz/queue/qmp: add timestamp to error_report() qapi-schema: Use existing type for drive-backup arguments qapi-schema: Use BlockdevSnapshot type for blockdev-snapshot-sync qapi.py: Allow top-level type reference for command definitions qapi.py: Avoid code duplication qemu-char: Fix ringbuf option size Message-id: 1373478767-20965-1-git-send-email-lcapitulino@redhat.com Signed-off-by: Anthony Liguori --- c170a23ca0097a95b44fc7cc604018cd3c3b7d44