Re: [Qemu-devel] [PULL] QOM CPUState v5 - conflict resolution info

[Andreas Färber]

Am 15.03.2012 01:49, schrieb Anthony Liguori:
> On 03/14/2012 04:42 PM, Andreas Färber wrote:
>> Hello Anthony,
>>
>> Please pull the second QOM CPU series,
>> which frees the identifiers cpu_reset and CPUState and introduces
>> TYPE_CPU.
>>
>> Cc: Anthony Liguori<address@hidden>
>>
>> The following changes since commit
>> 418ba9e5d6849ef2e8512d8853628ce4bf37937a:
>>
>>    qom: Introduce object_class_get_list() (2012-03-14 15:30:39 -0500)
>>
>> are available in the git repository at:
>>    git://repo.or.cz/qemu/afaerber.git [qom-cpu.v5]
> 
> Pulled.  Thanks.

Thanks.

A note to everyone who's now getting compilation errors for CPUState for
their patches or on local branches:

The meaning of CPUState was changed in this series: It used to be a
#define pointing to struct CPU${arch}State, it is now a typedef for a
QOM struct.

* If your code is target-specific, use CPU${arch}State.
  These structs will remain for TCG.

* Otherwise if it's code for multiple targets, use CPUArchState alias.
  That's considered deprecated and will be dropped in favor of CPUState.

"We apologize for the inconvenience,"

Andreas

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg