qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paul Brook <paul@nowt.org>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [7087] Fix/remove bogus ram size checks.
Date: Sat, 11 Apr 2009 17:01:43 +0000	[thread overview]
Message-ID: <E1LsgaN-00056t-5g@cvs.savannah.gnu.org> (raw)

Revision: 7087
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=7087
Author:   pbrook
Date:     2009-04-11 17:01:42 +0000 (Sat, 11 Apr 2009)
Log Message:
-----------
Fix/remove bogus ram size checks.

Signed-off-by: Paul Brook <paul@codesourcery.com>

Modified Paths:
--------------
    trunk/hw/nseries.c
    trunk/hw/pxa2xx_lcd.c

Modified: trunk/hw/nseries.c
===================================================================
--- trunk/hw/nseries.c	2009-04-11 16:55:44 UTC (rev 7086)
+++ trunk/hw/nseries.c	2009-04-11 17:01:42 UTC (rev 7087)
@@ -1272,15 +1272,8 @@
 {
     struct n800_s *s = (struct n800_s *) qemu_mallocz(sizeof(*s));
     int sdram_size = binfo->ram_size;
-    int onenandram_size = 0x00010000;
     DisplayState *ds;
 
-    if (ram_size < sdram_size + onenandram_size + OMAP242X_SRAM_SIZE) {
-        fprintf(stderr, "This architecture uses %i bytes of memory\n",
-                        sdram_size + onenandram_size + OMAP242X_SRAM_SIZE);
-        exit(1);
-    }
-
     s->cpu = omap2420_mpu_init(sdram_size, cpu_model);
 
     /* Setup peripherals

Modified: trunk/hw/pxa2xx_lcd.c
===================================================================
--- trunk/hw/pxa2xx_lcd.c	2009-04-11 16:55:44 UTC (rev 7086)
+++ trunk/hw/pxa2xx_lcd.c	2009-04-11 17:01:42 UTC (rev 7087)
@@ -302,7 +302,7 @@
             descptr = s->dma_ch[i].descriptor;
 
         if (!(descptr >= PXA2XX_SDRAM_BASE && descptr +
-                    sizeof(desc) <= PXA2XX_SDRAM_BASE + phys_ram_size))
+                    sizeof(desc) <= PXA2XX_SDRAM_BASE + ram_size))
             continue;
 
         cpu_physical_memory_read(descptr, (void *)&desc, sizeof(desc));
@@ -764,7 +764,7 @@
             }
             fbptr = s->dma_ch[ch].source;
             if (!(fbptr >= PXA2XX_SDRAM_BASE &&
-                    fbptr <= PXA2XX_SDRAM_BASE + phys_ram_size)) {
+                    fbptr <= PXA2XX_SDRAM_BASE + ram_size)) {
                 pxa2xx_dma_ber_set(s, ch);
                 continue;
             }

                 reply	other threads:[~2009-04-11 17:01 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=E1LsgaN-00056t-5g@cvs.savannah.gnu.org \
    --to=paul@nowt.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).