From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:45727)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1S87k6-0007mt-40
	for qemu-devel@nongnu.org; Thu, 15 Mar 2012 06:17:11 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1S87ji-0002zP-R0
	for qemu-devel@nongnu.org; Thu, 15 Mar 2012 06:17:09 -0400
Received: from cantor2.suse.de ([195.135.220.15]:38550 helo=mx2.suse.de)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1S87ji-0002zE-KK
	for qemu-devel@nongnu.org; Thu, 15 Mar 2012 06:16:46 -0400
Message-ID: <4F61C18D.5020102@suse.de>
Date: Thu, 15 Mar 2012 11:16:45 +0100
From: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= <afaerber@suse.de>
MIME-Version: 1.0
References: <1331761376-20362-1-git-send-email-afaerber@suse.de>
	<4F613C8A.8050601@codemonkey.ws>
In-Reply-To: <4F613C8A.8050601@codemonkey.ws>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [PULL] QOM CPUState v5 - conflict resolution info
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org
Cc: Anthony Liguori <anthony@codemonkey.ws>

Am 15.03.2012 01:49, schrieb Anthony Liguori:
> On 03/14/2012 04:42 PM, Andreas F=C3=A4rber 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<anthony@codemonkey.ws>
>>
>> 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]
>=20
> 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

--=20
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=C3=BCrnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imend=C3=B6rffer; HRB 16746 AG N=C3=BC=
rnberg