Re: [Qemu-devel] Merging kvm-apic into qemu-kvm

2012-01-29 Thread Avi Kivity
On 01/29/2012 02:35 PM, Avi Kivity wrote: > On 01/29/2012 02:06 PM, Avi Kivity wrote: > > > > > > Blue posted patches for this. s/<=/ > > > > > > Err, not. I'll just try Blue's patch. > > > > With a fix, migration doesn't complete. Looking into it. > Turns out the migration problems are unrelat

Re: [Qemu-devel] Merging kvm-apic into qemu-kvm

2012-01-29 Thread Avi Kivity
On 01/29/2012 02:06 PM, Avi Kivity wrote: > > > > Blue posted patches for this. s/<=/ > > > Err, not. I'll just try Blue's patch. > With a fix, migration doesn't complete. Looking into it. -- error compiling committee.c: too many arguments to function

Re: [Qemu-devel] Merging kvm-apic into qemu-kvm

2012-01-29 Thread Avi Kivity
On 01/29/2012 02:04 PM, Avi Kivity wrote: > On 01/29/2012 02:02 PM, Jan Kiszka wrote: > > On 2012-01-29 13:01, Avi Kivity wrote: > > > On 01/29/2012 01:54 PM, Jan Kiszka wrote: > > >> On 2012-01-29 12:18, Avi Kivity wrote: > > > > > > 2. Migration is broken. > > > > OK, that's new

Re: [Qemu-devel] Merging kvm-apic into qemu-kvm

2012-01-29 Thread Avi Kivity
On 01/29/2012 02:02 PM, Jan Kiszka wrote: > On 2012-01-29 13:01, Avi Kivity wrote: > > On 01/29/2012 01:54 PM, Jan Kiszka wrote: > >> On 2012-01-29 12:18, Avi Kivity wrote: > > > > 2. Migration is broken. > > OK, that's new. A trivial scenario? > > >>> > >>> Incoming command

Re: [Qemu-devel] Merging kvm-apic into qemu-kvm

2012-01-29 Thread Jan Kiszka
On 2012-01-29 13:01, Avi Kivity wrote: > On 01/29/2012 01:54 PM, Jan Kiszka wrote: >> On 2012-01-29 12:18, Avi Kivity wrote: > > 2. Migration is broken. OK, that's new. A trivial scenario? >>> >>> Incoming command line: >>> >>> qemu-system-x86_64 -m 512 /images/Fedora.img -

Re: [Qemu-devel] Merging kvm-apic into qemu-kvm

2012-01-29 Thread Avi Kivity
On 01/29/2012 01:54 PM, Jan Kiszka wrote: > On 2012-01-29 12:18, Avi Kivity wrote: > >>> > >>> 2. Migration is broken. > >> > >> OK, that's new. A trivial scenario? > >> > > > > Incoming command line: > > > > qemu-system-x86_64 -m 512 /images/Fedora.img -smp 2 -monitor stdio > > -incoming tcp::

Re: [Qemu-devel] Merging kvm-apic into qemu-kvm

2012-01-29 Thread Jan Kiszka
On 2012-01-29 12:18, Avi Kivity wrote: >>> >>> 2. Migration is broken. >> >> OK, that's new. A trivial scenario? >> > > Incoming command line: > > qemu-system-x86_64 -m 512 /images/Fedora.img -smp 2 -monitor stdio > -incoming tcp:: > > I expect you can remove '-smp 2' and it would still fa

Re: [Qemu-devel] Merging kvm-apic into qemu-kvm

2012-01-29 Thread Jan Kiszka
On 2012-01-29 12:18, Avi Kivity wrote: > On 01/29/2012 01:15 PM, Jan Kiszka wrote: >> On 2012-01-29 12:12, Avi Kivity wrote: >>> On 01/29/2012 12:33 PM, Avi Kivity wrote: On 01/27/2012 11:34 PM, Jan Kiszka wrote: >> >> Yes please. It's halfway through autotest and looks good. Even if

Re: [Qemu-devel] Merging kvm-apic into qemu-kvm

2012-01-29 Thread Avi Kivity
On 01/29/2012 01:15 PM, Jan Kiszka wrote: > On 2012-01-29 12:12, Avi Kivity wrote: > > On 01/29/2012 12:33 PM, Avi Kivity wrote: > >> On 01/27/2012 11:34 PM, Jan Kiszka wrote: > > Yes please. It's halfway through autotest and looks good. Even if I > have to change it, we can 'git r

Re: [Qemu-devel] Merging kvm-apic into qemu-kvm

2012-01-29 Thread Jan Kiszka
On 2012-01-29 12:12, Avi Kivity wrote: > On 01/29/2012 12:33 PM, Avi Kivity wrote: >> On 01/27/2012 11:34 PM, Jan Kiszka wrote: Yes please. It's halfway through autotest and looks good. Even if I have to change it, we can 'git rebase -p --onto' your branch (though I doubt it w

Re: [Qemu-devel] Merging kvm-apic into qemu-kvm

2012-01-29 Thread Avi Kivity
On 01/29/2012 12:33 PM, Avi Kivity wrote: > On 01/27/2012 11:34 PM, Jan Kiszka wrote: > > > > > > Yes please. It's halfway through autotest and looks good. Even if I > > > have to change it, we can 'git rebase -p --onto' your branch (though I > > > doubt it will be necessary). > > > > Done, see

Re: [Qemu-devel] Merging kvm-apic into qemu-kvm

2012-01-29 Thread Avi Kivity
On 01/27/2012 11:34 PM, Jan Kiszka wrote: > > > > Yes please. It's halfway through autotest and looks good. Even if I > > have to change it, we can 'git rebase -p --onto' your branch (though I > > doubt it will be necessary). > > Done, see > > git://git.kiszka.org/qemu-kvm.git queues/qemu-merge

Re: [Qemu-devel] Merging kvm-apic into qemu-kvm

2012-01-27 Thread Jan Kiszka
On 2012-01-26 16:49, Avi Kivity wrote: > On 01/26/2012 05:45 PM, Jan Kiszka wrote: >>> I merged the upstream patches one by one, resolving the mechanical and logical conflicts in each step. Was done for that backend/frontend concept, but the adjustments should basically be the same n

Re: [Qemu-devel] Merging kvm-apic into qemu-kvm

2012-01-26 Thread Avi Kivity
On 01/26/2012 05:45 PM, Jan Kiszka wrote: > > > >> I merged the upstream patches one by one, resolving the mechanical and > >> logical conflicts in each step. Was done for that backend/frontend > >> concept, but the adjustments should basically be the same now. Want me > >> to prepare a branch or

Re: [Qemu-devel] Merging kvm-apic into qemu-kvm

2012-01-26 Thread Jan Kiszka
On 2012-01-26 16:39, Avi Kivity wrote: > On 01/26/2012 05:32 PM, Jan Kiszka wrote: >> On 2012-01-26 16:25, Jan Kiszka wrote: >>> On 2012-01-26 16:15, Avi Kivity wrote: The changes to kvm-apic are so drastic, that merging them into qemu-kvm in the normal way won't work. I can consider jus

Re: [Qemu-devel] Merging kvm-apic into qemu-kvm

2012-01-26 Thread Avi Kivity
On 01/26/2012 05:32 PM, Jan Kiszka wrote: > On 2012-01-26 16:25, Jan Kiszka wrote: > > On 2012-01-26 16:15, Avi Kivity wrote: > >> The changes to kvm-apic are so drastic, that merging them into qemu-kvm > >> in the normal way won't work. I can consider just dropping the existing > >> implementatio

Re: [Qemu-devel] Merging kvm-apic into qemu-kvm

2012-01-26 Thread Jan Kiszka
On 2012-01-26 16:25, Jan Kiszka wrote: > On 2012-01-26 16:15, Avi Kivity wrote: >> The changes to kvm-apic are so drastic, that merging them into qemu-kvm >> in the normal way won't work. I can consider just dropping the existing >> implementation and switching to the new one, but the comment at t

Re: [Qemu-devel] Merging kvm-apic into qemu-kvm

2012-01-26 Thread Jan Kiszka
On 2012-01-26 16:15, Avi Kivity wrote: > The changes to kvm-apic are so drastic, that merging them into qemu-kvm > in the normal way won't work. I can consider just dropping the existing > implementation and switching to the new one, but the comment at the end > > Make the basic in-kernel irq

[Qemu-devel] Merging kvm-apic into qemu-kvm

2012-01-26 Thread Avi Kivity
The changes to kvm-apic are so drastic, that merging them into qemu-kvm in the normal way won't work. I can consider just dropping the existing implementation and switching to the new one, but the comment at the end Make the basic in-kernel irqchip support selectable via -machine ...,kern