From patchwork Thu Sep 10 09:43:24 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 33298 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by bilbo.ozlabs.org (Postfix) with ESMTPS id 149A3B7088 for ; Thu, 10 Sep 2009 20:30:24 +1000 (EST) Received: from localhost ([127.0.0.1]:48985 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mlgux-0006SW-Qz for incoming@patchwork.ozlabs.org; Thu, 10 Sep 2009 06:30:19 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MlgBv-0008TO-LZ for qemu-devel@nongnu.org; Thu, 10 Sep 2009 05:43:47 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MlgBp-0008Q6-7q for qemu-devel@nongnu.org; Thu, 10 Sep 2009 05:43:45 -0400 Received: from [199.232.76.173] (port=39537 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MlgBo-0008Pu-Sq for qemu-devel@nongnu.org; Thu, 10 Sep 2009 05:43:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34112) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MlgBo-0005Uh-Fi for qemu-devel@nongnu.org; Thu, 10 Sep 2009 05:43:40 -0400 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.13.8/8.13.8) with ESMTP id n8A9hd6I030005 for ; Thu, 10 Sep 2009 05:43:39 -0400 Received: from zweiblum.home.kraxel.org (vpn2-9-74.ams2.redhat.com [10.36.9.74]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id n8A9hbvY030512; Thu, 10 Sep 2009 05:43:38 -0400 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id B7343700DD; Thu, 10 Sep 2009 11:43:35 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 10 Sep 2009 11:43:24 +0200 Message-Id: <1252575815-7824-3-git-send-email-kraxel@redhat.com> In-Reply-To: <1252575815-7824-1-git-send-email-kraxel@redhat.com> References: <1252575815-7824-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH v2 02/13] isapc: pick a more sane default cpu for such old hardware. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Gerd Hoffmann --- hw/pc.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index 9af0cdb..872cb3a 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -1450,6 +1450,8 @@ static void pc_init_isa(ram_addr_t ram_size, const char *initrd_filename, const char *cpu_model) { + if (cpu_model == NULL) + cpu_model = "486"; pc_init1(ram_size, boot_device, kernel_filename, kernel_cmdline, initrd_filename, cpu_model, 0);