From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41541) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZHa1w-0003ET-0v for qemu-devel@nongnu.org; Tue, 21 Jul 2015 12:04:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZHa1r-00032L-TQ for qemu-devel@nongnu.org; Tue, 21 Jul 2015 12:04:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57582) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZHa1r-00032B-O7 for qemu-devel@nongnu.org; Tue, 21 Jul 2015 12:04:27 -0400 From: =?UTF-8?q?Marc=20Mar=C3=AD?= Date: Tue, 21 Jul 2015 18:03:44 +0200 Message-Id: <1437494626-3773-6-git-send-email-markmb@redhat.com> In-Reply-To: <1437494626-3773-1-git-send-email-markmb@redhat.com> References: <1437494626-3773-1-git-send-email-markmb@redhat.com> Subject: [Qemu-devel] [RFC 5/7] fw_cfg file sort List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , 'Kevin O'Connor' , Gerd Hoffmann , Stefan Hajnoczi From: Gerd Hoffmann This is what it takes to have a sorted fw_cfg file directory. Entries are inserted at the correct place instead of being appended to the end in case sorting is enabled. Compatibility fluff (enable sorting for new machine types only) isn't there yet. Signed-off-by: Gerd Hoffmann --- hw/nvram/fw_cfg.c | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 0f35931..83205e0 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -639,7 +639,7 @@ void fw_cfg_add_file_callback(FWCfgState *s, const char *filename, FWCfgReadCallback callback, void *callback_opaque, void *data, size_t len) { - int i, index; + int i, index, count; size_t dsize; if (!s->files) { @@ -648,13 +648,31 @@ void fw_cfg_add_file_callback(FWCfgState *s, const char *filename, fw_cfg_add_bytes(s, FW_CFG_FILE_DIR, s->files, dsize); } - index = be32_to_cpu(s->files->count); - assert(index < FW_CFG_FILE_SLOTS); + count = be32_to_cpu(s->files->count); + assert(count < FW_CFG_FILE_SLOTS); + + index = count; + if (1 /* sort entries */) { + while (index > 0 && strcmp(filename, s->files->f[index-1].name) < 0) { + s->files->f[index] = + s->files->f[index - 1]; + s->files->f[index].select = + cpu_to_be16(FW_CFG_FILE_FIRST + index); + s->entries[0][FW_CFG_FILE_FIRST + index] = + s->entries[0][FW_CFG_FILE_FIRST + index - 1]; + index--; + } + memset(&s->files->f[index], + 0, sizeof(FWCfgFile)); + memset(&s->entries[0][FW_CFG_FILE_FIRST + index], + 0, sizeof(FWCfgEntry)); + } pstrcpy(s->files->f[index].name, sizeof(s->files->f[index].name), filename); - for (i = 0; i < index; i++) { - if (strcmp(s->files->f[index].name, s->files->f[i].name) == 0) { + for (i = 0; i <= count; i++) { + if (i != index && + strcmp(s->files->f[index].name, s->files->f[i].name) == 0) { error_report("duplicate fw_cfg file name: %s", s->files->f[index].name); exit(1); @@ -668,7 +686,7 @@ void fw_cfg_add_file_callback(FWCfgState *s, const char *filename, s->files->f[index].select = cpu_to_be16(FW_CFG_FILE_FIRST + index); trace_fw_cfg_add_file(s, index, s->files->f[index].name, len); - s->files->count = cpu_to_be32(index+1); + s->files->count = cpu_to_be32(count+1); } void fw_cfg_add_file(FWCfgState *s, const char *filename, -- 2.4.3