kvm.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Avi Kivity <avi@redhat.com>
To: Alex Williamson <alex.williamson@redhat.com>
Cc: kvm@vger.kernel.org
Subject: Re: [PATCH] kvm: merge fixes for vmstate/block name from qemu.git
Date: Thu, 08 Jul 2010 11:37:10 +0300	[thread overview]
Message-ID: <4C358E36.5060909@redhat.com> (raw)
In-Reply-To: <20100707200344.22503.73686.stgit@localhost.localdomain>

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


      reply	other threads:[~2010-07-08  8:37 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-07-07 20:08 [PATCH] kvm: merge fixes for vmstate/block name from qemu.git Alex Williamson
2010-07-08  8:37 ` Avi Kivity [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4C358E36.5060909@redhat.com \
    --to=avi@redhat.com \
    --cc=alex.williamson@redhat.com \
    --cc=kvm@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).