From patchwork Thu Jul 30 10:52:20 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 502074 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id C6D6E1402ED for ; Thu, 30 Jul 2015 20:53:40 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755047AbbG3Kwa (ORCPT ); Thu, 30 Jul 2015 06:52:30 -0400 Received: from foss.arm.com ([217.140.101.70]:40005 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754754AbbG3Kw2 (ORCPT ); Thu, 30 Jul 2015 06:52:28 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 4FEF875; Thu, 30 Jul 2015 03:52:36 -0700 (PDT) Received: from e104803-lin.lan (unknown [10.1.203.153]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 6A3AD3F21A; Thu, 30 Jul 2015 03:52:27 -0700 (PDT) From: Andre Przywara To: will.deacon@arm.com, kvm@vger.kernel.org Cc: marc.zyngier@arm.com, kvmarm@lists.cs.columbia.edu, kvm-ppc@vger.kernel.org Subject: [PATCH 03/14] x86: allow pipes for bzImage kernel images Date: Thu, 30 Jul 2015 11:52:20 +0100 Message-Id: <1438253551-2378-4-git-send-email-andre.przywara@arm.com> X-Mailer: git-send-email 2.3.5 In-Reply-To: <1438253551-2378-1-git-send-email-andre.przywara@arm.com> References: <1438253551-2378-1-git-send-email-andre.przywara@arm.com> Sender: kvm-ppc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm-ppc@vger.kernel.org Streamline the x86 kernel loading implementation by removing unneeded seeks and thus allow an x86 bzImage to be loaded from a pipe. "Flat binaries" are taken care of in a separate patch. Signed-off-by: Andre Przywara --- x86/kvm.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/x86/kvm.c b/x86/kvm.c index a0204b8..8fe5585 100644 --- a/x86/kvm.c +++ b/x86/kvm.c @@ -245,9 +245,6 @@ static bool load_bzimage(struct kvm *kvm, int fd_kernel, int fd_initrd, * memory layout. */ - if (lseek(fd_kernel, 0, SEEK_SET) < 0) - die_perror("lseek"); - if (read(fd_kernel, &boot, sizeof(boot)) != sizeof(boot)) return false; @@ -257,9 +254,6 @@ static bool load_bzimage(struct kvm *kvm, int fd_kernel, int fd_initrd, if (boot.hdr.version < BOOT_PROTOCOL_REQUIRED) die("Too old kernel"); - if (lseek(fd_kernel, 0, SEEK_SET) < 0) - die_perror("lseek"); - if (!boot.hdr.setup_sects) boot.hdr.setup_sects = BZ_DEFAULT_SETUP_SECTS; setup_sects = boot.hdr.setup_sects + 1; @@ -267,7 +261,10 @@ static bool load_bzimage(struct kvm *kvm, int fd_kernel, int fd_initrd, setup_size = setup_sects << 9; p = guest_real_to_host(kvm, BOOT_LOADER_SELECTOR, BOOT_LOADER_IP); - /* copy setup.bin to mem*/ + /* copy setup.bin to mem */ + memcpy(p, &boot, sizeof(boot)); + p += sizeof(boot); + setup_size -= sizeof(boot); if (read(fd_kernel, p, setup_size) != setup_size) die_perror("read");