From: Wei Yang <richardw.yang@linux.intel.com> To: qemu-devel@nongnu.org Cc: ehabkost@redhat.com, marcel.apfelbaum@gmail.com, pbonzini@redhat.com, armbru@redhat.com, Wei Yang <richardw.yang@linux.intel.com> Subject: [Qemu-devel] [PATCH v2 1/4] vl.c: make find_default_machine() local Date: Fri, 5 Apr 2019 14:41:18 +0800 [thread overview] Message-ID: <20190405064121.23662-2-richardw.yang@linux.intel.com> (raw) In-Reply-To: <20190405064121.23662-1-richardw.yang@linux.intel.com> Function find_default_machine() is introduced by commit 2c8cffa599b7 "vl: make find_default_machine externally visible", and it was used outside of vl.c until commit a904410af5f1 "pc_sysfw: remove the rom_only property". Commit a904410af5f1 "pc_sysfw: remove the rom_only property" removed the only user of find_default_machine() outside vl.c, but neglected to make it static. Do that now. Signed-off-by: Wei Yang <richardw.yang@linux.intel.com> --- v2: * refactor changelog as suggested by Markus * move one not related change to patch 2 --- include/hw/boards.h | 1 - vl.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index 21212f0859..e911d56c28 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -57,7 +57,6 @@ void memory_region_allocate_system_memory(MemoryRegion *mr, Object *owner, #define MACHINE_CLASS(klass) \ OBJECT_CLASS_CHECK(MachineClass, (klass), TYPE_MACHINE) -MachineClass *find_default_machine(void); extern MachineState *current_machine; void machine_run_board_init(MachineState *machine); diff --git a/vl.c b/vl.c index 502857a176..8a874e81a3 100644 --- a/vl.c +++ b/vl.c @@ -1441,7 +1441,7 @@ static MachineClass *find_machine(const char *name) return mc; } -MachineClass *find_default_machine(void) +static MachineClass *find_default_machine(void) { GSList *el, *machines = object_class_get_list(TYPE_MACHINE, false); MachineClass *mc = NULL; -- 2.19.1
WARNING: multiple messages have this Message-ID (diff)
From: Wei Yang <richardw.yang@linux.intel.com> To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, Wei Yang <richardw.yang@linux.intel.com>, ehabkost@redhat.com, armbru@redhat.com Subject: [Qemu-devel] [PATCH v2 1/4] vl.c: make find_default_machine() local Date: Fri, 5 Apr 2019 14:41:18 +0800 [thread overview] Message-ID: <20190405064121.23662-2-richardw.yang@linux.intel.com> (raw) Message-ID: <20190405064118.9eCkI3t7VsA4OvzyxvuN1Z3GHqjffUr07SoeaPLiB3E@z> (raw) In-Reply-To: <20190405064121.23662-1-richardw.yang@linux.intel.com> Function find_default_machine() is introduced by commit 2c8cffa599b7 "vl: make find_default_machine externally visible", and it was used outside of vl.c until commit a904410af5f1 "pc_sysfw: remove the rom_only property". Commit a904410af5f1 "pc_sysfw: remove the rom_only property" removed the only user of find_default_machine() outside vl.c, but neglected to make it static. Do that now. Signed-off-by: Wei Yang <richardw.yang@linux.intel.com> --- v2: * refactor changelog as suggested by Markus * move one not related change to patch 2 --- include/hw/boards.h | 1 - vl.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index 21212f0859..e911d56c28 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -57,7 +57,6 @@ void memory_region_allocate_system_memory(MemoryRegion *mr, Object *owner, #define MACHINE_CLASS(klass) \ OBJECT_CLASS_CHECK(MachineClass, (klass), TYPE_MACHINE) -MachineClass *find_default_machine(void); extern MachineState *current_machine; void machine_run_board_init(MachineState *machine); diff --git a/vl.c b/vl.c index 502857a176..8a874e81a3 100644 --- a/vl.c +++ b/vl.c @@ -1441,7 +1441,7 @@ static MachineClass *find_machine(const char *name) return mc; } -MachineClass *find_default_machine(void) +static MachineClass *find_default_machine(void) { GSList *el, *machines = object_class_get_list(TYPE_MACHINE, false); MachineClass *mc = NULL; -- 2.19.1
next prev parent reply other threads:[~2019-04-05 6:42 UTC|newest] Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-04-05 6:41 [Qemu-devel] [PATCH v2 0/4] cleanup select_machine Wei Yang 2019-04-05 6:41 ` Wei Yang 2019-04-05 6:41 ` Wei Yang [this message] 2019-04-05 6:41 ` [Qemu-devel] [PATCH v2 1/4] vl.c: make find_default_machine() local Wei Yang 2019-04-08 8:59 ` Markus Armbruster 2019-04-08 8:59 ` Markus Armbruster 2019-04-05 6:41 ` [Qemu-devel] [PATCH v2 2/4] vl.c: allocate TYPE_MACHINE list once during bootup Wei Yang 2019-04-05 6:41 ` Wei Yang 2019-04-05 6:41 ` [Qemu-devel] [PATCH v2 3/4] vl: Clean up after previous commit Wei Yang 2019-04-05 6:41 ` Wei Yang 2019-04-05 6:41 ` [Qemu-devel] [PATCH v2 4/4] vl: Simplify machine_parse() Wei Yang 2019-04-05 6:41 ` Wei Yang 2019-04-12 20:42 ` [Qemu-devel] [PATCH v2 0/4] cleanup select_machine Eduardo Habkost 2019-04-12 20:42 ` Eduardo Habkost
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190405064121.23662-2-richardw.yang@linux.intel.com \ --to=richardw.yang@linux.intel.com \ --cc=armbru@redhat.com \ --cc=ehabkost@redhat.com \ --cc=marcel.apfelbaum@gmail.com \ --cc=pbonzini@redhat.com \ --cc=qemu-devel@nongnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).