Virtualization/openbios
1
0
Fork 0
mirror of https://gitlab.com/qemu-project/openbios.git synced 2024-02-13 08:34:06 +08:00
Code Issues Projects Releases Wiki Activity

As documented on the mailing lists, change the interposition order of the disk packages from:

Browse Source 
cdrom -> deblocker -> disk-label -> (misc-files | sun-parts | pc-parts | mac-parts) 

to:

cdrom -> deblocker -> disk-label -> (sun-parts | pc-parts | mac-parts) -> misc-files 

This makes the overall code much simpler, since instead of passing get-info structures between the different layers to work out 
the current device offset, each package can simply maintain its own offsets and bubble them back up to the parent.

There are also many, many bugfixes present is patch, some of which are given below:

- Add debugging in /packages/misc-files, augment debugging in all other disk packages
- Fix alignment issue in /packages/pc-parts so it works correctly on strictly align archs, e.g. SPARC64
- Fix parsing of [<id>,][filename] arguments to load (in preparation for next patch set)
- Fix byte-swapping issues in /packages/mac-parts (in theory it should now work regardless of endian)




git-svn-id: svn://coreboot.org/openbios/trunk/openbios-devel@791 f158a5a8-5612-0410-a976-696ce0be7e32
This commit is contained in:
cdrom - deblocker - disk-label - (misc-files | sun-parts | pc-parts | mac-parts)
2010-06-08 20:59:08 +00:00
committed by Mark Cave-Ayland
parent 1e5c4a8173
commit 7fc4e304c3
9 changed files with 777 additions and 342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
fs/grubfs/grubfs_fs.c
View File

@@ -20,6 +20,7 @@
#include "filesys.h"
#include "glue.h"
#include "libc/diskio.h"
#include "libc/vsprintf.h"
/************************************************************************/
/* grub GLOBALS (horrible... but difficult to fix) */
@@ -97,6 +98,8 @@ typedef struct {
const struct fsys_entry *fsys;
grubfile_t *fd;
int dev_fd;
llong offset; /* Offset added onto each device read; should only ever be non-zero
when probing a partition for a filesystem */
} grubfs_t;
static grubfs_t dummy_fs;
@@ -199,7 +202,7 @@ open_path( fs_ops_t *fs, const char *path )
printk("Path=%s\n",path);
#endif
if (!curfs->fsys->dir_func((char *) path)) {
printk("File not found\n");
forth_printf("File not found\n");
return NULL;
}
ret=malloc(sizeof(grubfile_t));
@@ -249,6 +252,7 @@ fs_grubfs_open( int fd, fs_ops_t *fs )
curfs=&dummy_fs;
curfs->dev_fd = fd;
curfs->offset = 0;
for (i = 0; i < sizeof(fsys_table)/sizeof(fsys_table[0]); i++) {
#ifdef CONFIG_DEBUG_FS
@@ -275,6 +279,31 @@ fs_grubfs_open( int fd, fs_ops_t *fs )
return -1;
}
/* Probe for filesystem (with partition offset); returns 0 on success */
int
fs_grubfs_probe( int fd, llong offs )
{
int i;
curfs = &dummy_fs;
curfs->dev_fd = fd;
curfs->offset = offs;
for (i = 0; i < sizeof(fsys_table)/sizeof(fsys_table[0]); i++) {
#ifdef CONFIG_DEBUG_FS
printk("Probing for %s\n", fsys_table[i].name);
#endif
if (fsys_table[i].mount_func())
return 0;
}
#ifdef CONFIG_DEBUG_FS
printk("Unknown filesystem type\n");
#endif
return -1;
}
/************************************************************************/
/* I/O glue (called by grub source) */
@@ -297,7 +326,7 @@ devread( unsigned long sector, unsigned long byte_offset,
return -1;
}
if( seek_io(curfs->dev_fd, offs) ) {
if( seek_io(curfs->dev_fd, offs + curfs->offset) ) {
#ifdef CONFIG_DEBUG_FS
printk("seek failure\n");
#endif