On 12/06/20 16:53, Roman Bolshakov wrote:
> It seems rebase is not needed. The queue doesn't include the patch:
> https://lists.gnu.org/archive/html/qemu-devel/2020-05/msg08076.html
Thanks, it had a conflict with
commit f291cf54148e5b9e51c55b9056e4be546492a9ca
Author: Philippe Mathieu-Daudé <phi...@redhat.com>
Date: Tue May 26 19:24:23 2020 +0200
sysemu/hvf: Only declare hvf_allowed when HVF is available
When HVF is not available, the hvf_allowed variable does not exist.
Reviewed-by: Edgar E. Iglesias <edgar.igles...@xilinx.com>
Reviewed-by: Cornelia Huck <coh...@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org>
Reviewed-by: Roman Bolshakov <r.bolsha...@yadro.com>
Message-Id: <20200526172427.17460-4-f4...@amsat.org>
Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
but I've fixed it up now. (It wasn't clear from the commit message that
this patch could not simply be dropped. Unfortunately I didn't have an
OS X installation to test it).
Paolo
