From 703008e81a6ace40f227aae16d630014e5016af1 Mon Sep 17 00:00:00 2001 From: Gonglei Date: Wed, 3 Dec 2014 17:11:39 +0000 Subject: bootdevice: add Error **errp argument for validate_bootdevices() It will be useful for checking when we change traditional boot order dynamically and propagate error message to the monitor. Signed-off-by: Gonglei Reviewed-by: Markus Armbruster --- bootdevice.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'bootdevice.c') diff --git a/bootdevice.c b/bootdevice.c index aae4cac27f..184348ecd2 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'); } -- cgit v1.2.1