On Mon, Jul 26, 2010 at 1:51 PM, Avi Kivity <a...@redhat.com> wrote: > On 07/26/2010 10:01 PM, Cam Macdonell wrote: >> >>> Is this against qemu.git or qemu-kvm.git? It depends on functions like >>> qemu_ram_map() which are not present in qemu.git (and are present in >>> qemu-kvm.git). >> >> It is against qemu-kvm.git. Is qemu_ram_map() going into qemu.git? >> Another function I use (and virtio in qemu-kvm uses as well) is >> kvm_set_irqfd() that is not qemu.git either. Do I need ifdef these >> functions with CONFIG_KVM? >> >> Please advise as to how to handle these two functions and then I can >> rebase against qemu.git. > > Please add qemu_ram_map() as a separate patch to avoid interdependencies. > Try to keep it at the same place etc., that will reduce merge difficulties > later.
qemu_ram_map() isn't my patch, Marcelo pushed it into qemu-kvm, so I dropped my version. Marcelo's version is commit c15414b9 in qemu-kvm.git > > wrt kvm_set_irqfd(), its usage is optional, yes? if so I recommend just > dropping support for it temporarily. I'll work at upstreaming > kvm_set_irqfd() so you can re-add this functionality. Yes, kvm_set_irqfd() is optional. I can drop it for now. > > -- > I have a truly marvellous patch that fixes the bug which this > signature is too narrow to contain. > >
