From patchwork Tue May 7 17:15:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jordan.l.justen@intel.com X-Patchwork-Id: 242423 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 04BD32C00BF for ; Wed, 8 May 2013 03:17:52 +1000 (EST) Received: from localhost ([::1]:52508 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UZlWQ-0000VJ-5M for incoming@patchwork.ozlabs.org; Tue, 07 May 2013 13:17:50 -0400 Received: from eggs.gnu.org ([208.118.235.92]:58462) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UZlVc-00006K-Ps for qemu-devel@nongnu.org; Tue, 07 May 2013 13:17:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UZlVX-0006HD-3A for qemu-devel@nongnu.org; Tue, 07 May 2013 13:17:00 -0400 Received: from mga14.intel.com ([143.182.124.37]:41090) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UZlVW-0006GU-HI for qemu-devel@nongnu.org; Tue, 07 May 2013 13:16:55 -0400 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga102.ch.intel.com with ESMTP; 07 May 2013 10:16:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.87,629,1363158000"; d="scan'208";a="298984374" Received: from unknown (HELO jljusten-ivy.amr.corp.intel.com) ([10.255.12.93]) by azsmga001.ch.intel.com with ESMTP; 07 May 2013 10:16:05 -0700 From: Jordan Justen To: qemu-devel@nongnu.org Date: Tue, 7 May 2013 10:15:47 -0700 Message-Id: <1367946947-17109-7-git-send-email-jordan.l.justen@intel.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1367946947-17109-1-git-send-email-jordan.l.justen@intel.com> References: <1367946947-17109-1-git-send-email-jordan.l.justen@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 143.182.124.37 Cc: Jordan Justen Subject: [Qemu-devel] [PATCH v4 6/6] pc_sysfw: change rom_only default to 0 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 Now KVM can support a flash memory. This feature depends on KVM_CAP_READONLY_MEM, which was introduced in Linux 3.7. Flash memory will only be enabled if a pflash device is created. (For example, by using the -pflash command line parameter.) Signed-off-by: Jordan Justen --- hw/block/pc_sysfw.c | 2 +- include/hw/i386/pc.h | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/hw/block/pc_sysfw.c b/hw/block/pc_sysfw.c index d8a499d..259fe5d 100644 --- a/hw/block/pc_sysfw.c +++ b/hw/block/pc_sysfw.c @@ -273,7 +273,7 @@ void pc_system_firmware_init(MemoryRegion *rom_memory) static Property pcsysfw_properties[] = { DEFINE_PROP_UINT8("isapc_ram_fw", PcSysFwDevice, isapc_ram_fw, 0), - DEFINE_PROP_UINT8("rom_only", PcSysFwDevice, rom_only, 1), + DEFINE_PROP_UINT8("rom_only", PcSysFwDevice, rom_only, 0), DEFINE_PROP_END_OF_LIST(), }; diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 41869e5..10c9347 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -238,10 +238,6 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t); .driver = "virtio-net-pci",\ .property = "romfile",\ .value = "pxe-virtio.rom",\ - },{\ - .driver = "pc-sysfw",\ - .property = "rom_only",\ - .value = stringify(0),\ } #endif