From mboxrd@z Thu Jan 1 00:00:00 1970 From: Avi Kivity Subject: Re: [PATCH] kvm: merge fixes for vmstate/block name from qemu.git Date: Thu, 08 Jul 2010 11:37:10 +0300 Message-ID: <4C358E36.5060909@redhat.com> References: <20100707200344.22503.73686.stgit@localhost.localdomain> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Cc: kvm@vger.kernel.org To: Alex Williamson Return-path: Received: from mx1.redhat.com ([209.132.183.28]:59020 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754502Ab0GHIhV (ORCPT ); Thu, 8 Jul 2010 04:37:21 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o688bBc3021747 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 8 Jul 2010 04:37:16 -0400 Received: from cleopatra.tlv.redhat.com (cleopatra.tlv.redhat.com [10.35.255.11]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o688bAYM010914 for ; Thu, 8 Jul 2010 04:37:11 -0400 In-Reply-To: <20100707200344.22503.73686.stgit@localhost.localdomain> Sender: kvm-owner@vger.kernel.org List-ID: 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