From patchwork Wed Jan 16 08:15:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Knut Omang X-Patchwork-Id: 212428 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 660132C007C for ; Wed, 16 Jan 2013 19:15:59 +1100 (EST) Received: from localhost ([::1]:41426 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvOA9-0007kw-GH for incoming@patchwork.ozlabs.org; Wed, 16 Jan 2013 03:15:57 -0500 Received: from eggs.gnu.org ([208.118.235.92]:37267) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvO9q-0007CN-NA for qemu-devel@nongnu.org; Wed, 16 Jan 2013 03:15:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TvO9o-0006nI-4r for qemu-devel@nongnu.org; Wed, 16 Jan 2013 03:15:38 -0500 Received: from userp1040.oracle.com ([156.151.31.81]:51641) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvO9n-0006nA-U5 for qemu-devel@nongnu.org; Wed, 16 Jan 2013 03:15:36 -0500 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id r0G8FVLG028351 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 16 Jan 2013 08:15:32 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r0G8FUrr012785 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 16 Jan 2013 08:15:31 GMT Received: from abhmt109.oracle.com (abhmt109.oracle.com [141.146.116.61]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id r0G8FU9U001664; Wed, 16 Jan 2013 02:15:30 -0600 Received: from [10.172.144.123] (/10.172.144.123) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 16 Jan 2013 00:15:30 -0800 Message-ID: <1358324127.1949.4.camel@abi.no.oracle.com> From: Knut Omang To: qemu-devel@nongnu.org Date: Wed, 16 Jan 2013 09:15:27 +0100 X-Mailer: Evolution 3.4.4 (3.4.4-2.fc17) Mime-Version: 1.0 X-Source-IP: ucsinet22.oracle.com [156.151.31.94] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 156.151.31.81 Cc: Anthony Liguori , Avik Sil Subject: [Qemu-devel] [PATCH] Add new DEFAULT_MACHINE_OPTIONS to q35 as well 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 a typical q35 based setup would no longer boot after commit e4ada29e909787f629626660b1561f6a680187d3 Signed-off-by: Knut Omang --- hw/pc_q35.c | 1 + 1 file changed, 1 insertion(+) 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)