From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marcelo Tosatti Subject: [patch 4/5] pc: drop unnecessary memory un-assignment Date: Mon, 01 Aug 2011 12:27:26 -0300 Message-ID: <20110801152820.244105073@redhat.com> References: <20110801152722.231510187@redhat.com> Cc: Marcelo Tosatti To: kvm@vger.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:46309 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753096Ab1HAP3P (ORCPT ); Mon, 1 Aug 2011 11:29:15 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p71FTFib018782 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 1 Aug 2011 11:29:15 -0400 Content-Disposition: inline; filename=pc-0xd000-unassigned Sender: kvm-owner@vger.kernel.org List-ID: As noted by the original commit. Probably kept in qemu-kvm due to a mismerge. commit 7d0adcd6d57149d4e9ec66f3a1c171df2bea2775 Author: aurel32 Date: Fri Oct 24 13:12:42 2008 +0000 hw/pc: don't register the memory hole as unassigned twice Since revision 5228, we don't register the memory hole (0xa00000 to 0xfffff) anymore. As a consequence, we don't need to register it again as unassigned. Signed-off-by: Aurelien Jarno Signed-off-by: Marcelo Tosatti Index: qemu-kvm/hw/pc.c =================================================================== --- qemu-kvm.orig/hw/pc.c +++ qemu-kvm/hw/pc.c @@ -1013,8 +1013,6 @@ void pc_memory_init(const char *kernel_f isa_bios_size = bios_size; if (isa_bios_size > (128 * 1024)) isa_bios_size = 128 * 1024; - cpu_register_physical_memory(0xd0000, (192 * 1024) - isa_bios_size, - IO_MEM_UNASSIGNED); cpu_register_physical_memory(0x100000 - isa_bios_size, isa_bios_size, (bios_offset + bios_size - isa_bios_size) | IO_MEM_ROM);