From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:38265) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UdFbd-0005MJ-1y for qemu-devel@nongnu.org; Fri, 17 May 2013 04:01:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UdFbb-0001km-6y for qemu-devel@nongnu.org; Fri, 17 May 2013 04:01:36 -0400 Message-ID: <1368777668.20726.3.camel@pasglop> From: Benjamin Herrenschmidt Date: Fri, 17 May 2013 18:01:08 +1000 In-Reply-To: <5195DF61.3070502@suse.de> References: <1368764711-13763-1-git-send-email-david@gibson.dropbear.id.au> <5195DF61.3070502@suse.de> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [Qemu-ppc] [PATCH] target-ppc: Change default machine for 64-bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Andreas =?ISO-8859-1?Q?F=E4rber?= Cc: aurel@aurel32.net, aliguori@us.ibm.com, qemu-ppc@nongnu.org, qemu-devel@nongnu.org, David Gibson On Fri, 2013-05-17 at 09:42 +0200, Andreas F=C3=A4rber wrote: > Am 17.05.2013 06:25, schrieb David Gibson: > > Currently, for qemu-system-ppc64, the default machine type is 'mac99'. > > Since the mac99 machine is not being actively maintained, and shows q= uite > > a few signs of bitrot, >=20 > Please be more specific than making such general claims in a commit > message! As the default machine it certainly compiles, so where are you > seeing bitrot? The DEC bridge cleanup that I once started kind of > depends on the PCI cleanup you recently looked into. It certainly doesn't actually work properly and it emulates something that doesn't exist (ie. a G5 with Cuda for god sake :-) pseries is much more useful and well maintained. Cheers, Ben. > Andreas >=20 > > this is not very sensible. This patch changes the > > default machine to 'pseries', which is actively maintained and works = well > > with most modern ppc64 Linux distributions as a guest. > >=20 > > Because the pseries machine type is optional (it is only built when l= ibfdt > > is available), this can result in a build with no default machine. I= n that > > case vl.c will print a "No machine found" message. This seems reason= able, > > given that as mentioned, mac99 is unlikely to be a good choice. > >=20 > > Signed-off-by: David Gibson > > --- > > hw/ppc/mac_newworld.c | 3 --- > > hw/ppc/spapr.c | 1 + > > 2 files changed, 1 insertion(+), 3 deletions(-) > >=20 > > diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c > > index ce44e95..dafe7d2 100644 > > --- a/hw/ppc/mac_newworld.c > > +++ b/hw/ppc/mac_newworld.c > > @@ -458,9 +458,6 @@ static QEMUMachine core99_machine =3D { > > .desc =3D "Mac99 based PowerMAC", > > .init =3D ppc_core99_init, > > .max_cpus =3D MAX_CPUS, > > -#ifdef TARGET_PPC64 > > - .is_default =3D 1, > > -#endif > > DEFAULT_MACHINE_OPTIONS, > > }; > > =20 > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > > index 74a9306..ced1b63 100644 > > --- a/hw/ppc/spapr.c > > +++ b/hw/ppc/spapr.c > > @@ -1348,6 +1348,7 @@ static void ppc_spapr_init(QEMUMachineInitArgs = *args) > > static QEMUMachine spapr_machine =3D { > > .name =3D "pseries", > > .desc =3D "pSeries Logical Partition (PAPR compliant)", > > + .is_default =3D 1, > > .init =3D ppc_spapr_init, > > .reset =3D ppc_spapr_reset, > > .block_default_type =3D IF_SCSI, > >=20 >=20 >=20