sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2025-12-27 10:02:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

[netdevice] Kill off the various guess_boot_netdev() functions

Browse Source 
Remove the assortment of miscellaneous hacks to guess the "network
boot device", and replace them each with a call to last_opened_netdev().

It still isn't guaranteed correct, but it won't be any worse than
before, and it will at least be consistent.
This commit is contained in:
Michael Brown
2008-11-21 20:34:42 +00:00
parent 02a0215873
commit e78bcb6175
4 changed files with 5 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/arch/i386/interface/pcbios/aoeboot.c
View File

@@ -10,23 +10,6 @@
#include <gpxe/abft.h>
#include <int13.h>
/**
* Guess boot network device
*
* @ret netdev Boot network device
*/
static struct net_device * guess_boot_netdev ( void ) {
struct net_device *netdev;
/* Just use the first network device */
for_each_netdev ( netdev ) {
if ( netdev->state & NETDEV_OPEN )
return netdev;
}
return NULL;
}
static int aoeboot ( const char *root_path ) {
struct ata_device ata;
struct int13_drive drive;
@@ -38,7 +21,7 @@ static int aoeboot ( const char *root_path ) {
printf ( "AoE booting from %s\n", root_path );
/* FIXME: ugly, ugly hack */
struct net_device *netdev = guess_boot_netdev();
struct net_device *netdev = last_opened_netdev();
if ( ( rc = aoe_attach ( &ata, netdev, root_path ) ) != 0 ) {
printf ( "Could not attach AoE device: %s\n",

19
src/arch/i386/interface/pcbios/iscsiboot.c
View File

@@ -20,23 +20,6 @@ struct setting keep_san_setting __setting = {
.type = &setting_type_int8,
};
/**
* Guess boot network device
*
* @ret netdev Boot network device
*/
static struct net_device * guess_boot_netdev ( void ) {
struct net_device *netdev;
/* Just use the first network device */
for_each_netdev ( netdev ) {
if ( netdev->state & NETDEV_OPEN )
return netdev;
}
return NULL;
}
static int iscsiboot ( const char *root_path ) {
struct scsi_device *scsi;
struct int13_drive *drive;
@@ -70,7 +53,7 @@ static int iscsiboot ( const char *root_path ) {
drive->blockdev = &scsi->blockdev;
/* FIXME: ugly, ugly hack */
struct net_device *netdev = guess_boot_netdev();
struct net_device *netdev = last_opened_netdev();
struct iscsi_session *iscsi =
container_of ( scsi->backend, struct iscsi_session, refcnt );
ibft_fill_data ( netdev, iscsi );