Re: [GIT PULL] kvm upstream updates

Jan Kiszka
2011-01-02T13:49:12Z

[-- Attachment #1: Type: text/plain, Size: 920 bytes --]

Am 31.12.2010 14:14, Jan Kiszka wrote:
> Am 29.12.2010 16:42, Avi Kivity wrote:
>> On 12/29/2010 05:05 PM, Jan Kiszka wrote:
>>> Am 28.12.2010 11:36, Avi Kivity wrote:
>>>> Marcelo Tosatti (1):
>>>> Expose thread_id in info cpus
>>>
>>> As I'm currently unable to find this particular version of the last
>>> patch in the archive:
>>>
>>> LINK i386-linux-user/qemu-i386
>>> exec.o: In function `cpu_exec_init':
>>> /data/qemu-kvm/exec.c:634: undefined reference to `get_thread_id'
>>>
>>
>> I'll take a look.
>
> OK. And please rebase over current qemu master. I tried to pull in the
> series to prepare qemu-kvm for the back merge, but it generated to much
> conflicts, pointing out that uq/master is outdated.

That was false alarm. Current uq/master actually nicely applies on
qemu/master. My problems turned out to be related to subtle differences
in the qemu-kvm tree.