From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:47260) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QmoBj-0003iq-7G for qemu-devel@nongnu.org; Fri, 29 Jul 2011 10:37:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QmoBh-0006Un-BH for qemu-devel@nongnu.org; Fri, 29 Jul 2011 10:37:19 -0400 Received: from e9.ny.us.ibm.com ([32.97.182.139]:60816) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QmoBh-0006Ui-7T for qemu-devel@nongnu.org; Fri, 29 Jul 2011 10:37:17 -0400 Received: from d01relay06.pok.ibm.com (d01relay06.pok.ibm.com [9.56.227.116]) by e9.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id p6TE4c59016936 for ; Fri, 29 Jul 2011 10:04:38 -0400 Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by d01relay06.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p6TEbGrO1544446 for ; Fri, 29 Jul 2011 10:37:16 -0400 Received: from d01av04.pok.ibm.com (loopback [127.0.0.1]) by d01av04.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p6TEbEXQ024170 for ; Fri, 29 Jul 2011 10:37:15 -0400 Message-ID: <4E32C598.4050503@us.ibm.com> Date: Fri, 29 Jul 2011 09:37:12 -0500 From: Anthony Liguori MIME-Version: 1.0 References: <4E2AA4AD.2080608@web.de> <20110725094156.GD21852@amd.home.annexia.org> <4E2D465D.7030502@siemens.com> <20110725104542.GR2532@amd.home.annexia.org> <4E2D4CA1.1080504@siemens.com> <4E2D5801.9020904@siemens.com> <4E2D95A8.4060303@siemens.com> In-Reply-To: <4E2D95A8.4060303@siemens.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] Allow to leave type on default in -machine List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Jan Kiszka Cc: Anthony PERARD , Ian Campbell , qemu-devel , Markus Armbruster , "Richard W.M. Jones" On 07/25/2011 11:11 AM, Jan Kiszka wrote: > On 2011-07-25 13:48, Jan Kiszka wrote: >> On 2011-07-25 13:39, Markus Armbruster wrote: >>> Jan Kiszka writes: >>> >>>> On 2011-07-25 12:45, Richard W.M. Jones wrote: >>>>> On Mon, Jul 25, 2011 at 12:33:01PM +0200, Jan Kiszka wrote: >>>>>> On 2011-07-25 11:41, Richard W.M. Jones wrote: >>>>>>> On Sat, Jul 23, 2011 at 12:38:37PM +0200, Jan Kiszka wrote: >>>>>>>> From: Jan Kiszka >>>>>>>> >>>>>>>> -machine somehow suggests that it selects the machine, but it doesn't. >>>>>>>> Fix that before this command is set in stone. >>>>>>>> >>>>>>>> Actually, -machine should supersede -M and allow to introduce arbitrary >>>>>>>> per-machine options to the command line. That will change the internal >>>>>>>> realization again, but we will be able to keep the user interface >>>>>>>> stable. >>>>>>> >>>>>>> This breaks libguestfs which was doing: >>>>>>> >>>>>>> qemu -machine accel=kvm:tcg ... >>>>>>> >>>>>>> We are not passing any -M option at all. We don't particularly care >>>>>>> about the machine type since we're not that performance sensitive and >>>>>>> we don't need to serialize the machine state. >>>>>>> >>>>>>> I have checked, and this works: >>>>>>> >>>>>>> qemu -machine pc,accel=kvm:tcg ... >>>>>>> >>>>>>> "pc" is the default, right? What about for other architectures? >>>>>> >>>>>> Yes, pc is the right default. Other arch have other defaults. >>>>> >>>>> So what you're saying is we have to parse qemu -machine \? output by >>>>> looking for the string '(default)'? eg: >>>>> >>>>> $ ./arm-softmmu/qemu-system-arm -machine \?|fgrep '(default)' >>>>> integratorcp ARM Integrator/CP (ARM926EJ-S) (default) >>>>> >>>>> $ ./i386-softmmu/qemu -machine \?|fgrep '(default)' >>>>> pc-0.14 Standard PC (default) >>>> >>>> I understand, this is clumsy. Will see if we can do better. >>> >>> Is there a technical reason why type isn't optional with -machine? >>> >>> [...] >> >> Maybe it's just the >> >> assert(!permit_abbrev || list->implied_opt_name); >> >> in qemu_opts_parse, but I haven't looked at all details (and all other >> users) yet. > > I was incorrectly pointing the core, the problem is solvable at the > level where we parse -machine: > > -------8<-------- > > This allows to specify -machine options without setting an explicit > machine type. We will pick the default machine in this case. Requesting > the list of available machines is still possible via '-machine ?' e.g. > > Signed-off-by: Jan Kiszka Applied. Thanks. Regards, Anthony Liguori > --- > vl.c | 5 ++++- > 1 files changed, 4 insertions(+), 1 deletions(-) > > diff --git a/vl.c b/vl.c > index 8256504..5e53ddc 100644 > --- a/vl.c > +++ b/vl.c > @@ -2720,7 +2720,10 @@ int main(int argc, char **argv, char **envp) > fprintf(stderr, "parse error: %s\n", optarg); > exit(1); > } > - machine = machine_parse(qemu_opt_get(opts, "type")); > + optarg = qemu_opt_get(opts, "type"); > + if (optarg) { > + machine = machine_parse(optarg); > + } > break; > case QEMU_OPTION_usb: > usb_enabled = 1;