From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NiaiR-0005op-AL
	for qemu-devel@nongnu.org; Fri, 19 Feb 2010 16:48:51 -0500
Received: from [199.232.76.173] (port=43104 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NiaiQ-0005ob-PQ
	for qemu-devel@nongnu.org; Fri, 19 Feb 2010 16:48:50 -0500
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.60) (envelope-from <anthony@codemonkey.ws>) id 1NiaiP-0007TN-8J
	for qemu-devel@nongnu.org; Fri, 19 Feb 2010 16:48:50 -0500
Received: from mail-yw0-f197.google.com ([209.85.211.197]:52212)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <anthony@codemonkey.ws>) id 1NiaiP-0007RV-0A
	for qemu-devel@nongnu.org; Fri, 19 Feb 2010 16:48:49 -0500
Received: by mail-yw0-f197.google.com with SMTP id 35so510982ywh.4
	for <qemu-devel@nongnu.org>; Fri, 19 Feb 2010 13:48:48 -0800 (PST)
Message-ID: <4B7F073E.5060901@codemonkey.ws>
Date: Fri, 19 Feb 2010 15:48:46 -0600
From: Anthony Liguori <anthony@codemonkey.ws>
MIME-Version: 1.0
Subject: Re: [Qemu-devel] [PATCH v2 1/3] pc: Bump up pc version to 0.13 and
	add a 0.12 compat version
References: <1266246836-19932-1-git-send-email-amit.shah@redhat.com>
In-Reply-To: <1266246836-19932-1-git-send-email-amit.shah@redhat.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Amit Shah <amit.shah@redhat.com>
Cc: qemu-devel@nongnu.org, kraxel@redhat.com

On 02/15/2010 09:13 AM, Amit Shah wrote:
> The version 0.13 will be the new default and compatibility options will
> be added to the 0.12 version.
>
> Signed-off-by: Amit Shah<amit.shah@redhat.com>
>    

Applied.  Thanks.

Regards,

Anthony Liguori
> ---
> v2: register the 0.12 version in this patch instead of the next one.
>
>   hw/pc.c |   10 +++++++++-
>   1 files changed, 9 insertions(+), 1 deletions(-)
>
> diff --git a/hw/pc.c b/hw/pc.c
> index 6fbe98b..c27ad0f 100644
> --- a/hw/pc.c
> +++ b/hw/pc.c
> @@ -1052,7 +1052,7 @@ void cmos_set_s3_resume(void)
>   }
>
>   static QEMUMachine pc_machine = {
> -    .name = "pc-0.12",
> +    .name = "pc-0.13",
>       .alias = "pc",
>       .desc = "Standard PC",
>       .init = pc_init_pci,
> @@ -1060,6 +1060,13 @@ static QEMUMachine pc_machine = {
>       .is_default = 1,
>   };
>
> +static QEMUMachine pc_machine_v0_12 = {
> +    .name = "pc-0.12",
> +    .desc = "Standard PC",
> +    .init = pc_init_pci,
> +    .max_cpus = 255,
> +};
> +
>   static QEMUMachine pc_machine_v0_11 = {
>       .name = "pc-0.11",
>       .desc = "Standard PC, qemu 0.11",
> @@ -1136,6 +1143,7 @@ static QEMUMachine isapc_machine = {
>   static void pc_machine_init(void)
>   {
>       qemu_register_machine(&pc_machine);
> +    qemu_register_machine(&pc_machine_v0_12);
>       qemu_register_machine(&pc_machine_v0_11);
>       qemu_register_machine(&pc_machine_v0_10);
>       qemu_register_machine(&isapc_machine);
>