diff options
| author | jmcneill <jmcneill@NetBSD.org> | 2012-01-07 18:10:18 +0000 |
|---|---|---|
| committer | jmcneill <jmcneill@NetBSD.org> | 2012-01-07 18:10:18 +0000 |
| commit | da8ea81d1f3ad880cc8b8de2e0d2a66f6e86a4aa (patch) | |
| tree | a5419bedd758980a8dd0fde6678ceac3444ac677 /sys/arch/usermode/dev | |
| parent | db363170c8d2fcea57dffbf76ed64c7771af0969 (diff) | |
support multiple disk images (pass multiple disk=<path> parameters on the
command-line). while changing command-line params, rename tap= option to
net=
Diffstat (limited to 'sys/arch/usermode/dev')
| -rw-r--r-- | sys/arch/usermode/dev/mainbus.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sys/arch/usermode/dev/mainbus.c b/sys/arch/usermode/dev/mainbus.c index 7d994a08188..7b5d8d88334 100644 --- a/sys/arch/usermode/dev/mainbus.c +++ b/sys/arch/usermode/dev/mainbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: mainbus.c,v 1.8 2011/12/29 21:22:49 jmcneill Exp $ */ +/* $NetBSD: mainbus.c,v 1.9 2012/01/07 18:10:18 jmcneill Exp $ */ /*- * Copyright (c) 2007 Jared D. McNeill <jmcneill@invisible.ca> @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.8 2011/12/29 21:22:49 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.9 2012/01/07 18:10:18 jmcneill Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -50,7 +50,8 @@ typedef struct mainbus_softc { CFATTACH_DECL_NEW(mainbus, sizeof(mainbus_softc_t), mainbus_match, mainbus_attach, NULL, NULL); -extern char *usermode_root_image_path; +extern char *usermode_disk_image_path[]; +extern int usermode_disk_image_path_count; extern char *usermode_tap_device; extern char *usermode_tap_eaddr; extern char *usermode_audio_device; @@ -68,6 +69,7 @@ mainbus_attach(device_t parent, device_t self, void *opaque) { mainbus_softc_t *sc = device_private(self); struct thunkbus_attach_args taa; + int i; aprint_naive("\n"); aprint_normal("\n"); @@ -104,9 +106,9 @@ mainbus_attach(device_t parent, device_t self, void *opaque) config_found_ia(self, "thunkbus", &taa, mainbus_print); } - if (usermode_root_image_path) { + for (i = 0; i < usermode_disk_image_path_count; i++) { taa.taa_type = THUNKBUS_TYPE_DISKIMAGE; - taa.u.diskimage.path = usermode_root_image_path; + taa.u.diskimage.path = usermode_disk_image_path[i]; config_found_ia(self, "thunkbus", &taa, mainbus_print); } } |
