From patchwork Wed May 8 22:44:42 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: 242652 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 44DA32C00F3 for ; Thu, 9 May 2013 08:45:31 +1000 (EST) Received: from localhost ([::1]:53293 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UaD73-00007i-Fr for incoming@patchwork.ozlabs.org; Wed, 08 May 2013 18:45:29 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57141) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UaD6T-0008Qc-6u for qemu-devel@nongnu.org; Wed, 08 May 2013 18:44:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UaD6O-0008OI-U9 for qemu-devel@nongnu.org; Wed, 08 May 2013 18:44:53 -0400 Received: from mga02.intel.com ([134.134.136.20]:46232) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UaD6O-0008NT-Oc for qemu-devel@nongnu.org; Wed, 08 May 2013 18:44:48 -0400 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 08 May 2013 15:44:46 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.87,636,1363158000"; d="scan'208";a="310404314" Received: from unknown (HELO jljusten-ivy.amr.corp.intel.com) ([10.255.12.249]) by orsmga001.jf.intel.com with ESMTP; 08 May 2013 15:44:46 -0700 From: Jordan Justen To: qemu-devel@nongnu.org Date: Wed, 8 May 2013 15:44:42 -0700 Message-Id: <1368053082-15710-6-git-send-email-jordan.l.justen@intel.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1368053082-15710-1-git-send-email-jordan.l.justen@intel.com> References: <1368053082-15710-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: 134.134.136.20 Cc: Jordan Justen Subject: [Qemu-devel] [PATCH v5 5/5] 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 417afe4..932de04 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -239,10 +239,6 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t); .property = "romfile",\ .value = "pxe-virtio.rom",\ },{\ - .driver = "pc-sysfw",\ - .property = "rom_only",\ - .value = stringify(0),\ - },{\ .driver = "486-" TYPE_X86_CPU,\ .property = "model",\ .value = stringify(0),\