From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:39597) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R5JrE-0000kz-GO for qemu-devel@nongnu.org; Sun, 18 Sep 2011 12:04:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R5JrD-0004om-4w for qemu-devel@nongnu.org; Sun, 18 Sep 2011 12:04:40 -0400 Received: from smtp5-g21.free.fr ([212.27.42.5]:49656) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R5JrC-0004nU-K0 for qemu-devel@nongnu.org; Sun, 18 Sep 2011 12:04:39 -0400 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Sun, 18 Sep 2011 18:04:51 +0200 Message-Id: <1316361891-8960-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH] isapc: give system address space when pci is disabled List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Signed-off-by: Herv=C3=A9 Poussineau --- hw/pc_piix.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/pc_piix.c b/hw/pc_piix.c index da6fa55..c0b8a3a 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -121,7 +121,7 @@ static void pc_init1(MemoryRegion *system_memory, pc_memory_init(system_memory, kernel_filename, kernel_cmdline, initrd_filename, below_4g_mem_size, above_4g_mem_size, - pci_memory, &ram_memory); + pci_enabled ? pci_memory : system_memory, &ram_me= mory); } =20 if (!xen_enabled()) { --=20 1.7.5.4