Add qemu 2.4.0

Change-Id: Ic99cbad4b61f8b127b7dc74d04576c0bcbaaf4f5
Signed-off-by: Yang Zhang <yang.z.zhang@intel.com>

13 files changed, 1099 insertions, 0 deletions

diff --git a/qemu/roms/openbios/fs/iso9660/build.xml b/qemu/roms/openbios/fs/iso9660/build.xml
new file mode 100644
index 000000000..00d390217
--- /dev/null
+++ b/qemu/roms/openbios/fs/iso9660/build.xml
@@ -0,0 +1,13 @@
+<build>
+ <library name="fs" type="static" target="target">
+  <object source="iso9660_fs.c" condition="ISO9660"/>
+  <object source="iso9660_close.c" condition="ISO9660"/>
+  <object source="iso9660_closedir.c" condition="ISO9660"/>
+  <object source="iso9660_lseek.c" condition="ISO9660"/>
+  <object source="iso9660_mount.c" condition="ISO9660"/>
+  <object source="iso9660_open.c" condition="ISO9660"/>
+  <object source="iso9660_opendir.c" condition="ISO9660"/>
+  <object source="iso9660_read.c" condition="ISO9660"/>
+  <object source="iso9660_readdir.c" condition="ISO9660"/>
+ </library>
+</build>
diff --git a/qemu/roms/openbios/fs/iso9660/iso9660.h b/qemu/roms/openbios/fs/iso9660/iso9660.h
new file mode 100644
index 000000000..ac6dcf091
--- /dev/null
+++ b/qemu/roms/openbios/fs/iso9660/iso9660.h
@@ -0,0 +1,58 @@
+/*
+ *
+ * (c) 2005-2009 Laurent Vivier <Laurent@vivier.eu>
+ *
+ * This file has been copied from EMILE, http://emile.sf.net
+ *
+ */
+
+#ifndef __ISO9660_H__
+#define __ISO9660_H__
+
+#include "iso9660_fs.h"
+
+typedef struct iso9660_VOLUME {
+	int ucs_level;
+	struct iso_primary_descriptor *descriptor;
+	int fd;
+} iso9660_VOLUME;
+
+typedef struct iso9660_DIR {
+	iso9660_VOLUME *volume;
+	int extent;
+	int len;
+	int index;
+	unsigned char buffer[ISOFS_BLOCK_SIZE];
+} iso9660_DIR;
+
+typedef struct iso9660_FILE {
+	iso9660_VOLUME *volume;
+	char *path;
+	int base;			/* first extent of the file */
+	int size;			/* size of the file */
+	int offset;
+	int current;
+	unsigned char buffer[ISOFS_BLOCK_SIZE];
+} iso9660_FILE;
+
+static inline int isonum_721(char *p)
+{
+        return ((p[0] & 0xff)
+                | ((p[1] & 0xff) << 8));
+}
+
+static inline int isonum_723(char *p)
+{
+        return (isonum_721(p));
+}
+
+static inline int isonum_733(char *p)
+{
+	return ((p[0] & 0xff) | ((p[1] & 0xff) << 8) |
+		((p[2] & 0xff) << 16) | ((p[3] & 0xff) << 24));
+}
+
+extern struct iso_directory_record *iso9660_get_root_node(iso9660_VOLUME* volume);
+extern struct iso_directory_record* iso9660_get_node(iso9660_VOLUME *volume, struct iso_directory_record *dirnode, const char *path);
+
+#endif /* __ISO9660_H__ */
diff --git a/qemu/roms/openbios/fs/iso9660/iso9660_close.c b/qemu/roms/openbios/fs/iso9660/iso9660_close.c
new file mode 100644
index 000000000..ce79c0fd4
--- /dev/null
+++ b/qemu/roms/openbios/fs/iso9660/iso9660_close.c
@@ -0,0 +1,15 @@
+/*
+ *
+ * (c) 2005-2009 Laurent Vivier <Laurent@vivier.eu>
+ *
+ * This file has been copied from EMILE bootloader, http://emile.sf.net
+ *
+ */
+
+#include "libiso9660.h"
+
+void iso9660_close(iso9660_FILE *file)
+{
+	free(file->path);
+	free(file);
+}
diff --git a/qemu/roms/openbios/fs/iso9660/iso9660_closedir.c b/qemu/roms/openbios/fs/iso9660/iso9660_closedir.c
new file mode 100644
index 000000000..706cc222f
--- /dev/null
+++ b/qemu/roms/openbios/fs/iso9660/iso9660_closedir.c
@@ -0,0 +1,19 @@
+/*
+ *
+ * (c) 2005-2009 Laurent Vivier <Laurent@vivier.eu>
+ *
+ * This file has been copied from EMILE, http://emile.sf.net
+ *
+ */
+
+#include "libiso9660.h"
+
+int iso9660_closedir(iso9660_DIR *dir)
+{
+	if (dir == NULL)
+		return -1;
+
+	free(dir);
+
+	return 0;
+}
diff --git a/qemu/roms/openbios/fs/iso9660/iso9660_fs.c b/qemu/roms/openbios/fs/iso9660/iso9660_fs.c
new file mode 100644
index 000000000..d6f547be1
--- /dev/null
+++ b/qemu/roms/openbios/fs/iso9660/iso9660_fs.c
@@ -0,0 +1,263 @@
+/*
+ * /packages/iso9660-files filesystem handler
+ *
+ * (c) 2009 Laurent Vivier <Laurent@vivier.eu>
+ * (c) 2010 Mark Cave-Ayland <mark.cave-ayland@siriusit.co.uk>
+ */
+
+#include "config.h"
+#include "libopenbios/bindings.h"
+#include "libiso9660.h"
+#include "fs/fs.h"
+#include "libc/vsprintf.h"
+#include "libc/diskio.h"
+
+extern void     iso9660_init( void );
+
+typedef struct {
+	enum { FILE, DIR } type;
+	union {
+		iso9660_FILE *file;
+		iso9660_DIR * dir;
+	};
+} iso9660_COMMON;
+
+typedef struct {
+	iso9660_VOLUME *volume;
+	iso9660_COMMON *common;
+} iso9660_info_t;
+
+DECLARE_NODE( iso9660, 0, sizeof(iso9660_info_t), "+/packages/iso9660-files" );
+
+/* ( -- success? ) */
+static void
+iso9660_files_open( iso9660_info_t *mi )
+{
+	int fd;
+	char *path = my_args_copy();
+
+	if ( ! path )
+		RET( 0 );
+ 
+	fd = open_ih( my_parent() );
+	if ( fd == -1 ) {
+		free( path );
+		RET( 0 );
+	}
+ 
+	mi->volume = iso9660_mount( fd );
+	if ( mi->volume == NULL ) {
+		free( path );
+		close_io( fd );
+		RET( 0 );
+	}
+
+	mi->common->dir = iso9660_opendir( mi->volume, path );
+	if ( mi->common->dir == NULL ) {
+		mi->common->file = iso9660_open( mi->volume, path );
+		if (mi->common->file == NULL) {
+			iso9660_umount( mi->volume );
+			close_io( fd );
+			free( path );
+			RET( 0 );
+		}
+		mi->common->type = FILE;
+		free( path );
+		RET( -1 );
+ 	}
+	mi->common->type = DIR;
+	free( path );
+
+	RET( -1 );
+}
+
+/* ( -- ) */
+static void
+iso9660_files_close( iso9660_info_t *mi )
+{
+	int fd = mi->volume->fd;
+ 
+	if (mi->common->type == FILE )
+		iso9660_close( mi->common->file );
+	else if ( mi->common->type == DIR )
+		iso9660_closedir( mi->common->dir );
+	iso9660_umount( mi->volume );
+	close_io( fd );
+}
+
+/* ( buf len -- actlen ) */
+static void
+iso9660_files_read( iso9660_info_t *mi )
+{
+	int count = POP();
+	char *buf = (char *)cell2pointer(POP());
+	int ret;
+ 
+	if ( mi->common->type != FILE )
+		PUSH( 0 );
+ 
+	ret = iso9660_read( mi->common->file, buf, count );
+ 
+	PUSH( ret );
+}
+
+/* ( pos.d -- status ) */
+static void
+iso9660_files_seek( iso9660_info_t *mi )
+{
+	long long pos = DPOP();
+	cell ret;
+	int offs = (int)pos;
+	int whence = SEEK_SET;
+
+	if (mi->common->type != FILE)
+		PUSH( -1 );
+
+	if( offs == -1 ) {
+		offs = 0;
+		whence = SEEK_END;
+	}
+ 
+	ret = iso9660_lseek(mi->common->file, offs, whence);
+ 
+	PUSH( (ret < 0)? -1 : 0 );
+}
+
+/* ( -- filepos.d ) */
+static void
+iso9660_files_offset( iso9660_info_t *mi )
+{
+	if ( mi->common->type != FILE )
+		DPUSH( -1 );
+ 
+	DPUSH( mi->common->file->offset );
+}
+
+/* ( addr -- size ) */
+static void
+iso9660_files_load( iso9660_info_t *mi)
+{
+	char *buf = (char*)cell2pointer(POP());
+	int ret, size;
+ 
+	if ( mi->common->type != FILE )
+		PUSH( 0 );
+ 
+	size = 0;
+	while(1) {
+		ret = iso9660_read( mi->common->file, buf, 512 );
+		if (ret <= 0)
+			break;
+		buf += ret;
+		size += ret;
+		if (ret != 512)
+			break;
+	}
+	PUSH( size );
+}
+
+/* static method, ( pathstr len ihandle -- ) */
+static void
+iso9660_files_dir( iso9660_info_t *dummy )
+{
+	iso9660_VOLUME *volume;
+	iso9660_COMMON *common;
+	struct iso_directory_record *idr;
+	char name_buf[256];
+	int fd;
+ 
+	ihandle_t ih = POP();
+	char *path = pop_fstr_copy();
+
+	fd = open_ih( ih );
+	if ( fd == -1 ) {
+		free( path );
+		return;
+	}
+ 
+	volume = iso9660_mount( fd );
+	if ( volume == NULL ) {
+		free ( path );
+		close_io( fd );
+		return;
+	}
+
+	common = malloc(sizeof(iso9660_COMMON));
+	common->dir = iso9660_opendir( volume, path );
+
+	forth_printf("\n");
+	while ( (idr = iso9660_readdir(common->dir)) ) {
+ 
+		forth_printf("% 10d ", isonum_733(idr->size));
+		forth_printf("%d-%02d-%02d %02d:%02d:%02d ",
+			     idr->date[0] + 1900, /* year */
+			     idr->date[1], /* month */
+                             idr->date[2], /* day */
+			     idr->date[3], idr->date[4], idr->date[5]);
+		iso9660_name(common->dir->volume, idr, name_buf);
+		if (idr->flags[0] & 2)
+			forth_printf("%s\\\n", name_buf);
+		else
+			forth_printf("%s\n", name_buf);
+	}
+
+	iso9660_closedir( common->dir );
+	iso9660_umount( volume );
+
+	close_io( fd );
+
+	free( common );
+	free( path );
+}
+
+/* static method, ( pos.d ih -- flag? ) */
+static void
+iso9660_files_probe( iso9660_info_t *dummy )
+{
+	ihandle_t ih = POP_ih();
+	long long offs = DPOP();
+	int fd, ret = 0;
+
+	fd = open_ih(ih);
+        if (fd >= 0) {
+                if (iso9660_probe(fd, offs)) {
+                        ret = -1;
+                }
+                close_io(fd);
+        } else {
+                ret = -1;
+        }
+
+	RET (ret);
+}
+
+static void
+iso9660_files_block_size( iso9660_info_t *dummy )
+{
+	PUSH(2048);
+}
+ 
+static void
+iso9660_initializer( iso9660_info_t *dummy )
+{
+	fword("register-fs-package");
+}
+ 
+NODE_METHODS( iso9660 ) = {
+	{ "probe",	iso9660_files_probe		},
+	{ "open",	iso9660_files_open		},
+	{ "close",	iso9660_files_close		},
+	{ "read",	iso9660_files_read		},
+	{ "seek",	iso9660_files_seek		},
+	{ "offset",	iso9660_files_offset		},
+	{ "load",	iso9660_files_load		},
+	{ "dir",	iso9660_files_dir		},
+	{ "block-size",	iso9660_files_block_size	},
+	{ NULL,		iso9660_initializer	},
+};
+
+void
+iso9660_init( void )
+{
+	REGISTER_NODE( iso9660 );
+}
diff --git a/qemu/roms/openbios/fs/iso9660/iso9660_fs.h b/qemu/roms/openbios/fs/iso9660/iso9660_fs.h
new file mode 100644
index 000000000..0de124da9
--- /dev/null
+++ b/qemu/roms/openbios/fs/iso9660/iso9660_fs.h
@@ -0,0 +1,161 @@
+#ifndef _ISO9660_FS_H
+#define _ISO9660_FS_H
+
+/* this file has been copied from linux 2.6.26 */
+
+/*
+ * The isofs filesystem constants/structures
+ */
+
+/* This part borrowed from the bsd386 isofs */
+#define ISODCL(from, to) (to - from + 1)
+
+struct iso_volume_descriptor {
+	char type[ISODCL(1,1)]; /* 711 */
+	char id[ISODCL(2,6)];
+	char version[ISODCL(7,7)];
+	char data[ISODCL(8,2048)];
+};
+
+/* volume descriptor types */
+#define ISO_VD_PRIMARY 1
+#define ISO_VD_SUPPLEMENTARY 2
+#define ISO_VD_END 255
+
+#define ISO_STANDARD_ID "CD001"
+
+struct iso_primary_descriptor {
+	char type			[ISODCL (  1,   1)]; /* 711 */
+	char id				[ISODCL (  2,   6)];
+	char version			[ISODCL (  7,   7)]; /* 711 */
+	char unused1			[ISODCL (  8,   8)];
+	char system_id			[ISODCL (  9,  40)]; /* achars */
+	char volume_id			[ISODCL ( 41,  72)]; /* dchars */
+	char unused2			[ISODCL ( 73,  80)];
+	char volume_space_size		[ISODCL ( 81,  88)]; /* 733 */
+	char unused3			[ISODCL ( 89, 120)];
+	char volume_set_size		[ISODCL (121, 124)]; /* 723 */
+	char volume_sequence_number	[ISODCL (125, 128)]; /* 723 */
+	char logical_block_size		[ISODCL (129, 132)]; /* 723 */
+	char path_table_size		[ISODCL (133, 140)]; /* 733 */
+	char type_l_path_table		[ISODCL (141, 144)]; /* 731 */
+	char opt_type_l_path_table	[ISODCL (145, 148)]; /* 731 */
+	char type_m_path_table		[ISODCL (149, 152)]; /* 732 */
+	char opt_type_m_path_table	[ISODCL (153, 156)]; /* 732 */
+	char root_directory_record	[ISODCL (157, 190)]; /* 9.1 */
+	char volume_set_id		[ISODCL (191, 318)]; /* dchars */
+	char publisher_id		[ISODCL (319, 446)]; /* achars */
+	char preparer_id		[ISODCL (447, 574)]; /* achars */
+	char application_id		[ISODCL (575, 702)]; /* achars */
+	char copyright_file_id		[ISODCL (703, 739)]; /* 7.5 dchars */
+	char abstract_file_id		[ISODCL (740, 776)]; /* 7.5 dchars */
+	char bibliographic_file_id	[ISODCL (777, 813)]; /* 7.5 dchars */
+	char creation_date		[ISODCL (814, 830)]; /* 8.4.26.1 */
+	char modification_date		[ISODCL (831, 847)]; /* 8.4.26.1 */
+	char expiration_date		[ISODCL (848, 864)]; /* 8.4.26.1 */
+	char effective_date		[ISODCL (865, 881)]; /* 8.4.26.1 */
+	char file_structure_version	[ISODCL (882, 882)]; /* 711 */
+	char unused4			[ISODCL (883, 883)];
+	char application_data		[ISODCL (884, 1395)];
+	char unused5			[ISODCL (1396, 2048)];
+};
+
+/* Almost the same as the primary descriptor but two fields are specified */
+struct iso_supplementary_descriptor {
+	char type			[ISODCL (  1,   1)]; /* 711 */
+	char id				[ISODCL (  2,   6)];
+	char version			[ISODCL (  7,   7)]; /* 711 */
+	char flags			[ISODCL (  8,   8)]; /* 853 */
+	char system_id			[ISODCL (  9,  40)]; /* achars */
+	char volume_id			[ISODCL ( 41,  72)]; /* dchars */
+	char unused2			[ISODCL ( 73,  80)];
+	char volume_space_size		[ISODCL ( 81,  88)]; /* 733 */
+	char escape			[ISODCL ( 89, 120)]; /* 856 */
+	char volume_set_size		[ISODCL (121, 124)]; /* 723 */
+	char volume_sequence_number	[ISODCL (125, 128)]; /* 723 */
+	char logical_block_size		[ISODCL (129, 132)]; /* 723 */
+	char path_table_size		[ISODCL (133, 140)]; /* 733 */
+	char type_l_path_table		[ISODCL (141, 144)]; /* 731 */
+	char opt_type_l_path_table	[ISODCL (145, 148)]; /* 731 */
+	char type_m_path_table		[ISODCL (149, 152)]; /* 732 */
+	char opt_type_m_path_table	[ISODCL (153, 156)]; /* 732 */
+	char root_directory_record	[ISODCL (157, 190)]; /* 9.1 */
+	char volume_set_id		[ISODCL (191, 318)]; /* dchars */
+	char publisher_id		[ISODCL (319, 446)]; /* achars */
+	char preparer_id		[ISODCL (447, 574)]; /* achars */
+	char application_id		[ISODCL (575, 702)]; /* achars */
+	char copyright_file_id		[ISODCL (703, 739)]; /* 7.5 dchars */
+	char abstract_file_id		[ISODCL (740, 776)]; /* 7.5 dchars */
+	char bibliographic_file_id	[ISODCL (777, 813)]; /* 7.5 dchars */
+	char creation_date		[ISODCL (814, 830)]; /* 8.4.26.1 */
+	char modification_date		[ISODCL (831, 847)]; /* 8.4.26.1 */
+	char expiration_date		[ISODCL (848, 864)]; /* 8.4.26.1 */
+	char effective_date		[ISODCL (865, 881)]; /* 8.4.26.1 */
+	char file_structure_version	[ISODCL (882, 882)]; /* 711 */
+	char unused4			[ISODCL (883, 883)];
+	char application_data		[ISODCL (884, 1395)];
+	char unused5			[ISODCL (1396, 2048)];
+};
+
+
+#define HS_STANDARD_ID "CDROM"
+
+struct  hs_volume_descriptor {
+	char foo			[ISODCL (  1,   8)]; /* 733 */
+	char type			[ISODCL (  9,   9)]; /* 711 */
+	char id				[ISODCL ( 10,  14)];
+	char version			[ISODCL ( 15,  15)]; /* 711 */
+	char data[ISODCL(16,2048)];
+};
+
+
+struct hs_primary_descriptor {
+	char foo			[ISODCL (  1,   8)]; /* 733 */
+	char type			[ISODCL (  9,   9)]; /* 711 */
+	char id				[ISODCL ( 10,  14)];
+	char version			[ISODCL ( 15,  15)]; /* 711 */
+	char unused1			[ISODCL ( 16,  16)]; /* 711 */
+	char system_id			[ISODCL ( 17,  48)]; /* achars */
+	char volume_id			[ISODCL ( 49,  80)]; /* dchars */
+	char unused2			[ISODCL ( 81,  88)]; /* 733 */
+	char volume_space_size		[ISODCL ( 89,  96)]; /* 733 */
+	char unused3			[ISODCL ( 97, 128)]; /* 733 */
+	char volume_set_size		[ISODCL (129, 132)]; /* 723 */
+	char volume_sequence_number	[ISODCL (133, 136)]; /* 723 */
+	char logical_block_size		[ISODCL (137, 140)]; /* 723 */
+	char path_table_size		[ISODCL (141, 148)]; /* 733 */
+	char type_l_path_table		[ISODCL (149, 152)]; /* 731 */
+	char unused4			[ISODCL (153, 180)]; /* 733 */
+	char root_directory_record	[ISODCL (181, 214)]; /* 9.1 */
+};
+
+/* We use this to help us look up the parent inode numbers. */
+
+struct iso_path_table{
+	unsigned char  name_len[2];	/* 721 */
+	char extent[4];		/* 731 */
+	char  parent[2];	/* 721 */
+	char name[0];
+} __attribute__((packed));
+
+/* high sierra is identical to iso, except that the date is only 6 bytes, and
+   there is an extra reserved byte after the flags */
+
+struct iso_directory_record {
+	char length			[ISODCL (1, 1)]; /* 711 */
+	char ext_attr_length		[ISODCL (2, 2)]; /* 711 */
+	char extent			[ISODCL (3, 10)]; /* 733 */
+	char size			[ISODCL (11, 18)]; /* 733 */
+	char date			[ISODCL (19, 25)]; /* 7 by 711 */
+	char flags			[ISODCL (26, 26)];
+	char file_unit_size		[ISODCL (27, 27)]; /* 711 */
+	char interleave			[ISODCL (28, 28)]; /* 711 */
+	char volume_sequence_number	[ISODCL (29, 32)]; /* 723 */
+	unsigned char name_len		[ISODCL (33, 33)]; /* 711 */
+	char name			[0];
+} __attribute__((packed));
+
+#define ISOFS_BLOCK_BITS 11
+#define ISOFS_BLOCK_SIZE (1 << ISOFS_BLOCK_BITS)
+
+#endif /* _ISO9660_FS_H */
diff --git a/qemu/roms/openbios/fs/iso9660/iso9660_lseek.c b/qemu/roms/openbios/fs/iso9660/iso9660_lseek.c
new file mode 100644
index 000000000..62987583c
--- /dev/null
+++ b/qemu/roms/openbios/fs/iso9660/iso9660_lseek.c
@@ -0,0 +1,37 @@
+/*
+ *
+ * (c) 2005-2009 Laurent Vivier <Laurent@vivier.eu>
+ *
+ * This file has been copied from EMILE, http://emile.sf.net
+ *
+ */
+
+#include "libiso9660.h"
+
+int iso9660_lseek(iso9660_FILE *_file, long offset, int whence)
+{
+	iso9660_FILE *file = (iso9660_FILE*)_file;
+	long new_offset;
+
+	switch(whence)
+	{
+	case SEEK_SET:
+		new_offset = offset;
+		break;
+	case SEEK_CUR:
+		new_offset = file->offset + offset;
+		break;
+	case SEEK_END:
+		new_offset = file->size + offset;
+		break;
+	default:
+		return -1;
+	}
+
+	if ( (new_offset < 0) || (new_offset > file->size) )
+		return -1;
+
+	file->offset = new_offset;
+
+	return new_offset;
+}
diff --git a/qemu/roms/openbios/fs/iso9660/iso9660_mount.c b/qemu/roms/openbios/fs/iso9660/iso9660_mount.c
new file mode 100644
index 000000000..a58170408
--- /dev/null
+++ b/qemu/roms/openbios/fs/iso9660/iso9660_mount.c
@@ -0,0 +1,210 @@
+/*
+ *
+ * (c) 2005-2009 Laurent Vivier <Laurent@vivier.eu>
+ *
+ * This file has been copied from EMILE, http://emile.sf.net
+ *
+ * some parts from mkisofs (c) J. Schilling
+ *
+ */
+
+#include "libiso9660.h"
+#include "libopenbios/bindings.h"
+#include "libc/diskio.h"
+
+void iso9660_name(iso9660_VOLUME *volume, struct iso_directory_record *idr, char *buffer)
+{
+	int	j;
+        unsigned char ul, uc;
+
+	buffer[0] = 0;
+	if (idr->name_len[0] == 1 && idr->name[0] == 0)
+		strcpy(buffer, ".");
+	else if (idr->name_len[0] == 1 && idr->name[0] == 1)
+		strcpy(buffer, "..");
+	else {
+		switch (volume->ucs_level) {
+		case 3:
+		case 2:
+		case 1:
+			/*
+			 * Unicode name.
+			 */
+
+			for (j = 0; j < (int)idr->name_len[0] / 2; j++) {
+				ul = idr->name[j*2+1];
+
+				/*
+				 * unicode convertion
+				 * up = unls->unls_uni2cs[uh];
+				 *
+				 * if (up == NULL)
+				 *	uc = '\0';
+				 * else
+				 *	uc = up[ul];
+				 *
+				 * we use only low byte
+				 */
+
+				uc = ul;
+
+				buffer[j] = uc ? uc : '_';
+			}
+			buffer[idr->name_len[0]/2] = '\0';
+			break;
+		case 0:
+			/*
+			 * Normal non-Unicode name.
+			 */
+			strncpy(buffer, idr->name, idr->name_len[0]);
+			buffer[idr->name_len[0]] = 0;
+			break;
+		default:
+			/*
+			 * Don't know how to do these yet.  Maybe they are the same
+			 * as one of the above.
+			 */
+			break;
+		}
+	}
+}
+
+iso9660_VOLUME *iso9660_mount(int fd)
+{
+	iso9660_VOLUME* volume;
+	struct iso_primary_descriptor *jpd;
+	struct iso_primary_descriptor ipd;
+	int	block;
+	int ucs_level = 0;
+
+	/* read filesystem descriptor */
+
+	seek_io(fd, 16 * ISOFS_BLOCK_SIZE);
+	read_io(fd, &ipd, sizeof (ipd));
+
+	/*
+	 * High sierra:
+	 *
+	 *	DESC TYPE	== 1 (VD_SFS)	offset 8	len 1
+	 *	STR ID		== "CDROM"	offset 9	len 5
+	 *	STD_VER		== 1		offset 14	len 1
+	 */
+
+	/* High Sierra format ? */
+
+	if ((((char *)&ipd)[8] == 1) &&
+	    (strncmp(&((char *)&ipd)[9], "CDROM", 5) == 0) &&
+	    (((char *)&ipd)[14] == 1)) {
+		printk("Incompatible format: High Sierra format\n");
+		return NULL;
+	}
+
+	/*
+	 * ISO 9660:
+	 *
+	 *	DESC TYPE	== 1 (VD_PVD)	offset 0	len 1
+	 *	STR ID		== "CD001"	offset 1	len 5
+	 *	STD_VER		== 1		offset 6	len 1
+	 */
+
+	/* NOT ISO 9660 format ? */
+
+	if ((ipd.type[0] != ISO_VD_PRIMARY) ||
+	    (strncmp(ipd.id, ISO_STANDARD_ID, sizeof (ipd.id)) != 0) ||
+	    (ipd.version[0] != 1)) {
+		return NULL;
+	}
+
+	/* UCS info */
+
+	block = 16;
+
+	jpd = (struct iso_primary_descriptor *)
+		malloc(sizeof(struct iso_primary_descriptor));
+	if (jpd == NULL)
+		return NULL;
+
+	memcpy(jpd, &ipd, sizeof (ipd));
+	while ((uint8_t)jpd->type[0] != ISO_VD_END) {
+
+		/*
+		 * If Joliet UCS escape sequence found, we may be wrong
+		 */
+
+		if (jpd->unused3[0] == '%' &&
+		    jpd->unused3[1] == '/' &&
+		    (jpd->unused3[3] == '\0' ||
+		    jpd->unused3[3] == ' ') &&
+		    (jpd->unused3[2] == '@' ||
+		    jpd->unused3[2] == 'C' ||
+		    jpd->unused3[2] == 'E')) {
+
+			if (jpd->version[0] != 1)
+				break;
+		}
+
+		block++;
+		seek_io(fd, block * ISOFS_BLOCK_SIZE);
+		read_io(fd, jpd, sizeof (*jpd));
+	}
+
+	ucs_level = 0;
+	if (((unsigned char) jpd->type[0] == ISO_VD_END)) {
+		memcpy(jpd, &ipd, sizeof (ipd));
+	} else {
+		switch (jpd->unused3[2]) {
+		case '@':
+			ucs_level = 1;
+			break;
+		case 'C':
+			ucs_level = 2;
+			break;
+		case 'E':
+			ucs_level = 3;
+			break;
+		}
+
+		if (ucs_level && jpd->unused3[3] == ' ')
+			printk("Warning: Joliet escape sequence uses illegal space at offset 3\n");
+	}
+
+	volume = (iso9660_VOLUME*)malloc(sizeof(iso9660_VOLUME));
+	if (volume == NULL)
+		return NULL;
+
+	volume->descriptor = jpd;
+	volume->ucs_level = ucs_level;
+	volume->fd = fd;
+
+	return volume;
+}
+
+int iso9660_umount(iso9660_VOLUME* volume)
+{
+	if (volume == NULL)
+		return -1;
+	free(volume->descriptor);
+	free(volume);
+	return 0;
+}
+
+int iso9660_probe(int fd, long long offset)
+{
+	struct iso_primary_descriptor ipd;
+
+	seek_io(fd, 16 * ISOFS_BLOCK_SIZE + offset);
+	read_io(fd, &ipd, sizeof (ipd));
+
+	if ((ipd.type[0] != ISO_VD_PRIMARY) ||
+	    (strncmp(ipd.id, ISO_STANDARD_ID, sizeof (ipd.id)) != 0) ||
+	    (ipd.version[0] != 1)) {
+		return 0;
+	}
+
+	return -1;
+}
+
+struct iso_directory_record *iso9660_get_root_node(iso9660_VOLUME* volume)
+{
+	return (struct iso_directory_record *)volume->descriptor->root_directory_record;
+}
diff --git a/qemu/roms/openbios/fs/iso9660/iso9660_open.c b/qemu/roms/openbios/fs/iso9660/iso9660_open.c
new file mode 100644
index 000000000..77c271f0f
--- /dev/null
+++ b/qemu/roms/openbios/fs/iso9660/iso9660_open.c
@@ -0,0 +1,39 @@
+/*
+ *
+ * (c) 2005-2009 Laurent Vivier <Laurent@vivier.eu>
+ *
+ * This file has been copied from EMILE, http://emile.sf.net
+ *
+ */
+
+#include "libiso9660.h"
+
+iso9660_FILE* iso9660_open(iso9660_VOLUME *volume, const char* pathname)
+{
+	struct iso_directory_record *root;
+	struct iso_directory_record *idr;
+	iso9660_FILE *file;
+
+	root = iso9660_get_root_node(volume);
+	if (root == NULL)
+		return NULL;
+
+	idr = iso9660_get_node(volume, root, pathname);
+	if (idr == NULL)
+		return NULL;
+
+	file = (iso9660_FILE*)malloc(sizeof(iso9660_FILE));
+	if (file == NULL)
+		return NULL;
+
+	file->base = isonum_733((char *)idr->extent);
+	file->size = isonum_733((char *)idr->size);
+	file->offset = 0;
+	file->current = -1;
+	file->volume = volume;
+	file->path = strdup(pathname);
+
+	free(idr);
+
+	return file;
+}
diff --git a/qemu/roms/openbios/fs/iso9660/iso9660_opendir.c b/qemu/roms/openbios/fs/iso9660/iso9660_opendir.c
new file mode 100644
index 000000000..49eab4b42
--- /dev/null
+++ b/qemu/roms/openbios/fs/iso9660/iso9660_opendir.c
@@ -0,0 +1,133 @@
+/*
+ *
+ * (c) 2005-2009 Laurent Vivier <Laurent@vivier.eu>
+ *
+ * This file has been copied from EMILE, http://emile.sf.net
+ *
+ */
+
+#include "libiso9660.h"
+
+static inline int iso9660_is_directory(struct iso_directory_record * idr)
+{
+	return ((idr->flags[0] & 2) != 0);
+}
+
+static iso9660_DIR* iso9660_opendir_node(iso9660_VOLUME *volume, struct iso_directory_record *node)
+{
+	iso9660_DIR *dir;
+
+	dir = (iso9660_DIR*)malloc(sizeof(iso9660_DIR));
+	if (dir == NULL)
+		return NULL;
+
+	dir->extent = isonum_733((char *)node->extent);
+	dir->len = isonum_733((char *)node->size);
+	dir->index =  sizeof (dir->buffer);
+	dir->volume = volume;
+
+	return dir;
+}
+
+static struct iso_directory_record* idr_new(struct iso_directory_record* idr)
+{
+	struct iso_directory_record* result;
+	int size = sizeof(*idr) + (int)idr->name_len[0];
+
+	result = (struct iso_directory_record*)malloc(size);
+	memcpy(result, idr, size);
+
+	return result;
+}
+
+static struct iso_directory_record * seek_name(iso9660_VOLUME *volume,
+					       struct iso_directory_record *idr,
+					       char *name)
+{
+	struct iso_directory_record *result;
+	char name_buf[256];
+	iso9660_DIR *dir;
+
+	dir = iso9660_opendir_node(volume, idr);
+	if (dir == NULL)
+		return NULL;
+
+	while ((idr = iso9660_readdir(dir)) != NULL)
+	{
+		iso9660_name(volume, idr, name_buf);
+		if (strcasecmp(name, name_buf) == 0)
+		{
+			result = idr_new(idr);
+			iso9660_closedir(dir);
+			return result;
+		}
+	}
+	iso9660_closedir(dir);
+	return NULL;
+}
+
+struct iso_directory_record* iso9660_get_node(
+		iso9660_VOLUME *volume,
+		struct iso_directory_record *dirnode,
+		const char *path)
+{
+	struct iso_directory_record* result;
+	struct iso_directory_record* current;
+	char name[256];
+	int i;
+
+	current = idr_new(dirnode);
+	while(1)
+	{
+		/* ignore head '\' */
+
+		while (*path && *path == '\\')
+			path++;
+
+		if (*path == 0)
+			break;
+
+		/* extract first path component */
+
+		i = 0;
+		while (*path && *path != '\\')
+			name[i++] = *path++;
+		name[i] = 0;
+
+		/* seek first component in current directory */
+
+		result = seek_name(volume, current, name);
+		if (result == NULL)
+			return NULL;
+
+		free(current);
+		current = result;
+	}
+	return current;
+}
+
+iso9660_DIR* iso9660_opendir(iso9660_VOLUME *volume, const char *name)
+{
+	iso9660_DIR *dir;
+	struct iso_directory_record *node;
+
+	node = iso9660_get_root_node((iso9660_VOLUME*)volume);
+	if (node == NULL)
+		return NULL;
+
+	node = iso9660_get_node((iso9660_VOLUME*)volume, node, name);
+	if (node == NULL)
+		return NULL;
+	if (!iso9660_is_directory(node)) {
+		free(node);
+		return NULL;
+	}
+
+	dir = iso9660_opendir_node((iso9660_VOLUME*)volume, node);
+
+	free(node);
+
+	dir->volume = (iso9660_VOLUME*)volume;
+
+	return dir;
+}
diff --git a/qemu/roms/openbios/fs/iso9660/iso9660_read.c b/qemu/roms/openbios/fs/iso9660/iso9660_read.c
new file mode 100644
index 000000000..22cc463f0
--- /dev/null
+++ b/qemu/roms/openbios/fs/iso9660/iso9660_read.c
@@ -0,0 +1,74 @@
+/*
+ *
+ * (c) 2005-2009 Laurent Vivier <Laurent@vivier.eu>
+ *
+ * This file has been copied from EMILE, http://emile.sf.net
+ *
+ */
+
+#include "libiso9660.h"
+#include "libopenbios/bindings.h"
+#include "libc/diskio.h"
+
+size_t iso9660_read(iso9660_FILE *_file, char *buf, size_t count)
+{
+	iso9660_FILE *file = (iso9660_FILE*)_file;
+	size_t read = 0;
+
+	if ( count > (file->size  - file->offset) )
+		count = file->size  - file->offset;
+
+	while (count > 0)
+	{
+		size_t part;
+		int offset_extent;
+		int offset_index;
+
+		offset_extent = file->base +
+				    (file->offset / ISOFS_BLOCK_SIZE);
+		offset_index = file->offset % ISOFS_BLOCK_SIZE;
+
+		if (file->current != offset_extent)
+		{
+			if ( (offset_index == 0) &&
+			     (count >= ISOFS_BLOCK_SIZE) )
+			{
+				/* direct i/o */
+
+				int extents_nb;
+
+				extents_nb = count / ISOFS_BLOCK_SIZE;
+
+				part = extents_nb * ISOFS_BLOCK_SIZE;
+
+				seek_io(file->volume->fd,
+					offset_extent * ISOFS_BLOCK_SIZE);
+				read_io(file->volume->fd, buf + read, part);
+
+				file->offset += part;
+				count -= part;
+				read += part;
+
+				continue;
+			}
+
+			file->current = offset_extent;
+			seek_io(file->volume->fd,
+				offset_extent * ISOFS_BLOCK_SIZE);
+			read_io(file->volume->fd, file->buffer,
+				ISOFS_BLOCK_SIZE);
+		}
+
+		part = ISOFS_BLOCK_SIZE - offset_index;
+		if (count < part)
+			part = count;
+
+		memcpy(buf + read, file->buffer + offset_index, part);
+
+		file->offset += part;
+		count -= part;
+		read += part;
+	}
+
+	return read;
+}
diff --git a/qemu/roms/openbios/fs/iso9660/iso9660_readdir.c b/qemu/roms/openbios/fs/iso9660/iso9660_readdir.c
new file mode 100644
index 000000000..003ffb20f
--- /dev/null
+++ b/qemu/roms/openbios/fs/iso9660/iso9660_readdir.c
@@ -0,0 +1,50 @@
+/*
+ *
+ * (c) 2005-2009 Laurent Vivier <Laurent@vivier.eu>
+ *
+ * This file has been copied from EMILE, http://emile.sf.net
+ *
+ */
+
+#include "libiso9660.h"
+#include "libopenbios/bindings.h"
+#include "libc/diskio.h"
+
+#define offsetof(t,m)	((long)&(((t *)0)->m))
+
+static void read_extent(iso9660_DIR *dir)
+{
+	seek_io(dir->volume->fd, dir->extent * ISOFS_BLOCK_SIZE);
+	read_io(dir->volume->fd, dir->buffer, ISOFS_BLOCK_SIZE);
+
+	dir->len -= ISOFS_BLOCK_SIZE;
+	dir->extent ++;
+	dir->index = 0;
+}
+
+struct iso_directory_record *iso9660_readdir(iso9660_DIR *dir)
+{
+	struct iso_directory_record *idr;
+
+	if (dir->index >
+	    ISOFS_BLOCK_SIZE - offsetof(struct iso_directory_record, name[0]))
+	{
+		if (dir->len <= 0)
+			return NULL;
+
+		read_extent(dir);
+	}
+
+	idr = (struct iso_directory_record *) &dir->buffer[dir->index];
+	if (idr->length[0] == 0)  {
+		if (dir->len <= 0)
+			return NULL;
+
+		read_extent(dir);
+		idr = (struct iso_directory_record *) &dir->buffer[dir->index];
+	}
+
+	dir->index += dir->buffer[dir->index];
+
+	return idr;
+}
diff --git a/qemu/roms/openbios/fs/iso9660/libiso9660.h b/qemu/roms/openbios/fs/iso9660/libiso9660.h
new file mode 100644
index 000000000..8a5b4801f
--- /dev/null
+++ b/qemu/roms/openbios/fs/iso9660/libiso9660.h
@@ -0,0 +1,27 @@
+/*
+ *
+ * (c) 2005-2009 Laurent Vivier <Laurent@vivier.eu>
+ *
+ * This file has been copied from EMILE, http://emile.sf.net
+ *
+ */
+
+#ifndef __LIBISO9660_H__
+#define __LIBISO9660_H__
+
+#include "config.h"
+#include "iso9660.h"
+
+extern iso9660_VOLUME* iso9660_mount(int fd);
+extern int iso9660_umount(iso9660_VOLUME *volume);
+extern int iso9660_probe(int fd, long long offs);
+extern iso9660_DIR* iso9660_opendir(iso9660_VOLUME *, const char *name);
+extern iso9660_FILE* iso9660_open(iso9660_VOLUME *, const char *pathname);
+extern int iso9660_closedir(iso9660_DIR *dir);
+extern struct iso_directory_record *iso9660_readdir(iso9660_DIR *dir);
+extern size_t iso9660_read(iso9660_FILE *file, char *buf, size_t count);
+extern void iso9660_close(iso9660_FILE *file);
+extern int iso9660_lseek(iso9660_FILE *file, long offset, int whence);
+extern void iso9660_name(iso9660_VOLUME *volume, struct iso_directory_record * idr, char *buffer);
+
+#endif /* __LIBISO9660_H__ */