[libvirt] [REBASE PATCH v2 4/8] qemu: Add new parameter to qemuMonitorDumpToFd

[Michal Privoznik]

On 01/04/2018 07:27 PM, John Ferlan wrote:
> Add a @detach parameter to the API in order allow running the QEMU
> code as a thread.
> 
> Signed-off-by: John Ferlan <jferlan at redhat.com>
> ---
>  src/qemu/qemu_driver.c       | 2 +-
>  src/qemu/qemu_monitor.c      | 7 +++++--
>  src/qemu/qemu_monitor.h      | 3 ++-
>  src/qemu/qemu_monitor_json.c | 4 +++-
>  src/qemu/qemu_monitor_json.h | 3 ++-
>  tests/qemumonitorjsontest.c  | 3 ++-
>  6 files changed, 15 insertions(+), 7 deletions(-)
> 
> diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
> index 4eb8521c4..8d3422198 100644
> --- a/src/qemu/qemu_driver.c
> +++ b/src/qemu/qemu_driver.c
> @@ -3796,7 +3796,7 @@ qemuDumpToFd(virQEMUDriverPtr driver,
>          }
>      }
>  
> -    ret = qemuMonitorDumpToFd(priv->mon, fd, dumpformat);
> +    ret = qemuMonitorDumpToFd(priv->mon, fd, dumpformat, false);
>  
>   cleanup:
>      ignore_value(qemuDomainObjExitMonitor(driver, vm));

I'm unable to apply this one because of this hunk. Are you sure you've
rebased onto latest HEAD? the offset looks odd: 3796 looks like too
much, I have this code at 3785. However, even when I fix it in the
patch, I'm still unable to apply:

Applying: qemu: Add new parameter to qemuMonitorDumpToFd
error: sha1 information is lacking or useless (src/qemu/qemu_driver.c).
error: could not build fake ancestor
Patch failed at 0004 qemu: Add new parameter to qemuMonitorDumpToFd

Michal