PowerPC kvm-userspace patches

qemu/configure +14 -0

+######################################
+# libfdt probe
+#
+if test -z "$device_tree_support" -a \
+   "$cpu" = "powerpc"; then 
+  device_tree_support="no"
+  cat > $TMPC << EOF
+#include <libfdt.h>
+/* XXX uncomment later when libfdt is built before this test */ 
+//int main(void) { void *fdt; return fdt_create(fdt, 1024); }
+int main (void) {return 0;}
+EOF
+# XXX for now do not try to link to libfdt and just check for header */
+# if $cc $ARCH_CFLAGS $CFLAGS $LDFLAGS -o $TMPE $TMPC -lfdt 2> /dev/null ; then

Quoted 19 lines · Jerone Young

qemu/configure +19 -0

+######################################
+# libfdt probe
+#
+if test -z "$device_tree_support" -a \
+   "$cpu" = "powerpc"; then 
+  device_tree_support="no"
+  cat > $TMPC << EOF
+#include <libfdt.h>
+/* XXX uncomment later when libfdt is built before this test */ 
+//int main(void) { void *fdt; return fdt_create(fdt, 1024); }
+int main (void) {return 0;}
+EOF
+# XXX for now do not try to link to libfdt and just check for header */
+# if $cc $ARCH_CFLAGS $CFLAGS $LDFLAGS -o $TMPE $TMPC -lfdt 2> /dev/null ; then
+  if $cc $ARCH_CFLAGS $CFLAGS $LDFLAGS -o $TMPE $TMPC 2> /dev/null; then 
+   device_tree_support="yes"
+  else
+    echo
+    echo "Error: Could not find libfdt"

qemu/configure else · line 762

Quoted 5 lines

qemu/configure +5 -0

+    echo "Make sure to have the libfdt libs and headers installed."
+    echo
+    exit 1
+  fi
+fi

What is the problem here? Should you describe it in the patch description? Did you mean to fix this before committing?

So this is the code Anthony asked for for probing libfdt. The problem is that if you do ./configure <params> at kvm-userpace top directory for the first time or after a clean you do not have libfdt.a. When qemu configure is run this probe would allways fail. So to check we just check for the header. So we compile a very simple program that include libfdt.h as the test.

All the XXX are if we ever do break libfdt out then we can do the proper probing for it (and the code for it is ready to be uncommented).

Quoted 20 lines · Hollis Blanchard

Quoted 19 lines · Jerone Young

qemu/configure +19 -0

+######################################
+# libfdt probe
+#
+if test -z "$device_tree_support" -a \
+   "$cpu" = "powerpc"; then 
+  device_tree_support="no"
+  cat > $TMPC << EOF
+#include <libfdt.h>
+/* XXX uncomment later when libfdt is built before this test */ 
+//int main(void) { void *fdt; return fdt_create(fdt, 1024); }
+int main (void) {return 0;}
+EOF
+# XXX for now do not try to link to libfdt and just check for header */
+# if $cc $ARCH_CFLAGS $CFLAGS $LDFLAGS -o $TMPE $TMPC -lfdt 2> /dev/null ; then
+  if $cc $ARCH_CFLAGS $CFLAGS $LDFLAGS -o $TMPE $TMPC 2> /dev/null; then 
+   device_tree_support="yes"
+  else
+    echo
+    echo "Error: Could not find libfdt"

Quoted 9 lines

qemu/configure else · line 762

Quoted 5 lines

qemu/configure +5 -0

+    echo "Make sure to have the libfdt libs and headers installed."
+    echo
+    exit 1
+  fi
+fi

What is the problem here? Should you describe it in the patch description? Did you mean to fix this before committing?

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
kvm-ppc-devel mailing list [email protected]
https://lists.sourceforge.net/lists/listinfo/kvm-ppc-devel

OK, if that's acceptable to the qemu folks, could you put that in the patch description?

qemu/loader.c +18 -0

+    tmp_loaded_image_size = hdr->ih_size;
+    
+    if (hdr->ih_comp == IH_COMP_GZIP) {
+       uncompressed_data = qemu_malloc(MAX_KERNEL_SIZE);
+       ret = gunzip(uncompressed_data, MAX_KERNEL_SIZE,
+                    (unsigned char *) data, 
+                    &tmp_loaded_image_size);
+
+       if (ret < 0) {
+            fprintf(stderr, "Unable to decompress gziped image!\n");
+            goto fail;
+        }
+
+        qemu_free(data);
+        cpu_physical_memory_write_rom(hdr->ih_load, uncompressed_data,
+                                      tmp_loaded_image_size);
+
+    }

qemu/loader.c int load_uboot(const char *filename, tar

Quoted 10 lines · Jerone Young

qemu/loader.c +10 -0

+    tmp_loaded_image_size = hdr->ih_size;
+    
+    if (hdr->ih_comp == IH_COMP_GZIP) {
+       uncompressed_data = qemu_malloc(MAX_KERNEL_SIZE);
+       ret = gunzip(uncompressed_data, MAX_KERNEL_SIZE,
+                    (unsigned char *) data, 
+                    &tmp_loaded_image_size);
+
+       if (ret < 0) {
+            fprintf(stderr, "Unable to decompress gziped image!

\n");

qemu/loader.c int load_uboot(const char *filename, tar

Quoted 5 lines

qemu/loader.c +5 -0

+            goto fail;
+        }
+
+        qemu_free(data);
+        cpu_physical_memory_write_rom(hdr->ih_load,

uncompressed_data,

qemu/loader.c int load_uboot(const char *filename, tar · line 441

Quoted 13 lines

qemu/loader.c +13 -0

+                                      tmp_loaded_image_size);
+
+    }
+    else {
+        cpu_physical_memory_write_rom(hdr->ih_load, data, 
+                                      tmp_loaded_image_size);
+    }
+
+    if (loaded_image_size != NULL)
+        *loaded_image_size = tmp_loaded_image_size;
+   
+    if ( load_address != NULL)
+       *load_address = hdr->ih_load;

Your whitespace in here is all over the place. Please fix.

Quoted 18 lines · Hollis Blanchard

qemu/loader.c int load_uboot(const char *filename, tar

Quoted 10 lines · Jerone Young

qemu/loader.c +10 -0

+    tmp_loaded_image_size = hdr->ih_size;
+    
+    if (hdr->ih_comp == IH_COMP_GZIP) {
+       uncompressed_data = qemu_malloc(MAX_KERNEL_SIZE);
+       ret = gunzip(uncompressed_data, MAX_KERNEL_SIZE,
+                    (unsigned char *) data, 
+                    &tmp_loaded_image_size);
+
+       if (ret < 0) {
+            fprintf(stderr, "Unable to decompress gziped image!

\n");

qemu/loader.c int load_uboot(const char *filename, tar

Quoted 5 lines

qemu/loader.c +5 -0

+            goto fail;
+        }
+
+        qemu_free(data);
+        cpu_physical_memory_write_rom(hdr->ih_load,

uncompressed_data,

Quoted 15 lines

qemu/loader.c int load_uboot(const char *filename, tar · line 441

Quoted 13 lines

qemu/loader.c +13 -0

+                                      tmp_loaded_image_size);
+
+    }
+    else {
+        cpu_physical_memory_write_rom(hdr->ih_load, data, 
+                                      tmp_loaded_image_size);
+    }
+
+    if (loaded_image_size != NULL)
+        *loaded_image_size = tmp_loaded_image_size;
+   
+    if ( load_address != NULL)
+       *load_address = hdr->ih_load;

Your whitespace in here is all over the place. Please fix.

Actually this matches the style of this entire file. I see the one white space. I see also I used a tab one place.

# HG changeset patch
# User Jerone Young <[email protected]>
# Date 1205870472 18000
# Branch merge
# Node ID 3e87db599895937824b9bf3369eb67ea7f5a7595
# Parent ba2876c3e8916ba9c19b75c4464cbb8dc6858fbd
Add dynamic device tree manipulation & change uboot loader for PPC bamboo board model

This patch adds code to dynamically manipulate the device tree when loaded into memory. This allows us to finally have the ability to manipulate the kernel command line & initrd from the qemu command line. This will also let us setup different settings for the board.

This patch also now uses new uboot loader load_image() to load kernel image.

Signed-off-by Jerone Young <[email protected]>

qemu/Makefile.target +1 -1

@@ -617,7 +617,7 @@ OBJS+= unin_pci.o ppc_chrp.o
 OBJS+= unin_pci.o ppc_chrp.o
 # PowerPC 4xx boards
 OBJS+= pflash_cfi02.o ppc4xx_devs.o ppc405_uc.o ppc405_boards.o
-OBJS+= ppc440.o ppc440_bamboo.o
+OBJS+= ppc440.o ppc440_bamboo.o device_tree.o
 endif
 ifeq ($(TARGET_BASE_ARCH), mips)
 OBJS+= mips_r4k.o mips_malta.o mips_pica61.o mips_mipssim.o

qemu/hw/device_tree.c new file +15 -0

new file mode 100644
@@ -0,0 +1,181 @@
+/*
+ * Functions to help device tree manipulation using libfdt.
+ * It also provides functions to read entries from device tree proc
+ * interface.
+ *
+ * Copyright 2008 IBM Corporation.
+ * Authors: Jerone Young <[email protected]>
+ *
+ * This work is licensed under the GNU GPL license version 2 or later.
+ *
+ */
+
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>

qemu/hw/device_tree.c new file +14 -0

+#define DT_PROC_INTERFACE_PATH "/proc/device-tree"
+
+/* FUNCTIONS FOR READING FROM DEVICE TREE OF HOST IN /PROC */
+
+/* This function reads device-tree property files that are of
+ * a single cell size
+ */
+uint32_t read_proc_dt_prop_cell(char *path_in_device_tree)
+{
+	char *buf = NULL;
+	int i;
+	uint32_t num;
+	FILE *stream;
+

qemu/hw/device_tree.c new file +18 -0

+	fread(&num, sizeof(num), 1, stream);
+	fclose(stream);
+
+	return num;
+} 
+
+/* FUNCTIONS FOR LOADING & MANIPULATION OF DEVICE TREE IN GUEST */
+
+#ifdef CONFIG_LIBFDT
+/* support functions */
+static int get_offset_of_node(void *fdt, char *node_path)
+{
+	int node_offset;
+	node_offset = fdt_path_offset(fdt, node_path);
+	if (node_offset < 0) {
+		printf("Unable to find node in device tree '%s'\n", 
+			node_path);
+		exit(1);

qemu/hw/ppc440_bamboo.c +2 -1

@@ -4,15 +4,16 @@
  * Copyright 2007 IBM Corporation.
  * Authors: Jerone Young <[email protected]>
  *
- * This work is licensed under the GNU GPL licence version 2 or later.
+ * This work is licensed under the GNU GPL license version 2 or later.
  *
  */
 
+#include "config.h"

qemu/hw/ppc440_bamboo.c +2 -2

 	target_phys_addr_t ram_bases[2], ram_sizes[2];
 	qemu_irq *pic;
 	CPUState *env;
-	target_ulong ep;
+	target_ulong ep=0;
+	target_ulong la=0;
 	int is_linux=1; /* Will assume allways is Linux for now */
-	long kernel_size=0;

Quoted 8 lines · Jerone Young

# HG changeset patch
# User Jerone Young <[email protected]>
# Date 1205870472 18000
# Branch merge
# Node ID 3e87db599895937824b9bf3369eb67ea7f5a7595
# Parent ba2876c3e8916ba9c19b75c4464cbb8dc6858fbd
Add dynamic device tree manipulation & change uboot loader for PPC bamboo board model

Quoted 7 lines

This patch adds code to dynamically manipulate the device tree when loaded into memory. This allows us to finally have the ability to manipulate the kernel command line & initrd from the qemu command line. This will also let us setup different settings for the board.

This patch also now uses new uboot loader load_image() to load kernel image.

Again, the load_uimage part (which you've misspelled here) should be a separate patch?

Quoted 34 lines

Signed-off-by Jerone Young <[email protected]>

qemu/Makefile.target +1 -1

@@ -617,7 +617,7 @@ OBJS+= unin_pci.o ppc_chrp.o
 OBJS+= unin_pci.o ppc_chrp.o
 # PowerPC 4xx boards
 OBJS+= pflash_cfi02.o ppc4xx_devs.o ppc405_uc.o ppc405_boards.o
-OBJS+= ppc440.o ppc440_bamboo.o
+OBJS+= ppc440.o ppc440_bamboo.o device_tree.o
 endif
 ifeq ($(TARGET_BASE_ARCH), mips)
 OBJS+= mips_r4k.o mips_malta.o mips_pica61.o mips_mipssim.o

qemu/hw/device_tree.c new file +15 -0

new file mode 100644
@@ -0,0 +1,181 @@
+/*
+ * Functions to help device tree manipulation using libfdt.
+ * It also provides functions to read entries from device tree proc
+ * interface.
+ *
+ * Copyright 2008 IBM Corporation.
+ * Authors: Jerone Young <[email protected]>
+ *
+ * This work is licensed under the GNU GPL license version 2 or later.
+ *
+ */
+
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>

qemu/hw/device_tree.c line 25

Quoted 10 lines

qemu/hw/device_tree.c new file +10 -0

+#include <fcntl.h>
+#include <unistd.h>
+#include <stdlib.h>
+
+#include "config.h"
+#include "ppc440.h"
+
+#ifdef CONFIG_LIBFDT
+	#include "libfdt.h"
+#endif

Again, don't indent this.

Quoted 18 lines

qemu/hw/device_tree.c new file +18 -0

+#define DT_PROC_INTERFACE_PATH "/proc/device-tree"
+
+/* FUNCTIONS FOR READING FROM DEVICE TREE OF HOST IN /PROC */
+
+/* This function reads device-tree property files that are of
+ * a single cell size
+ */
+uint32_t read_proc_dt_prop_cell(char *path_in_device_tree)
+{
+	char *buf = NULL;
+	int i;
+	uint32_t num;
+	FILE *stream;
+
+	i = snprintf(buf, 0, "%s/%s", DT_PROC_INTERFACE_PATH,
+		path_in_device_tree);
+
+	buf = (char *)malloc(i);

qemu/hw/device_tree.c line 50

Quoted 6 lines

qemu/hw/device_tree.c new file +6 -0

+	if (buf == NULL)
+	{
+		printf("%s: Unable to malloc string buffer buf\n",
+			__func__);
+		exit(1);
+	}

Braces.

qemu/hw/device_tree.c line 61

Quoted 11 lines

qemu/hw/device_tree.c new file +10 -0

+	i = snprintf(buf, i+1, "%s/%s",  DT_PROC_INTERFACE_PATH,
+		path_in_device_tree);
+
+	stream = fopen(buf, "rb");
+	
+	if (stream == NULL)
+	{
+		printf("%s: Unable to open '%s'\n", __func__, buf);
+		exit(1);
+	}

Braces.

Quoted 22 lines

qemu/hw/device_tree.c new file +22 -0

+	fread(&num, sizeof(num), 1, stream);
+	fclose(stream);
+
+	return num;
+} 
+
+/* FUNCTIONS FOR LOADING & MANIPULATION OF DEVICE TREE IN GUEST */
+
+#ifdef CONFIG_LIBFDT
+/* support functions */
+static int get_offset_of_node(void *fdt, char *node_path)
+{
+	int node_offset;
+	node_offset = fdt_path_offset(fdt, node_path);
+	if (node_offset < 0) {
+		printf("Unable to find node in device tree '%s'\n", 
+			node_path);
+		exit(1);
+	}
+	return node_offset;
+}
+

qemu/hw/device_tree.c line 90

Quoted 6 lines

qemu/hw/device_tree.c new file +6 -0

+/* public functions */
+void *load_device_tree(char *filename_path, unsigned long load_addr)
+{
+	int dt_file_size;
+	int dt_file_load_size;
+	int new_dt_size;	int ret;

Does this look right to you?

...

Quoted 13 lines

qemu/hw/ppc440_bamboo.c +2 -1

@@ -4,15 +4,16 @@
  * Copyright 2007 IBM Corporation.
  * Authors: Jerone Young <[email protected]>
  *
- * This work is licensed under the GNU GPL licence version 2 or later.
+ * This work is licensed under the GNU GPL license version 2 or later.
  *
  */
 
+#include "config.h"

qemu/hw/ppc440_bamboo.c line 18

Quoted 10 lines

qemu/hw/ppc440_bamboo.c +3 -3

 #include "ppc440.h"
+#include "qemu-kvm.h"
+#include "device_tree.h"
 
-#define KERNEL_LOAD_ADDR 0x400000 /* uboot loader puts kernel at 4MB */
-
-#include "qemu-kvm.h"
+#define BINARY_DEVICE_TREE_FILE "bamboo.dtb"
 
 /* PPC 440 refrence demo board

Could you fix this typo while you're at it?

qemu/hw/ppc440_bamboo.c void bamboo_init(ram_addr_t ram_size, in · line 30

Quoted 5 lines

qemu/hw/ppc440_bamboo.c +1 -0

@@ -26,14 +27,22 @@ void bamboo_init(ram_addr_t ram_size, in
 			const char *initrd_filename,
 			const char *cpu_model)
 {
+	char buf[1024];

You previously said you had removed 'buf' and replaced it with dynamic allocation, but I don't see that here.

Quoted 13 lines

qemu/hw/ppc440_bamboo.c +4 -3

 	target_phys_addr_t ram_bases[2], ram_sizes[2];
 	qemu_irq *pic;
 	CPUState *env;
-	target_ulong ep;
+	target_ulong ep=0;
+	target_ulong la=0;
 	int is_linux=1; /* Will assume allways is Linux for now */
-	long kernel_size=0;
+	target_long kernel_size=0;
 	target_ulong initrd_base=0;
-	target_ulong initrd_size=0;
+	target_long initrd_size=0;

qemu/hw/ppc440_bamboo.c void bamboo_init(ram_addr_t ram_size, in · line 45

Quoted 6 lines

qemu/hw/ppc440_bamboo.c +6 -0

+	target_ulong dt_base=0;
+	void *fdt;
+	int ret;
+
+	uint32_t cpu_freq;
+	uint32_t timebase_freq;

Why is there an extra blank line here?

Quoted 19 lines · Hollis Blanchard

Quoted 19 lines

qemu/hw/device_tree.c new file +18 -0

+#define DT_PROC_INTERFACE_PATH "/proc/device-tree"
+
+/* FUNCTIONS FOR READING FROM DEVICE TREE OF HOST IN /PROC */
+
+/* This function reads device-tree property files that are of
+ * a single cell size
+ */
+uint32_t read_proc_dt_prop_cell(char *path_in_device_tree)
+{
+	char *buf = NULL;
+	int i;
+	uint32_t num;
+	FILE *stream;
+
+	i = snprintf(buf, 0, "%s/%s", DT_PROC_INTERFACE_PATH,
+		path_in_device_tree);
+
+	buf = (char *)malloc(i);

Quoted 8 lines

qemu/hw/device_tree.c line 50

Quoted 6 lines

qemu/hw/device_tree.c new file +6 -0

+	if (buf == NULL)
+	{
+		printf("%s: Unable to malloc string buffer buf\n",
+			__func__);
+		exit(1);
+	}

Braces.

What is the deal. They are braces. They are done diffrenent through outt the qemu code. This

Quoted 8 lines

qemu/hw/ppc440_bamboo.c void bamboo_init(ram_addr_t ram_size, in · line 30

Quoted 5 lines

qemu/hw/ppc440_bamboo.c +1 -0

@@ -26,14 +27,22 @@ void bamboo_init(ram_addr_t ram_size, in
 			const char *initrd_filename,
 			const char *cpu_model)
 {
+	char buf[1024];

You previously said you had removed 'buf' and replaced it with dynamic allocation, but I don't see that here.

Removing of buf discussed was from hw/device_tree.c not this file.

# HG changeset patch
# User Jerone Young <[email protected]>
# Date 1205870472 18000
# Branch merge
# Node ID 4f90f7d25186f55bfb1503764af5264201df067f
# Parent ac0fc9dfd78d2eddd083326e9b635a9286fc3b19
Add ability to specify ram on command line for bamboo board model

This patch adds the ability to now specify ram sizes on the command line. Due to the nature of the code there are restictions on exactly how much ram and the multiple that the size must match.

Signed-off-by Jerone Young <[email protected]>

qemu/hw/ppc440_bamboo.c +3 -0

@@ -15,6 +15,9 @@
 
 #define BINARY_DEVICE_TREE_FILE "bamboo.dtb"
 
+#define bytes_to_mb(a) (a>>20)
+#define mb_to_bytes(a) (a<<20)
+
 /* PPC 440 refrence demo board
  *
  * 440 PowerPC CPU

qemu/hw/ppc440_bamboo.c +2 -9

 	uint32_t cpu_freq;
 	uint32_t timebase_freq;
 
 	printf("%s: START\n", __func__);
 
-	/* Setup Memory */
-	if (ram_size) {
-		printf("Ram size specified on command line is %i bytes\n",
-								(int)ram_size);
-		printf("WARNING: RAM is hard coded to 144MB\n");
-	}
-	else {
-		printf("Using defualt ram size of %iMB\n",
-						((int)ram_size/1024)/1024);
+ 	/* Setup Memory */
+ 	printf("Ram size passed is: %i MB\n",

qemu/hw/ppc440_bamboo.c +5 -7

+				ram_sizes[i] = mb_to_bytes(ram_stick_sizes[k]);
+				tmp_ram_size -= mb_to_bytes(ram_stick_sizes[k]);
+				break;
+			}
+		}
 	}
-	/* Each bank can only have memory in configurations of
-	 *   16MB, 32MB, 64MB, 128MB, or 256MB
-	 */
-	ram_bases[0] = 0x0;
-	ram_sizes[0] = 0x08000000;
-	ram_bases[1] = 0x0;
-	ram_sizes[1] = 0x01000000;

Quoted 30 lines · Jerone Young

# HG changeset patch
# User Jerone Young <[email protected]>
# Date 1205870472 18000
# Branch merge
# Node ID 4f90f7d25186f55bfb1503764af5264201df067f
# Parent ac0fc9dfd78d2eddd083326e9b635a9286fc3b19
Add ability to specify ram on command line for bamboo board model

This patch adds the ability to now specify ram sizes on the command line. Due to the nature of the code there are restictions on exactly how much ram and the multiple that the size must match.

Signed-off-by Jerone Young <[email protected]>

qemu/hw/ppc440_bamboo.c +3 -0

@@ -15,6 +15,9 @@
 
 #define BINARY_DEVICE_TREE_FILE "bamboo.dtb"
 
+#define bytes_to_mb(a) (a>>20)
+#define mb_to_bytes(a) (a<<20)
+
 /* PPC 440 refrence demo board
  *
  * 440 PowerPC CPU

@@ -28,7 +31,7 @@ void bamboo_init(ram_addr_t ram_size, in
 			const char *cpu_model)
 {

qemu/hw/ppc440_bamboo.c void bamboo_init(ram_addr_t ram_size, in · line 37

Quoted 6 lines

qemu/hw/ppc440_bamboo.c +1 -1

 	char buf[1024];	
-	target_phys_addr_t ram_bases[2], ram_sizes[2];
+	target_phys_addr_t ram_bases[2], ram_sizes[2]; 
 	qemu_irq *pic;
 	CPUState *env;
 	target_ulong ep=0;

Here you have added a trailing space.

qemu/hw/ppc440_bamboo.c void bamboo_init(ram_addr_t ram_size, in · line 48

Quoted 8 lines

qemu/hw/ppc440_bamboo.c +3 -0

@@ -40,32 +43,39 @@ void bamboo_init(ram_addr_t ram_size, in
 	target_ulong dt_base=0;
 	void *fdt;
 	int ret;
+	int ram_stick_sizes[] = {256, 128, 64, 32, 16, 8 }; /* in Mega bytes */
+	ram_addr_t tmp_ram_size;
+	int i=0, k=0;

Define ram_stick_sizes[] in MB and then remove all the shifting inside the loops.

Quoted 21 lines

qemu/hw/ppc440_bamboo.c +6 -9

 	uint32_t cpu_freq;
 	uint32_t timebase_freq;
 
 	printf("%s: START\n", __func__);
 
-	/* Setup Memory */
-	if (ram_size) {
-		printf("Ram size specified on command line is %i bytes\n",
-								(int)ram_size);
-		printf("WARNING: RAM is hard coded to 144MB\n");
-	}
-	else {
-		printf("Using defualt ram size of %iMB\n",
-						((int)ram_size/1024)/1024);
+ 	/* Setup Memory */
+ 	printf("Ram size passed is: %i MB\n",
+ 				bytes_to_mb((int)ram_size));
+
+	tmp_ram_size = ram_size;
+ 

qemu/hw/ppc440_bamboo.c void bamboo_init(ram_addr_t ram_size, in · line 66

Quoted 6 lines

qemu/hw/ppc440_bamboo.c +6 -0

+	for (i=0; i < (sizeof(ram_sizes)/sizeof(ram_sizes[0])); i++)
+	{
+		for (k=0; k < (sizeof(ram_stick_sizes)/sizeof(ram_stick_sizes[0])); k++)
+		{
+			if ((bytes_to_mb(ram_size)/ram_stick_sizes[k]) > 0)
+			{

Don't divide, just use a logical comparison.

Also, put all the open-braces on the previous lines.

Quoted 22 lines

qemu/hw/ppc440_bamboo.c +10 -9

+				ram_sizes[i] = mb_to_bytes(ram_stick_sizes[k]);
+				tmp_ram_size -= mb_to_bytes(ram_stick_sizes[k]);
+				break;
+			}
+		}
 	}
-	/* Each bank can only have memory in configurations of
-	 *   16MB, 32MB, 64MB, 128MB, or 256MB
-	 */
-	ram_bases[0] = 0x0;
-	ram_sizes[0] = 0x08000000;
-	ram_bases[1] = 0x0;
-	ram_sizes[1] = 0x01000000;
-
-	printf("Ram size of domain is %d bytes\n", (int)ram_size);
+	if (tmp_ram_size) {
+		printf("WARNING: %i MB left over memory is ram\n", 
+			bytes_to_mb((int)tmp_ram_size));
+		ram_size -= tmp_ram_size;
+	}
 

qemu/hw/ppc440_bamboo.c void bamboo_init(ram_addr_t ram_size, in · line 81

Quoted 2 lines

qemu/hw/ppc440_bamboo.c +0 -0

 	/* Setup CPU */
 	env = cpu_ppc_init("440");

Remove tmp_ram_size completely. Just decrement ram_size in the loop and
check if it's non-zero at the end.