From patchwork Wed Dec 12 22:39:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Tosatti X-Patchwork-Id: 205676 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1CE642C008A for ; Thu, 13 Dec 2012 09:40:53 +1100 (EST) Received: from localhost ([::1]:41740 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tiuyx-0005cb-99 for incoming@patchwork.ozlabs.org; Wed, 12 Dec 2012 17:40:51 -0500 Received: from eggs.gnu.org ([208.118.235.92]:40342) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tiuyo-0005aa-Hi for qemu-devel@nongnu.org; Wed, 12 Dec 2012 17:40:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tiuyn-00007E-A0 for qemu-devel@nongnu.org; Wed, 12 Dec 2012 17:40:42 -0500 Received: from mx1.redhat.com ([209.132.183.28]:27766) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tiuyn-00006x-3J for qemu-devel@nongnu.org; Wed, 12 Dec 2012 17:40:41 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qBCMeZXQ032563 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 12 Dec 2012 17:40:39 -0500 Received: from amt.cnet (vpn1-6-41.gru2.redhat.com [10.97.6.41]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qBCMe2c9031903; Wed, 12 Dec 2012 17:40:02 -0500 Received: from amt.cnet (amt.cnet [127.0.0.1]) by amt.cnet (Postfix) with ESMTP id E8F6766E17E; Wed, 12 Dec 2012 20:39:19 -0200 (BRST) Received: (from marcelo@localhost) by amt.cnet (8.14.5/8.14.5/Submit) id qBCMdJm4003389; Wed, 12 Dec 2012 20:39:19 -0200 Date: Wed, 12 Dec 2012 20:39:19 -0200 From: Marcelo Tosatti To: qemu-devel@nongnu.org Message-ID: <20121212223919.GA3190@amt.cnet> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Paolo Bonzini , Anthony Liguori , Cole Robinson Subject: [Qemu-devel] [PATCH] define qemukvm-1.2 machine type X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org To allow migration from qemu-kvm-1.2, where cirrus device has 16 megabytes of RAM. Signed-off-by: Marcelo Tosatti diff --git a/hw/pc_piix.c b/hw/pc_piix.c index 19e342a..ead4b6b 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -347,6 +347,26 @@ static QEMUMachine pc_machine_v1_2 = { }, }; +#define QEMUKVMPC_COMPAT_1_2 \ + {\ + .driver = "cirrus-vga",\ + .property = "vgamem_mb",\ + .value = "16",\ + } + +static QEMUMachine qemukvmpc_machine_v1_2 = { + .name = "qemukvm-pc-1.2", + .alias = "pc", + .desc = "Standard PC", + .init = pc_init_pci, + .max_cpus = 255, + .compat_props = (GlobalProperty[]) { + QEMUKVMPC_COMPAT_1_2, + PC_COMPAT_1_2, + { /* end of list */ } + }, +}; + #define PC_COMPAT_1_1 \ PC_COMPAT_1_2,\ {\ @@ -645,6 +665,7 @@ static QEMUMachine xenfv_machine = { static void pc_machine_init(void) { + qemu_register_machine(&qemukvmpc_machine_v1_2); qemu_register_machine(&pc_machine_v1_4); qemu_register_machine(&pc_machine_v1_3); qemu_register_machine(&pc_machine_v1_2);