[patch/5.3] ppc "disk" -> "block"; Was: add disk device to PowerPC sim

[Andrew Cagney <ac131313@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 1891 bytes --]

> I make this commit needed by the FreeBSD/powerpc porting effort.
> 
> 2002-03-24  David O'Brien  <obrien@FreeBSD.org>
> * ppc/hw_disk.c: Export a disk device property.
> 
> Index: hw_disk.c
> ===================================================================
> RCS file: /cvs/src/src/sim/ppc/hw_disk.c,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -r1.1 -r1.2
> --- hw_disk.c    1999/04/16 01:35:09    1.1
> +++ hw_disk.c    2002/03/25 04:39:20    1.2
> @@ -232,6 +232,9 @@
>              space, address, 0/*size*/, access_read_write_exec,
>              me);
>  
> +  /* Tell the world we are a disk.  */
> +  device_add_string_property(me, "device_type", "disk");
> +
>    /* get the name of the file specifying the disk image */
>    disk->name_index = 0;
>    disk->nr_names = device_find_string_array_property(me, "file",
> 
> I'm going to need to dig up my 1275 manual to check this one out.
> 
> David,
> 
> A disk drive has a "device_type" of "block" not "disk".  See 1276 section 3.7 (Standard device types) and 3.7.2 ("block" devices).  Could you please fix this, trunk and branch (given it has already been checked into the branch :-( ).
> 
> At present none of other hw_*.c files are doing like the above.  Instead they use a device tree (see attached) so your two line patch introduces a very fundamental change in the simulator's behavour.  However, yes, the current need to specify all the properties in a file is a pain and the code to start doing this is long overdue.
> 
> Looking at the actual change, ..._init_address() appears to get the job done.  However, if you trace the code, the second and further init calls try to re-add the property to the tree (see how permenant_object is used) - fortunatly these are ignored.  Can you please create a bug-report documenting this problem.

I've checked in the attached.

HEAD and gdb_5_3-branch.

Andrew


[-- Attachment #2: diffs --]
[-- Type: text/plain, Size: 666 bytes --]

2002-09-27  Andrew Cagney  <ac131313@redhat.com>

	* hw_disk.c (hw_disk_init_address): Set device type to "block",
	not "disk".

Index: hw_disk.c
===================================================================
RCS file: /cvs/src/src/sim/ppc/hw_disk.c,v
retrieving revision 1.2
diff -u -r1.2 hw_disk.c
--- hw_disk.c	25 Mar 2002 04:39:20 -0000	1.2
+++ hw_disk.c	27 Sep 2002 21:00:45 -0000
@@ -233,7 +233,7 @@
 			me);
 
   /* Tell the world we are a disk.  */
-  device_add_string_property(me, "device_type", "disk");
+  device_add_string_property(me, "device_type", "block");
 
   /* get the name of the file specifying the disk image */
   disk->name_index = 0;