From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:46389) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvUOf-0003ps-0Q for qemu-devel@nongnu.org; Wed, 16 Jan 2013 09:55:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TvUOZ-0007Qw-02 for qemu-devel@nongnu.org; Wed, 16 Jan 2013 09:55:20 -0500 Received: from e8.ny.us.ibm.com ([32.97.182.138]:38529) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvUOY-0007Qs-Sf for qemu-devel@nongnu.org; Wed, 16 Jan 2013 09:55:14 -0500 Received: from /spool/local by e8.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 16 Jan 2013 09:55:14 -0500 Received: from d01relay04.pok.ibm.com (d01relay04.pok.ibm.com [9.56.227.236]) by d01dlp01.pok.ibm.com (Postfix) with ESMTP id 56B8038C8065 for ; Wed, 16 Jan 2013 09:54:43 -0500 (EST) Received: from d03av06.boulder.ibm.com (d03av06.boulder.ibm.com [9.17.195.245]) by d01relay04.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r0GEsfSf239420 for ; Wed, 16 Jan 2013 09:54:42 -0500 Received: from d03av06.boulder.ibm.com (loopback [127.0.0.1]) by d03av06.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r0GEtpBq011412 for ; Wed, 16 Jan 2013 07:55:52 -0700 From: Anthony Liguori In-Reply-To: <1358339133.1949.6.camel@abi.no.oracle.com> References: <8738y1wfzc.fsf@blackfin.pond.sub.org> <1358339133.1949.6.camel@abi.no.oracle.com> Date: Wed, 16 Jan 2013 08:53:34 -0600 Message-ID: <87pq15ji1d.fsf@codemonkey.ws> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Subject: Re: [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: Knut Omang , qemu-devel@nongnu.org Cc: Avik Sil , Markus Armbruster Knut Omang writes: > Without this default q35/ppc405 based machines would no longer boot > after commit e4ada29e909787f629626660b1561f6a680187d3 > > Signed-off-by: Knut Omang Please post as a top-level patch. Doing it like this breaks threading. Regards, Anthony Liguori > --- > 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