From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZSBB-00023i-MZ for qemu-devel@nongnu.org; Mon, 25 Jan 2010 11:52:45 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZSB7-0001xb-Tg for qemu-devel@nongnu.org; Mon, 25 Jan 2010 11:52:45 -0500 Received: from [199.232.76.173] (port=46483 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZSB7-0001xN-PQ for qemu-devel@nongnu.org; Mon, 25 Jan 2010 11:52:41 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50099) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NZSB7-00069d-BY for qemu-devel@nongnu.org; Mon, 25 Jan 2010 11:52:41 -0500 Message-ID: <4B5DCC53.508@redhat.com> Date: Mon, 25 Jan 2010 17:52:35 +0100 From: Jes Sorensen MIME-Version: 1.0 References: <4B5DCAF2.3010105@redhat.com> <4B5DCB93.7050007@redhat.com> In-Reply-To: <4B5DCB93.7050007@redhat.com> Content-Type: multipart/mixed; boundary="------------030205040709050900060802" Subject: [Qemu-devel] [PATCH] QEMU - provide e820 reserve through qemu_cfg List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , Kevin O'Connor , Avi Kivity , kvm@vger.kernel.org This is a multi-part message in MIME format. --------------030205040709050900060802 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Hi, This is the QEMU patch for providing the e820-reserve space through qemu-cfg. Cheers, Jes --------------030205040709050900060802 Content-Type: text/plain; name="0011-qemu-e820-reserve.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0011-qemu-e820-reserve.patch" Use qemu-cfg to notify the BIOS of the location of the TSS range to reserve in the e820 table, to avoid relying on hard coded values. Signed-off-by: Jes Sorensen --- hw/pc.c | 5 +++++ kvm.h | 7 +++++++ target-i386/kvm.c | 5 +++++ 3 files changed, 17 insertions(+) Index: qemu/hw/pc.c =================================================================== --- qemu.orig/hw/pc.c +++ qemu/hw/pc.c @@ -45,6 +45,7 @@ #include "loader.h" #include "elf.h" #include "multiboot.h" +#include "kvm.h" /* output Bochs bios info messages */ //#define DEBUG_BIOS @@ -59,6 +60,7 @@ #define FW_CFG_ACPI_TABLES (FW_CFG_ARCH_LOCAL + 0) #define FW_CFG_SMBIOS_ENTRIES (FW_CFG_ARCH_LOCAL + 1) #define FW_CFG_IRQ0_OVERRIDE (FW_CFG_ARCH_LOCAL + 2) +#define FW_CFG_E820_RESERVE (FW_CFG_ARCH_LOCAL + 3) #define MAX_IDE_BUS 2 @@ -66,6 +68,7 @@ static fdctrl_t *floppy_controller; static RTCState *rtc_state; static PITState *pit; static PCII440FXState *i440fx_state; +struct fw_cfg_e820_reserve e820_reserve; typedef struct isa_irq_state { qemu_irq *i8259; @@ -466,6 +469,8 @@ static void *bochs_bios_init(void) if (smbios_table) fw_cfg_add_bytes(fw_cfg, FW_CFG_SMBIOS_ENTRIES, smbios_table, smbios_len); + fw_cfg_add_bytes(fw_cfg, FW_CFG_E820_RESERVE, (uint8_t *)&e820_reserve, + sizeof(struct fw_cfg_e820_reserve)); /* allocate memory for the NUMA channel: one (64bit) word for the number * of nodes, one word for each VCPU->node and one word for each node to Index: qemu/kvm.h =================================================================== --- qemu.orig/kvm.h +++ qemu/kvm.h @@ -96,6 +96,13 @@ void kvm_arch_reset_vcpu(CPUState *env); struct kvm_guest_debug; struct kvm_debug_exit_arch; +struct fw_cfg_e820_reserve { + uint32_t addr; + uint32_t length; +}; + +extern struct fw_cfg_e820_reserve e820_reserve; + struct kvm_sw_breakpoint { target_ulong pc; target_ulong saved_insn; Index: qemu/target-i386/kvm.c =================================================================== --- qemu.orig/target-i386/kvm.c +++ qemu/target-i386/kvm.c @@ -356,6 +356,11 @@ int kvm_arch_init(KVMState *s, int smp_c * as unavaible memory. FIXME, need to ensure the e820 map deals with * this? */ + /* + * Tell fw_cfg to notify the BIOS to reserve the range. + */ + e820_reserve.addr = 0xfffbc000; + e820_reserve.length = 0x4000; return kvm_vm_ioctl(s, KVM_SET_TSS_ADDR, 0xfffbd000); } --------------030205040709050900060802--