From patchwork Mon Feb 8 14:43:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kasper Dupont X-Patchwork-Id: 8250651 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 99BAABEEE5 for ; Mon, 8 Feb 2016 14:43:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E11C720145 for ; Mon, 8 Feb 2016 14:43:58 +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 8FB49200E7 for ; Mon, 8 Feb 2016 14:43:53 +0000 (UTC) Received: from localhost ([::1]:45402 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aSn2e-0005qv-GT for patchwork-qemu-devel@patchwork.kernel.org; Mon, 08 Feb 2016 09:43:52 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60549) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aSn2W-0005pm-Vl for qemu-devel@nongnu.org; Mon, 08 Feb 2016 09:43:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aSn2T-00048X-LV for qemu-devel@nongnu.org; Mon, 08 Feb 2016 09:43:44 -0500 Received: from vq7.netiter.net ([78.47.169.56]:35427) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aSn2T-00045H-FI for qemu-devel@nongnu.org; Mon, 08 Feb 2016 09:43:41 -0500 Received: from localhost ([127.0.0.1] helo=fjtcb.17.jan.2016.kasperd.net) by vq7.netiter.net with smtp (Exim 4.82) (envelope-from ) id 1aSn20-0007FA-VN; Mon, 08 Feb 2016 15:43:13 +0100 Date: Mon, 8 Feb 2016 15:43:10 +0100 From: Kasper Dupont To: qemu-devel@nongnu.org Message-ID: <20160208144309.GA10770@colin.search.kasperd.net> Mime-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.4.2.3i X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 78.47.169.56 Subject: [Qemu-devel] [PATCH] Add support for using directory as initrd 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.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable 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 Signed-off-by: Kasper Dupont --- hw/core/loader.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++ hw/i386/pc.c | 6 +++-- include/hw/loader.h | 1 + 3 files changed, 76 insertions(+), 2 deletions(-) diff --git a/hw/core/loader.c b/hw/core/loader.c index 3a57415..6047486 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -54,6 +54,7 @@ #include "exec/address-spaces.h" #include "hw/boards.h" +#include #include static int roms_loaded; @@ -164,6 +165,76 @@ void pstrcpy_targphys(const char *name, hwaddr dest, int buf_size, } } +/* return the size or -1 if error */ +int load_initrd(const char *filename, uint8_t **addr) +{ + pid_t child = 0; + int fd, size = 0, buffer_size = 4096; + fd = open(filename, O_RDONLY | O_BINARY); + if (fd < 0) { + return -1; + } + + *addr = malloc(buffer_size); + + while (*addr) { + int bytes_read = read(fd, (*addr) + size, buffer_size - size); + + if (bytes_read == 0) { + close(fd); + if (child) { + waitpid(child, NULL, 0); + } + return size; + } + + if (bytes_read > 0) { + size += bytes_read; + } else { + int pipefd[2]; + + if (errno != EISDIR) { + return -1; + } + + assert(!child); + + if (pipe(pipefd)) { + return -1; + } + + child = fork(); + if (child == -1) { + return -1; + } + + if (!child) { + if (fchdir(fd)) { + error(1, errno, "fchdir failed"); + } + if (dup2(pipefd[1], 1) == -1) { + error(1, errno, "dup2 failed"); + } + execlp("/bin/sh", "/bin/sh", "-c", + "find . | cpio --quiet -R 0:0 -o -H newc", + NULL); + error(1, errno, "/bin/sh"); + } + + close(fd); + close(pipefd[1]); + fd = pipefd[0]; + } + + if (size == buffer_size) { + buffer_size <<= 1; + *addr = realloc(*addr, buffer_size); + } + } + + return -1; +} + /* A.OUT loader */ struct exec diff --git a/hw/i386/pc.c b/hw/i386/pc.c index b28bac4..d9e1596 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -953,12 +953,13 @@ static void load_linux(PCMachineState *pcms, /* load initrd */ if (initrd_filename) { + uint8_t *initrd_load_buffer; if (protocol < 0x200) { fprintf(stderr, "qemu: linux kernel too old to load a ram disk\n"); exit(1); } - initrd_size = get_image_size(initrd_filename); + initrd_size = load_initrd(initrd_filename, &initrd_load_buffer); if (initrd_size < 0) { fprintf(stderr, "qemu: error reading initrd %s: %s\n", initrd_filename, strerror(errno)); @@ -968,7 +969,8 @@ static void load_linux(PCMachineState *pcms, initrd_addr = (initrd_max-initrd_size) & ~4095; initrd_data = g_malloc(initrd_size); - load_image(initrd_filename, initrd_data); + memcpy(initrd_data, initrd_load_buffer, initrd_size); + free(initrd_load_buffer); fw_cfg_add_i32(fw_cfg, FW_CFG_INITRD_ADDR, initrd_addr); fw_cfg_add_i32(fw_cfg, FW_CFG_INITRD_SIZE, initrd_size); diff --git a/include/hw/loader.h b/include/hw/loader.h index f7b43ab..4fb4773 100644 --- a/include/hw/loader.h +++ b/include/hw/loader.h @@ -13,6 +13,7 @@ */ int get_image_size(const char *filename); int load_image(const char *filename, uint8_t *addr); /* deprecated */ +int load_initrd(const char *filename, uint8_t **addr); ssize_t load_image_size(const char *filename, void *addr, size_t size); int load_image_targphys(const char *filename, hwaddr, uint64_t max_sz);