Re: [PATCH] kvm: merge fixes for vmstate/block name from qemu.git

[Avi Kivity <avi@redhat.com>]

On 07/07/2010 11:08 PM, Alex Williamson wrote:
> Also updates qemu_ram_map() and create qemu_ram_unmap() to match
> qemu_ram_alloc/qemu_ram_free().
>
>    

Patch does not apply, multiple failures.  Are you patching an old tree?

>   This patch should fix all the qemu-kvm build failures that will occur as
>   a result of my qemu.git series fixing migration after hotplug.  This also
>   updates device-assignment to the new qemu_ram_* calling standards so
>   migration will also work after a hotunplug of a pci-assign device.
>    

A bit much for a single patch.  Can you split it a bit?

> index 403337a..fd426b7 100644
> --- a/qemu-kvm-x86.c
> +++ b/qemu-kvm-x86.c
> @@ -598,7 +598,7 @@ int kvm_arch_qemu_create_context(void)
>
>   #ifdef KVM_CAP_ADJUST_CLOCK
>       if (kvm_check_extension(kvm_state, KVM_CAP_ADJUST_CLOCK))
> -        vmstate_register(0,&vmstate_kvmclock,&kvmclock_data);
> +        vmstate_register(NULL, 0,&vmstate_kvmclock,&kvmclock_data);
>   #endif
>
>    

It's worrying that I didn't see this.  I'll update the kvm headers in 
qemu-kvm.git.

-- 
error compiling committee.c: too many arguments to function