From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52617) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VRiof-0000ri-0x for qemu-devel@nongnu.org; Thu, 03 Oct 2013 09:19:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VRioX-00006v-Ur for qemu-devel@nongnu.org; Thu, 03 Oct 2013 09:19:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:17498) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VRioX-00006r-MO for qemu-devel@nongnu.org; Thu, 03 Oct 2013 09:19:33 -0400 Date: Thu, 3 Oct 2013 16:21:52 +0300 From: "Michael S. Tsirkin" Message-ID: <1380806439-32587-16-git-send-email-mst@redhat.com> References: <1380806439-32587-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1380806439-32587-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PATCH v7 15/26] loader: use file path size from fw_cfg.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, Anthony Liguori Cc: pbonzini@redhat.com, imammedo@redhat.com, Laszlo Ersek , afaerber@suse.de, kraxel@redhat.com Avoid a bit of code duplication, make max file path constant reusable. Suggested-by: Laszlo Ersek Reviewed-by: Gerd Hoffmann Tested-by: Gerd Hoffmann Signed-off-by: Michael S. Tsirkin --- include/hw/nvram/fw_cfg.h | 4 +++- hw/core/loader.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h index 2ab0fc2..72b1549 100644 --- a/include/hw/nvram/fw_cfg.h +++ b/include/hw/nvram/fw_cfg.h @@ -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 { diff --git a/hw/core/loader.c b/hw/core/loader.c index 449bd4c..060729f 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -663,7 +663,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, '/'); -- MST