From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:34131) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvS3u-0007Uf-OH for qemu-devel@nongnu.org; Wed, 16 Jan 2013 07:25:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TvS3q-0001lz-Af for qemu-devel@nongnu.org; Wed, 16 Jan 2013 07:25:46 -0500 Received: from aserp1040.oracle.com ([141.146.126.69]:21539) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvS3p-0001lr-LW for qemu-devel@nongnu.org; Wed, 16 Jan 2013 07:25:42 -0500 Message-ID: <1358339133.1949.6.camel@abi.no.oracle.com> From: Knut Omang Date: Wed, 16 Jan 2013 13:25:33 +0100 In-Reply-To: <8738y1wfzc.fsf@blackfin.pond.sub.org> References: <8738y1wfzc.fsf@blackfin.pond.sub.org> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH v2] Add new DEFAULT_MACHINE_OPTIONS to q35 and ppc405 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , Avik Sil , Markus Armbruster Without this default q35/ppc405 based machines would no longer boot after commit e4ada29e909787f629626660b1561f6a680187d3 Signed-off-by: Knut Omang --- 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, }; /*****************************************************************************/ -- 1.7.11.7