From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O3GaX-0007xx-Va for qemu-devel@nongnu.org; Sat, 17 Apr 2010 18:34:10 -0400 Received: from [140.186.70.92] (port=54607 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O3GaW-0007xp-Lx for qemu-devel@nongnu.org; Sat, 17 Apr 2010 18:34:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O3GaU-0000F2-Hw for qemu-devel@nongnu.org; Sat, 17 Apr 2010 18:34:08 -0400 Received: from fg-out-1718.google.com ([72.14.220.158]:51455) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O3GaT-0000Ev-U1 for qemu-devel@nongnu.org; Sat, 17 Apr 2010 18:34:06 -0400 Received: by fg-out-1718.google.com with SMTP id 16so985418fgg.10 for ; Sat, 17 Apr 2010 15:34:04 -0700 (PDT) From: Artyom Tarasenko Date: Sun, 18 Apr 2010 00:34:03 +0200 Message-Id: <1271543643-28463-1-git-send-email-atar4qemu@google.com> Subject: [Qemu-devel] [patch 02/02] sparc32 use empty_slot for missing RAM v1 List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: blauwirbel@gmail.com, Artyom Tarasenko use empty_slot device for the RAM which is not installed Models without ECC don't trap when missing ram is accessed. v0->v1 compile only once and fix indentation Signed-off-by: Artyom Tarasenko --- diff --git a/Makefile.objs b/Makefile.objs index ab1af88..f4d2faf 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -140,6 +140,7 @@ hw-obj-$(CONFIG_PFLASH_CFI02) += pflash_cfi02.o hw-obj-$(CONFIG_M48T59) += m48t59.o hw-obj-$(CONFIG_ESCC) += escc.o +hw-obj-$(CONFIG_EMPTY_SLOT) += empty_slot.o hw-obj-$(CONFIG_SERIAL) += serial.o hw-obj-$(CONFIG_PARALLEL) += parallel.o diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-softmmu.mak index 54899ff..becf880 100644 --- a/default-configs/sparc-softmmu.mak +++ b/default-configs/sparc-softmmu.mak @@ -7,3 +7,4 @@ CONFIG_M48T59=y CONFIG_PTIMER=y CONFIG_FDC=y CONFIG_VIRTIO_PCI=y +CONFIG_EMPTY_SLOT=y diff --git a/hw/sun4m.c b/hw/sun4m.c index 90e661d..73b6949 100644 --- a/hw/sun4m.c +++ b/hw/sun4m.c @@ -36,6 +36,7 @@ #include "isa.h" #include "fw_cfg.h" #include "escc.h" +#include "empty_slot.h" #include "qdev-addr.h" #include "loader.h" #include "elf.h" @@ -820,7 +821,11 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, ram_addr_t RAM_size, /* set up devices */ ram_init(0, RAM_size, hwdef->max_mem); - + /* models without ECC don't trap when missing ram is accessed */ + if (!hwdef->ecc_base) { + empty_slot_init(RAM_size, hwdef->max_mem - RAM_size); + } + prom_init(hwdef->slavio_base, bios_name); slavio_intctl = slavio_intctl_init(hwdef->intctl_base,