PATCH 1+2 are simple fixes for dangling pointers to unused stack, and as such belong into 2.6 if at all possible.
PATCH 3 fixes an error message regression. The patch is a bit long, but repetitive. The following changes since commit f419a626c76bcb26697883af702862e8623056f9: usb/uhci: move pid check (2016-04-25 12:05:05 +0100) are available in the git repository at: git://repo.or.cz/qemu/armbru.git tags/pull-error-2016-04-28 for you to fetch changes up to 51b9b478cc238ad23a78ffd713f9c18bbc3907e6: qom: -object error messages lost location, restore it (2016-04-28 08:19:36 +0200) ---------------------------------------------------------------- Fix dangling pointers and error message regressions ---------------------------------------------------------------- Markus Armbruster (3): QemuOpts: Fix qemu_opts_foreach() dangling location regression replay: Fix dangling location bug in replay_configure() qom: -object error messages lost location, restore it include/qom/object_interfaces.h | 5 +++-- qemu-img.c | 39 +++++++++++---------------------------- qemu-io.c | 3 +-- qemu-nbd.c | 3 +-- qom/object_interfaces.c | 4 +++- replay/replay.c | 3 ++- util/qemu-option.c | 6 +++--- vl.c | 6 ++---- 8 files changed, 26 insertions(+), 43 deletions(-) -- 2.5.5