From patchwork Fri Oct 7 07:03:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 118211 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 93622B7010 for ; Fri, 7 Oct 2011 18:03:22 +1100 (EST) Received: from localhost ([::1]:56699 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RC4Sl-0004p6-3C for incoming@patchwork.ozlabs.org; Fri, 07 Oct 2011 03:03:19 -0400 Received: from eggs.gnu.org ([140.186.70.92]:50440) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RC4Sf-0004om-4b for qemu-devel@nongnu.org; Fri, 07 Oct 2011 03:03:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RC4Sb-0001HQ-4E for qemu-devel@nongnu.org; Fri, 07 Oct 2011 03:03:13 -0400 Received: from thoth.sbs.de ([192.35.17.2]:24594) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RC4Sa-0001GV-S0 for qemu-devel@nongnu.org; Fri, 07 Oct 2011 03:03:09 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by thoth.sbs.de (8.13.6/8.13.6) with ESMTP id p97735t3027008; Fri, 7 Oct 2011 09:03:06 +0200 Received: from mchn199C.mchp.siemens.de ([139.22.133.67]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id p977343P007726; Fri, 7 Oct 2011 09:03:04 +0200 Message-ID: <4E8EA428.9020509@siemens.com> Date: Fri, 07 Oct 2011 09:03:04 +0200 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: Marcelo Tosatti , Avi Kivity X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 192.35.17.2 Cc: qemu-devel Subject: [Qemu-devel] [PATCH] qemu-kvm: Restore VAPIC option ROM installation 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 Still needed but was accidentally removed by 8bc62bc6be. Signed-off-by: Jan Kiszka --- As the guilty patch is only in next so far, you may also fold this one in. hw/pc.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index a616029..70e0d08 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -1049,6 +1049,10 @@ void pc_memory_init(MemoryRegion *system_memory, (uint32_t)(-bios_size), bios); + option_rom[nb_option_roms].name = g_strdup(VAPIC_FILENAME); + option_rom[nb_option_roms].bootindex = -1; + nb_option_roms++; + fw_cfg = bochs_bios_init(); rom_set_fw(fw_cfg);