From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43363) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UnUDJ-0007jp-Pa for qemu-devel@nongnu.org; Fri, 14 Jun 2013 09:38:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UnUDI-0005Nd-I3 for qemu-devel@nongnu.org; Fri, 14 Jun 2013 09:38:49 -0400 Received: from e39.co.us.ibm.com ([32.97.110.160]:34160) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UnUDI-0005NS-Bz for qemu-devel@nongnu.org; Fri, 14 Jun 2013 09:38:48 -0400 Received: from /spool/local by e39.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 14 Jun 2013 07:38:47 -0600 Received: from d03relay04.boulder.ibm.com (d03relay04.boulder.ibm.com [9.17.195.106]) by d03dlp02.boulder.ibm.com (Postfix) with ESMTP id 20EB93E4004E for ; Fri, 14 Jun 2013 07:38:27 -0600 (MDT) Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d03relay04.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r5EDcfVd283100 for ; Fri, 14 Jun 2013 07:38:41 -0600 Received: from d03av02.boulder.ibm.com (loopback [127.0.0.1]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r5EDcbZq022173 for ; Fri, 14 Jun 2013 07:38:37 -0600 From: Anthony Liguori In-Reply-To: <1371208516-7857-5-git-send-email-armbru@redhat.com> References: <1371208516-7857-1-git-send-email-armbru@redhat.com> <1371208516-7857-5-git-send-email-armbru@redhat.com> Date: Fri, 14 Jun 2013 08:38:32 -0500 Message-ID: <87sj0kg6cn.fsf@codemonkey.ws> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Subject: Re: [Qemu-devel] [PATCH v3 04/16] vl: Rename *boot_devices to *boot_order, for consistency List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster , qemu-devel@nongnu.org Cc: jan.kiszka@siemens.com, alex.williamson@redhat.com, afaerber@suse.de, aviksil@linux.vnet.ibm.com Markus Armbruster writes: > Signed-off-by: Markus Armbruster Reviewed-by: Anthony Liguori Regards, Anthony Liguori > --- > include/hw/hw.h | 4 ++-- > vl.c | 16 ++++++++-------- > 2 files changed, 10 insertions(+), 10 deletions(-) > > diff --git a/include/hw/hw.h b/include/hw/hw.h > index 1fb9afa..cc9f847 100644 > --- a/include/hw/hw.h > +++ b/include/hw/hw.h > @@ -44,9 +44,9 @@ void qemu_unregister_reset(QEMUResetHandler *func, void *opaque); > > /* handler to set the boot_device order for a specific type of QEMUMachine */ > /* return 0 if success */ > -typedef int QEMUBootSetHandler(void *opaque, const char *boot_devices); > +typedef int QEMUBootSetHandler(void *opaque, const char *boot_order); > void qemu_register_boot_set(QEMUBootSetHandler *func, void *opaque); > -int qemu_boot_set(const char *boot_devices); > +int qemu_boot_set(const char *boot_order); > > #ifdef NEED_CPU_H > #if TARGET_LONG_BITS == 64 > diff --git a/vl.c b/vl.c > index f51d8e8..17daedd 100644 > --- a/vl.c > +++ b/vl.c > @@ -1151,12 +1151,12 @@ void qemu_register_boot_set(QEMUBootSetHandler *func, void *opaque) > boot_set_opaque = opaque; > } > > -int qemu_boot_set(const char *boot_devices) > +int qemu_boot_set(const char *boot_order) > { > if (!boot_set_handler) { > return -EINVAL; > } > - return boot_set_handler(boot_set_opaque, boot_devices); > + return boot_set_handler(boot_set_opaque, boot_order); > } > > static void validate_bootdevices(const char *devices) > @@ -1187,9 +1187,9 @@ static void validate_bootdevices(const char *devices) > } > } > > -static void restore_boot_devices(void *opaque) > +static void restore_boot_order(void *opaque) > { > - char *standard_boot_devices = opaque; > + char *normal_boot_order = opaque; > static int first = 1; > > /* Restore boot order and remove ourselves after the first boot */ > @@ -1198,10 +1198,10 @@ static void restore_boot_devices(void *opaque) > return; > } > > - qemu_boot_set(standard_boot_devices); > + qemu_boot_set(normal_boot_order); > > - qemu_unregister_reset(restore_boot_devices, standard_boot_devices); > - g_free(standard_boot_devices); > + qemu_unregister_reset(restore_boot_order, normal_boot_order); > + g_free(normal_boot_order); > } > > void add_boot_device_path(int32_t bootindex, DeviceState *dev, > @@ -4090,7 +4090,7 @@ int main(int argc, char **argv, char **envp) > validate_bootdevices(once); > normal_boot_order = g_strdup(boot_order); > boot_order = once; > - qemu_register_reset(restore_boot_devices, normal_boot_order); > + qemu_register_reset(restore_boot_order, normal_boot_order); > } > > boot_menu = qemu_opt_get_bool(opts, "menu", boot_menu); > -- > 1.7.11.7