On Tue, 2008-03-18 at 16:03 -0500, Hollis Blanchard wrote:
> On Tue, 2008-03-18 at 15:06 -0500, Jerone Young wrote:
> > # 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]>
> >
> > diff --git a/qemu/hw/ppc440_bamboo.c b/qemu/hw/ppc440_bamboo.c
> > --- a/qemu/hw/ppc440_bamboo.c
> > +++ b/qemu/hw/ppc440_bamboo.c
> > @@ -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)
> > {
> > 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.
ok
>
> > @@ -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.
You must mean define them in bytes. That can be done also.
>
> > 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;
> > +
> > + 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.
This can be done. Though it really doesn't matter. Both ways work.
> Also, put all the open-braces on the previous lines.
ok
>
> > + 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;
> > + }
> >
> > /* 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.
tmp_ram_size is needed because we use ram_size later used allocate
memory.
>
-------------------------------------------------------------------------
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-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/kvm-devel
