From patchwork Tue Dec 16 09:22:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gonglei (Arei)" X-Patchwork-Id: 421834 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 0A1FE1400E9 for ; Tue, 16 Dec 2014 21:00:59 +1100 (AEDT) Received: from localhost ([::1]:43809 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0ow5-0007EZ-B1 for incoming@patchwork.ozlabs.org; Tue, 16 Dec 2014 05:00:57 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40324) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0our-0005yE-Cu for qemu-devel@nongnu.org; Tue, 16 Dec 2014 04:59:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y0oum-0006nf-Ds for qemu-devel@nongnu.org; Tue, 16 Dec 2014 04:59:41 -0500 Received: from [218.17.215.175] (port=43844 helo=ceth6) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0oum-0006mx-1P for qemu-devel@nongnu.org; Tue, 16 Dec 2014 04:59:36 -0500 Received: by ceth6 (Postfix, from userid 0) id C36203060728; Tue, 16 Dec 2014 17:23:06 +0800 (HKT) From: arei.gonglei@huawei.com To: qemu-devel@nongnu.org Date: Tue, 16 Dec 2014 17:22:50 +0800 Message-Id: <1418721773-29042-3-git-send-email-arei.gonglei@huawei.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1418721773-29042-1-git-send-email-arei.gonglei@huawei.com> References: <1418721773-29042-1-git-send-email-arei.gonglei@huawei.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 218.17.215.175 Cc: peter.maydell@linaro.org, Gonglei Subject: [Qemu-devel] [PULL 2/5] bootdevice: add Error **errp argument for validate_bootdevices() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Gonglei We can use it for checking when we change traditional boot order dynamically and propagate error message to the monitor. Signed-off-by: Gonglei --- bootdevice.c | 10 +++++----- include/sysemu/sysemu.h | 2 +- vl.c | 15 +++++++++++++-- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/bootdevice.c b/bootdevice.c index aae4cac..184348e 100644 --- a/bootdevice.c +++ b/bootdevice.c @@ -55,7 +55,7 @@ int qemu_boot_set(const char *boot_order) return boot_set_handler(boot_set_opaque, boot_order); } -void validate_bootdevices(const char *devices) +void validate_bootdevices(const char *devices, Error **errp) { /* We just do some generic consistency checks */ const char *p; @@ -72,12 +72,12 @@ void validate_bootdevices(const char *devices) * features. */ if (*p < 'a' || *p > 'p') { - fprintf(stderr, "Invalid boot device '%c'\n", *p); - exit(1); + error_setg(errp, "Invalid boot device '%c'", *p); + return; } if (bitmap & (1 << (*p - 'a'))) { - fprintf(stderr, "Boot device '%c' was given twice\n", *p); - exit(1); + error_setg(errp, "Boot device '%c' was given twice", *p); + return; } bitmap |= 1 << (*p - 'a'); } diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 84798ef..1382d63 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -217,7 +217,7 @@ void device_add_bootindex_property(Object *obj, int32_t *bootindex, const char *name, const char *suffix, DeviceState *dev, Error **errp); void restore_boot_order(void *opaque); -void validate_bootdevices(const char *devices); +void validate_bootdevices(const char *devices, Error **errp); /* handler to set the boot_device order for a specific type of QEMUMachine */ /* return 0 if success */ diff --git a/vl.c b/vl.c index f665621..09dac74 100644 --- a/vl.c +++ b/vl.c @@ -4087,16 +4087,27 @@ int main(int argc, char **argv, char **envp) if (opts) { char *normal_boot_order; const char *order, *once; + Error *local_err = NULL; order = qemu_opt_get(opts, "order"); if (order) { - validate_bootdevices(order); + validate_bootdevices(order, &local_err); + if (local_err) { + error_report("%s", error_get_pretty(local_err)); + error_free(local_err); + exit(1); + } boot_order = order; } once = qemu_opt_get(opts, "once"); if (once) { - validate_bootdevices(once); + validate_bootdevices(order, &local_err); + if (local_err) { + error_report("%s", error_get_pretty(local_err)); + error_free(local_err); + exit(1); + } normal_boot_order = g_strdup(boot_order); boot_order = once; qemu_register_reset(restore_boot_order, normal_boot_order);