From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53112) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XeKXl-0006SZ-Mp for qemu-devel@nongnu.org; Wed, 15 Oct 2014 05:07:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XeKXd-00071e-GG for qemu-devel@nongnu.org; Wed, 15 Oct 2014 05:06:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55630) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XeKXd-00071C-7d for qemu-devel@nongnu.org; Wed, 15 Oct 2014 05:06:45 -0400 From: Gerd Hoffmann Date: Wed, 15 Oct 2014 11:05:35 +0200 Message-Id: <1413363967-2489-3-git-send-email-kraxel@redhat.com> In-Reply-To: <1413363967-2489-1-git-send-email-kraxel@redhat.com> References: <1413363967-2489-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PULL 02/34] bootindex: add check bootindex function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gonglei , Gerd Hoffmann From: Gonglei Determine whether a given bootindex exists or not. If exists, we report an error. Signed-off-by: Gonglei Reviewed-by: Gerd Hoffmann Signed-off-by: Gerd Hoffmann --- bootdevice.c | 15 +++++++++++++++ include/sysemu/sysemu.h | 1 + 2 files changed, 16 insertions(+) diff --git a/bootdevice.c b/bootdevice.c index d5b8789..f5399df 100644 --- a/bootdevice.c +++ b/bootdevice.c @@ -36,6 +36,21 @@ struct FWBootEntry { static QTAILQ_HEAD(, FWBootEntry) fw_boot_order = QTAILQ_HEAD_INITIALIZER(fw_boot_order); +void check_boot_index(int32_t bootindex, Error **errp) +{ + FWBootEntry *i; + + if (bootindex >= 0) { + QTAILQ_FOREACH(i, &fw_boot_order, link) { + if (i->bootindex == bootindex) { + error_setg(errp, "The bootindex %d has already been used", + bootindex); + return; + } + } + } +} + void add_boot_device_path(int32_t bootindex, DeviceState *dev, const char *suffix) { diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 8de5100..72463de 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -213,6 +213,7 @@ void add_boot_device_path(int32_t bootindex, DeviceState *dev, char *get_boot_devices_list(size_t *size, bool ignore_suffixes); DeviceState *get_boot_device(uint32_t position); +void check_boot_index(int32_t bootindex, Error **errp); QemuOpts *qemu_get_machine_opts(void); -- 1.8.3.1