From patchwork Mon Mar 14 16:55:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 8581501 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1DDEDC0553 for ; Mon, 14 Mar 2016 16:55:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 16DAD2025B for ; Mon, 14 Mar 2016 16:55:57 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AC1F620270 for ; Mon, 14 Mar 2016 16:55:55 +0000 (UTC) Received: from localhost ([::1]:42385 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afVmd-0006ab-6V for patchwork-qemu-devel@patchwork.kernel.org; Mon, 14 Mar 2016 12:55:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39492) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afVmM-0006Yj-W4 for qemu-devel@nongnu.org; Mon, 14 Mar 2016 12:55:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1afVmM-0004aE-1s for qemu-devel@nongnu.org; Mon, 14 Mar 2016 12:55:38 -0400 Received: from mail-ob0-x242.google.com ([2607:f8b0:4003:c01::242]:35669) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afVmL-0004a4-S7 for qemu-devel@nongnu.org; Mon, 14 Mar 2016 12:55:37 -0400 Received: by mail-ob0-x242.google.com with SMTP id e7so14854176obv.2 for ; Mon, 14 Mar 2016 09:55:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=H5U/G/1EvDw5gOG1DK3mYiUI2Yz34MtaNASw/dVJ3ZU=; b=e3TUKpArcPV05vv+MpjDuJAuQB5q/cWDknmrprAY6GDPDwuG4s4NguDPBy7EYsMngM eOHroRQ6NTEMTOvSCz9u63tKcp8Nb7PtamVXy3G3idtury5N+/J7C2VJYl4hFcy/NtVp hhYcnS50tIeczITEvIl1tdLF1zr2B4xmiOFkVtKwc8XFd2B54/FoJEe0BJyM8vFs0U0M nWx/r8Ag0fIruUcvcuBgJGTh6/yPQCOLEJvmG8SZGqXiJBxE0laJ9kIyS/MUDKN3dROn hF850rsPZs64oqJ06Q148We47K4eq7YgYolSeBKlBwCZRZ51ngehJUw0XjtvVgbC5Jar NWZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=H5U/G/1EvDw5gOG1DK3mYiUI2Yz34MtaNASw/dVJ3ZU=; b=mFx9rTf24iW2qw1f192c7TNR1IDQT+hF7ciaDYxxUsR6C3E7sMhWbLnRiNk25/kk5V 4lgzurlamMEy2wskhInZv3pFJ0AplaBxHeneGYaCX0CHqYgsp+oJECqhIX/LStpzzcGv RBWIhrU/IgU9VaCr7h6CZxcOzOsBRCxTFkGjeC9slP3s9Fvt7yBrsYrmxw8Cni+nwuxf 7ecAAPi4dC9TnIFSNxgMpbaw6P/unILoQlk0oVUt2TpcPq8YfSe6wiO9WRlopmdbgTCw TakmlJAYrHLxIWRiBPTkwl8nyRVdQ32/BujKDtt8wyYLtNyle1DXCaBDd97w1vQZwVN5 XxNA== X-Gm-Message-State: AD7BkJKF3oLFelIEXaTo3ZQJEi3Pwnpa8uST5uwIJBqCBQFf9uPtO9LRh0B135cPmSlA4g== X-Received: by 10.60.70.1 with SMTP id i1mr15167490oeu.13.1457974537217; Mon, 14 Mar 2016 09:55:37 -0700 (PDT) Received: from serve.minyard.net (serve.minyard.net. [2001:470:b8f6:1b::1]) by smtp.gmail.com with ESMTPSA id dh8sm9897979obb.2.2016.03.14.09.55.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Mar 2016 09:55:36 -0700 (PDT) Received: from t430.minyard.net (unknown [IPv6:2001:470:b8f6:1b:d55e:2f45:1d72:4bff]) by serve.minyard.net (Postfix) with ESMTPA id C49311370; Mon, 14 Mar 2016 11:55:35 -0500 (CDT) Received: by t430.minyard.net (Postfix, from userid 1000) id 77ED03006B4; Mon, 14 Mar 2016 23:55:35 +0700 (ICT) From: minyard@acm.org To: qemu-devel@nongnu.org, "Michael S. Tsirkin" , Paolo Bonzini Date: Mon, 14 Mar 2016 23:55:31 +0700 Message-Id: <1457974531-8768-1-git-send-email-minyard@acm.org> X-Mailer: git-send-email 2.5.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:4003:c01::242 Cc: Corey Minyard , Gerd Hoffmann Subject: [Qemu-devel] [PATCH v2] Sort the fw_cfg file list 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Gerd Hoffmann Entries are inserted at the correct place instead of being appended to the end in case sorting is enabled. Signed-off-by: Gerd Hoffmann Added a machine type handling for compatibility. Signed-off-by: Corey Minyard --- Don't add a new machine type in this version, just use the 2.6 one. hw/i386/pc_piix.c | 1 + hw/i386/pc_q35.c | 1 + hw/nvram/fw_cfg.c | 32 ++++++++++++++++++++++++++------ include/hw/boards.h | 3 ++- 4 files changed, 30 insertions(+), 7 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 6f8c2cd..6c68e63 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -429,6 +429,7 @@ static void pc_i440fx_2_5_machine_options(MachineClass *m) m->alias = NULL; m->is_default = 0; pcmc->save_tsc_khz = false; + m->dont_sort_fw_cfgs = 1; SET_MACHINE_COMPAT(m, PC_COMPAT_2_5); } diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 208a224..417fb57 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -354,6 +354,7 @@ static void pc_q35_2_5_machine_options(MachineClass *m) pc_q35_2_6_machine_options(m); m->alias = NULL; pcmc->save_tsc_khz = false; + m->dont_sort_fw_cfgs = 1; SET_MACHINE_COMPAT(m, PC_COMPAT_2_5); } diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 79c5742..10dab77 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -28,6 +28,7 @@ #include "hw/isa/isa.h" #include "hw/nvram/fw_cfg.h" #include "hw/sysbus.h" +#include "hw/boards.h" #include "trace.h" #include "qemu/error-report.h" #include "qemu/config-file.h" @@ -669,8 +670,9 @@ 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; + MachineClass *mc = MACHINE_GET_CLASS(qdev_get_machine()); if (!s->files) { dsize = sizeof(uint32_t) + sizeof(FWCfgFile) * FW_CFG_FILE_SLOTS; @@ -678,13 +680,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 (!mc->dont_sort_fw_cfgs) { + 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); @@ -698,7 +718,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, diff --git a/include/hw/boards.h b/include/hw/boards.h index 0f30959..f8d99d2 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -85,7 +85,8 @@ struct MachineClass { no_sdcard:1, has_dynamic_sysbus:1, no_tco:1, - pci_allow_0_address:1; + pci_allow_0_address:1, + dont_sort_fw_cfgs:1; int is_default; const char *default_machine_opts; const char *default_boot_order;