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. We may decide it's too late for 2.6 and route it to -stable instead. 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