From nobody Mon Feb 9 23:40:03 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1563978737; cv=none; d=zoho.com; s=zohoarc; b=Bw4YjPfLqD3PMX/v2nK1CcUXJKAsqm0X/yR1rNveRgYRazzh4/Vc6RMFihtaxJwun2xyKE/xNcWlQ/3ZQ6cgH4FTFfo5rRfYbvLwKncTi5xAms5xL/Yl9qK0GNbMOqozpGIkC2mcUGL26CZqYZctw3QLwGNjAMX4Dl3Kg7MNEjQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563978737; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=v6wEMhratp0yAAPpdLzMncju2BArAyN5nL67Kr4Zucc=; b=nezOX73V71rwpAKi9Jv4cXGw0PXlVuCR+xJDIrI+OGdVk62iByRi0vqPQRaseFvu9/kTLlFy/uv/LL62df3Uk9w3YgXypnwQzOA22Aftnduas3efWwKS7WgVZ1lKnr2DmjNbQO5SU21AoTvVYAvkLoJG1EqVlbO6VXdyVUjv8/0= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563978737222246.86972817114372; Wed, 24 Jul 2019 07:32:17 -0700 (PDT) Received: from localhost ([::1]:52178 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqIJU-0005WJ-5P for importer@patchew.org; Wed, 24 Jul 2019 10:32:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58822) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqIIf-0002bd-2H for qemu-devel@nongnu.org; Wed, 24 Jul 2019 10:31:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqIIe-00059x-0R for qemu-devel@nongnu.org; Wed, 24 Jul 2019 10:31:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33942) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hqIId-00059F-NN for qemu-devel@nongnu.org; Wed, 24 Jul 2019 10:31:23 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0338D87630; Wed, 24 Jul 2019 14:31:23 +0000 (UTC) Received: from steredhat.redhat.com (ovpn-117-46.ams2.redhat.com [10.36.117.46]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8CC6D60BEC; Wed, 24 Jul 2019 14:31:20 +0000 (UTC) From: Stefano Garzarella To: qemu-devel@nongnu.org Date: Wed, 24 Jul 2019 16:31:05 +0200 Message-Id: <20190724143105.307042-4-sgarzare@redhat.com> In-Reply-To: <20190724143105.307042-1-sgarzare@redhat.com> References: <20190724143105.307042-1-sgarzare@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Wed, 24 Jul 2019 14:31:23 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v4 3/3] hw/i386/pc: Map into memory the initrd X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Eduardo Habkost , Sergio Lopez , "Michael S. Tsirkin" , Julio Montes , "Dr . David Alan Gilbert" , Paolo Bonzini , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" In order to reduce the memory footprint we map into memory the initrd using g_mapped_file_new() instead of reading it. In this way we can share the initrd pages between multiple instances of QEMU. Suggested-by: Paolo Bonzini Signed-off-by: Stefano Garzarella --- v3: - renamed 'GMappedFile *gmf' in 'GMappedFile *mapped_filed' for readabili= ty - stored the initrd GMappedFile* in PCMachineState to avoid Coverity issue [Paolo] --- hw/i386/pc.c | 17 +++++++++++++---- include/hw/i386/pc.h | 1 + 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 549c437050..96f6b89f70 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1241,17 +1241,21 @@ static void load_linux(PCMachineState *pcms, =20 /* load initrd */ if (initrd_filename) { + GMappedFile *mapped_file; gsize initrd_size; gchar *initrd_data; GError *gerr =3D NULL; =20 - if (!g_file_get_contents(initrd_filename, &initrd_data, - &initrd_size, &gerr)) { + mapped_file =3D g_mapped_file_new(initrd_filename, false, = &gerr); + if (!mapped_file) { fprintf(stderr, "qemu: error reading initrd %s: %s\n", initrd_filename, gerr->message); exit(1); } + pcms->initrd_mapped_file =3D mapped_file; =20 + initrd_data =3D g_mapped_file_get_contents(mapped_file); + initrd_size =3D g_mapped_file_get_length(mapped_file); initrd_max =3D pcms->below_4g_mem_size - pcmc->acpi_data_s= ize - 1; if (initrd_size >=3D initrd_max) { fprintf(stderr, "qemu: initrd is too large, cannot sup= port." @@ -1378,6 +1382,7 @@ static void load_linux(PCMachineState *pcms, =20 /* load initrd */ if (initrd_filename) { + GMappedFile *mapped_file; gsize initrd_size; gchar *initrd_data; GError *gerr =3D NULL; @@ -1387,12 +1392,16 @@ static void load_linux(PCMachineState *pcms, exit(1); } =20 - if (!g_file_get_contents(initrd_filename, &initrd_data, - &initrd_size, &gerr)) { + mapped_file =3D g_mapped_file_new(initrd_filename, false, &gerr); + if (!mapped_file) { fprintf(stderr, "qemu: error reading initrd %s: %s\n", initrd_filename, gerr->message); exit(1); } + pcms->initrd_mapped_file =3D mapped_file; + + initrd_data =3D g_mapped_file_get_contents(mapped_file); + initrd_size =3D g_mapped_file_get_length(mapped_file); if (initrd_size >=3D initrd_max) { fprintf(stderr, "qemu: initrd is too large, cannot support." "(max: %"PRIu32", need %"PRId64")\n", diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 859b64c51d..44edc6955e 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -42,6 +42,7 @@ struct PCMachineState { FWCfgState *fw_cfg; qemu_irq *gsi; PFlashCFI01 *flash[2]; + GMappedFile *initrd_mapped_file; =20 /* Configuration options: */ uint64_t max_ram_below_4g; --=20 2.20.1