| From 3090a6d3f085dea8f7f6539bf12709cd79d57cb4 Mon Sep 17 00:00:00 2001 |
| Message-Id: <3090a6d3f085dea8f7f6539bf12709cd79d57cb4.1387298827.git.minovotn@redhat.com> |
| In-Reply-To: <3ed0fb61a3dc912ef036d7ef450bed192090709e.1387298827.git.minovotn@redhat.com> |
| References: <3ed0fb61a3dc912ef036d7ef450bed192090709e.1387298827.git.minovotn@redhat.com> |
| From: "Michael S. Tsirkin" <mst@redhat.com> |
| Date: Tue, 17 Dec 2013 15:18:28 +0100 |
| Subject: [PATCH 36/56] loader: use file path size from fw_cfg.h |
| |
| RH-Author: Michael S. Tsirkin <mst@redhat.com> |
| Message-id: <1387293161-4085-37-git-send-email-mst@redhat.com> |
| Patchwork-id: 56342 |
| O-Subject: [PATCH qemu-kvm RHEL7.0 v2 36/57] loader: use file path size from fw_cfg.h |
| Bugzilla: 1034876 |
| RH-Acked-by: Igor Mammedov <imammedo@redhat.com> |
| RH-Acked-by: Marcel Apfelbaum <marcel.a@redhat.com> |
| RH-Acked-by: Laszlo Ersek <lersek@redhat.com> |
| |
| Avoid a bit of code duplication, make |
| max file path constant reusable. |
| |
| Suggested-by: Laszlo Ersek <lersek@redhat.com> |
| Reviewed-by: Gerd Hoffmann <kraxel@redhat.com> |
| Tested-by: Gerd Hoffmann <kraxel@redhat.com> |
| Reviewed-by: Igor Mammedov <imammedo@redhat.com> |
| Tested-by: Igor Mammedov <imammedo@redhat.com> |
| Signed-off-by: Michael S. Tsirkin <mst@redhat.com> |
| (cherry picked from commit 35c12e60c840bc4840cbbe3f6ca514a53b2e36bc) |
| |
| include/hw/nvram/fw_cfg.h | 4 +++- |
| hw/core/loader.c | 2 +- |
| 2 files changed, 4 insertions(+), 2 deletions(-) |
| |
| Signed-off-by: Michal Novotny <minovotn@redhat.com> |
| |
| hw/core/loader.c | 2 +- |
| include/hw/nvram/fw_cfg.h | 4 +++- |
| 2 files changed, 4 insertions(+), 2 deletions(-) |
| |
| diff --git a/hw/core/loader.c b/hw/core/loader.c |
| index 2bfff48..ab4c7bd 100644 |
| |
| |
| @@ -629,7 +629,7 @@ int rom_add_file(const char *file, const char *fw_dir, |
| rom_insert(rom); |
| if (rom->fw_file && fw_cfg) { |
| const char *basename; |
| - char fw_file_name[56]; |
| + char fw_file_name[FW_CFG_MAX_FILE_PATH]; |
| void *data; |
| |
| basename = strrchr(rom->fw_file, '/'); |
| diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h |
| index 2ab0fc2..72b1549 100644 |
| |
| |
| @@ -46,12 +46,14 @@ |
| |
| #define FW_CFG_INVALID 0xffff |
| |
| +#define FW_CFG_MAX_FILE_PATH 56 |
| + |
| #ifndef NO_QEMU_PROTOS |
| typedef struct FWCfgFile { |
| uint32_t size; /* file size */ |
| uint16_t select; /* write this to 0x510 to read it */ |
| uint16_t reserved; |
| - char name[56]; |
| + char name[FW_CFG_MAX_FILE_PATH]; |
| } FWCfgFile; |
| |
| typedef struct FWCfgFiles { |
| -- |
| 1.7.11.7 |
| |