[libvirt] [PATCH] Fix QEMU restore from file in raw format
Mark McLoughlin
markmc at redhat.com
Tue Oct 13 09:16:04 UTC 2009
On Mon, 2009-10-12 at 20:25 +0100, Daniel P. Berrange wrote:
> The logic for running the decompression programs was broken in
> commit f238709304f9f6c57204cdd943e542cbae38fa5f, so that for
> non-raw formats the decompression program was never run, and
> for raw formats, it tried to exec an argv[] with initial NULL
> in the program name.
>
> * src/qemu/qemu_driver.c: Fix logic in runing decompression program
> ---
> src/qemu/qemu_driver.c | 3 +--
> 1 files changed, 1 insertions(+), 2 deletions(-)
>
> diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
> index 1e23a9b..556984a 100644
> --- a/src/qemu/qemu_driver.c
> +++ b/src/qemu/qemu_driver.c
> @@ -3781,9 +3781,8 @@ static int qemudDomainRestore(virConnectPtr conn,
> goto cleanup;
> }
>
> - if (header.compressed != QEMUD_SAVE_FORMAT_RAW)
> + if (header.compressed != QEMUD_SAVE_FORMAT_RAW) {
> intermediate_argv[0] = prog;
> - else {
Nice catch. ACK.
Looks like it was also causing a segfault:
https://bugzilla.redhat.com/523158
Cheers,
Mark.
More information about the libvir-list
mailing list