From patchwork Wed Jan 16 15:34:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Knut Omang X-Patchwork-Id: 212883 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 D4D852C0040 for ; Thu, 17 Jan 2013 04:47:29 +1100 (EST) Received: from localhost ([::1]:49543 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvWEc-0001SA-2c for incoming@patchwork.ozlabs.org; Wed, 16 Jan 2013 11:53:06 -0500 Received: from eggs.gnu.org ([208.118.235.92]:56790) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvV6T-0006pD-VR for qemu-devel@nongnu.org; Wed, 16 Jan 2013 10:40:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TvV6S-0002YP-5F for qemu-devel@nongnu.org; Wed, 16 Jan 2013 10:40:37 -0500 Received: from mail-out2.uio.no ([129.240.10.58]:46614) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvV0k-00011l-7a for qemu-devel@nongnu.org; Wed, 16 Jan 2013 10:34:42 -0500 Received: from mail-mx2.uio.no ([129.240.10.30]) by mail-out2.uio.no with esmtp (Exim 4.75) (envelope-from ) id 1TvV0h-00022Y-5o; Wed, 16 Jan 2013 16:34:39 +0100 Received: from 234.80-202-80.nextgentel.com ([80.202.80.234] helo=[172.25.2.6]) by mail-mx2.uio.no with esmtpsa (SSLv3:DHE-RSA-CAMELLIA256-SHA:256) user knuto (Exim 4.80) (envelope-from ) id 1TvV0g-0004K3-GI; Wed, 16 Jan 2013 16:34:39 +0100 Message-ID: <1358350474.8079.12.camel@ori.omang.mine.nu> From: Knut Omang To: qemu-devel@nongnu.org Date: Wed, 16 Jan 2013 16:34:34 +0100 X-Mailer: Evolution 3.2.3 (3.2.3-3.fc16) Mime-Version: 1.0 X-UiO-SPF-Received: X-UiO-Ratelimit-Test: rcpts/h 4 msgs/h 1 sum rcpts/h 7 sum msgs/h 2 total rcpts 117 max rcpts/h 13 ratelimit 0 X-UiO-Spam-info: not spam, SpamAssassin (score=-5.0, required=5.0, autolearn=disabled, TVD_RCVD_IP=0.001, UIO_MAIL_IS_INTERNAL=-5, uiobl=NO, uiouri=NO) X-UiO-Scanned: 38190BF229805AB27ED75F328C3241C9439BAD6F X-UiO-SPAM-Test: remote_host: 80.202.80.234 spam_score: -49 maxlevel 80 minaction 2 bait 0 mail/h: 1 total 46 max/h 4 blacklist 0 greylist 0 ratelimit 0 X-UiOonly: E5FD04FB763856EC4D33DAA376B7F9502C926E20 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 129.240.10.58 X-Mailman-Approved-At: Wed, 16 Jan 2013 11:52:08 -0500 Cc: Anthony Liguori , Avik Sil , Markus Armbruster Subject: [Qemu-devel] [PATCH v2] Add new DEFAULT_MACHINE_OPTIONS to q35 and ppc405 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 Without this default q35/ppc405 based machines would no longer boot after commit e4ada29e909787f629626660b1561f6a680187d3 Signed-off-by: Knut Omang Reviewed-by: Markus Armbruster --- hw/pc_q35.c | 1 + hw/ppc405_boards.c | 1 + 2 files changed, 2 insertions(+) diff --git a/hw/pc_q35.c b/hw/pc_q35.c index 52d9976..d82353e 100644 --- a/hw/pc_q35.c +++ b/hw/pc_q35.c @@ -214,6 +214,7 @@ static QEMUMachine pc_q35_machine = { .desc = "Standard PC (Q35 + ICH9, 2009)", .init = pc_q35_init, .max_cpus = 255, + DEFAULT_MACHINE_OPTIONS, }; static void pc_q35_machine_init(void) diff --git a/hw/ppc405_boards.c b/hw/ppc405_boards.c index 45ed376..cf371db 100644 --- a/hw/ppc405_boards.c +++ b/hw/ppc405_boards.c @@ -362,6 +362,7 @@ static QEMUMachine ref405ep_machine = { .name = "ref405ep", .desc = "ref405ep", .init = ref405ep_init, + DEFAULT_MACHINE_OPTIONS, }; /*****************************************************************************/