From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52882) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dOWEx-00074b-8g for qemu-devel@nongnu.org; Fri, 23 Jun 2017 17:35:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dOWEu-0001iL-4J for qemu-devel@nongnu.org; Fri, 23 Jun 2017 17:35:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54724) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dOWEt-0001gj-QU for qemu-devel@nongnu.org; Fri, 23 Jun 2017 17:35:40 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 842D51A675E for ; Fri, 23 Jun 2017 21:35:38 +0000 (UTC) Date: Fri, 23 Jun 2017 18:35:29 -0300 From: Eduardo Habkost Message-ID: <20170623213529.GD10776@localhost.localdomain> References: <1498193206-18007-1-git-send-email-peterx@redhat.com> <1498193206-18007-4-git-send-email-peterx@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1498193206-18007-4-git-send-email-peterx@redhat.com> Subject: Re: [Qemu-devel] [PATCH v5 03/10] vl: clean up global property registerations List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Xu Cc: qemu-devel@nongnu.org, Laurent Vivier , Juan Quintela , "Dr . David Alan Gilbert" , Markus Armbruster On Fri, Jun 23, 2017 at 12:46:39PM +0800, Peter Xu wrote: > It's not that clear on how the global properties are registered to > global_props (and also its priority relationship). Let's provide a > single function to be called in main() for that, with comment to explain > it a bit. > > Signed-off-by: Peter Xu > --- > vl.c | 29 ++++++++++++++++++++++++----- > 1 file changed, 24 insertions(+), 5 deletions(-) > > diff --git a/vl.c b/vl.c > index 4452d7a..cdd2ec8 100644 > --- a/vl.c > +++ b/vl.c > @@ -2969,6 +2969,25 @@ static int qemu_read_default_config_file(void) > return 0; > } > > +static void user_register_compat_props(void) > +{ > + qemu_opts_foreach(qemu_find_opts("global"), > + global_init_func, NULL, NULL); I suggest using "compat props" only when referring to global properties registered for internal use (because they help us ensure command-line compatibility). User-provided global properties are just "global properties", not "compat props". > +} > + > +/* > + * Note: we should see that these compat properties are actually > + * having a priority: accel < machine < user. This means e.g. when > + * user specifies something in "-global", it'll always be used with > + * highest priority. > + */ > +static void register_global_properties(MachineState *ms) > +{ > + accel_register_compat_props(ms->accelerator); > + machine_register_compat_props(ms); > + user_register_compat_props(); > +} > + > int main(int argc, char **argv, char **envp) > { > int i; > @@ -4571,11 +4590,11 @@ int main(int argc, char **argv, char **envp) > exit (i == 1 ? 1 : 0); > } > > - accel_register_compat_props(current_machine->accelerator); > - machine_register_compat_props(current_machine); > - > - qemu_opts_foreach(qemu_find_opts("global"), > - global_init_func, NULL, NULL); > + /* > + * Register all the global properties, including accel properties, > + * machine properties, and user-specified ones. > + */ > + register_global_properties(current_machine); > > /* This checkpoint is required by replay to separate prior clock > reading from the other reads, because timer polling functions query > -- > 2.7.4 > > -- Eduardo