From patchwork Thu Apr 28 14:11:11 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Thomas X-Patchwork-Id: 93220 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 951FCB6F5A for ; Fri, 29 Apr 2011 00:11:37 +1000 (EST) Received: from localhost ([::1]:37321 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QFRwL-0000sh-2Z for incoming@patchwork.ozlabs.org; Thu, 28 Apr 2011 10:11:33 -0400 Received: from eggs.gnu.org ([140.186.70.92]:33882) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QFRwB-0000sW-QN for qemu-devel@nongnu.org; Thu, 28 Apr 2011 10:11:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QFRwA-00059Q-TS for qemu-devel@nongnu.org; Thu, 28 Apr 2011 10:11:23 -0400 Received: from mail-ew0-f45.google.com ([209.85.215.45]:37692) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QFRwA-00059C-PF for qemu-devel@nongnu.org; Thu, 28 Apr 2011 10:11:22 -0400 Received: by ewy24 with SMTP id 24so984616ewy.4 for ; Thu, 28 Apr 2011 07:11:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer; bh=Jg5IZJYwp2hlAUfNbgjy67HcKfVvmuAaxWBthhMqG2c=; b=eyvGDw7QlvU+6FRGZ2ZW8P0BcGSW5W7bmAZjQWqNqZzldyITKqCEn7iDfmSoRVKdaR eLP9nAcfktQmdEbvVkBbfaW6OQzhyTuZ52lOlpJ92wZn1ISB6+39J8etOLxuV4D/HLjk eWzCtwS25AFXtCOlT3ZSxvG0QOJJiPvd/GK4g= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=tY1R821VRyzg+466sOijO+wQcfzgIuTCH9MNpM4ln5UjHeXdFkcnsRUAUcz+FWIkeh zxFQO2fpksrioioCIQh3jTalElGUPoo+tqj5NFXFnF6cBguLGadgHweVW5BAi3CSJmhF orhHibKH+9tzTdO096ic4FF9bq2voLf/78L7k= Received: by 10.213.103.7 with SMTP id i7mr2916239ebo.88.1303999880910; Thu, 28 Apr 2011 07:11:20 -0700 (PDT) Received: from localhost.localdomain (skeletor.few.vu.nl [130.37.31.216]) by mx.google.com with ESMTPS id k57sm1320132eei.10.2011.04.28.07.11.20 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 28 Apr 2011 07:11:20 -0700 (PDT) From: Arun Thomas To: qemu-devel@nongnu.org Date: Thu, 28 Apr 2011 16:11:11 +0200 Message-Id: <1303999871-9955-1-git-send-email-arun.thomas@gmail.com> X-Mailer: git-send-email 1.7.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.215.45 Cc: Arun Thomas Subject: [Qemu-devel] [PATCH] multiboot: set boot_device to first partition 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The multiboot info struct's 'boot_device' field has 'part1' set to 0x01, which maps to the second primary partition. To specify the first primary partition, 'part1' should be set to 0x00, since partition numbers start from zero according to the multiboot spec. Signed-off-by: Arun Thomas Reviewed-by: Stefan Hajnoczi --- hw/multiboot.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/multiboot.c b/hw/multiboot.c index 394ed01..6e6cfb9 100644 --- a/hw/multiboot.c +++ b/hw/multiboot.c @@ -307,7 +307,7 @@ int load_multiboot(void *fw_cfg, | MULTIBOOT_FLAGS_MMAP); stl_p(bootinfo + MBI_MEM_LOWER, 640); stl_p(bootinfo + MBI_MEM_UPPER, (ram_size / 1024) - 1024); - stl_p(bootinfo + MBI_BOOT_DEVICE, 0x8001ffff); /* XXX: use the -boot switch? */ + stl_p(bootinfo + MBI_BOOT_DEVICE, 0x8000ffff); /* XXX: use the -boot switch? */ stl_p(bootinfo + MBI_MMAP_ADDR, ADDR_E820_MAP); mb_debug("multiboot: mh_entry_addr = %#x\n", mh_entry_addr);