aboutsummaryrefslogtreecommitdiff
path: root/vl.c
diff options
context:
space:
mode:
authorblueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>2008-08-12 15:58:35 +0000
committerblueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>2008-08-12 15:58:35 +0000
commitf88e4b91bea91beaa4f9dde28ccb4aa973c1dd4e (patch)
tree219debe4801304a5d9d706ddeac6a83f2ac6ad3c /vl.c
parent66de733bdb37a7542e5313c18f44d99d5faf6cb7 (diff)
Allow boot without a drive on Sparc machines (partly extracted from Xen)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4997 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'vl.c')
-rw-r--r--vl.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/vl.c b/vl.c
index e42ae6442d..6ade2ad165 100644
--- a/vl.c
+++ b/vl.c
@@ -8879,9 +8879,8 @@ int main(int argc, char **argv)
linux_boot = (kernel_filename != NULL);
net_boot = (boot_devices_bitmap >> ('n' - 'a')) & 0xF;
- /* XXX: this should not be: some embedded targets just have flash */
if (!linux_boot && net_boot == 0 &&
- nb_drives_opt == 0)
+ !machine->nodisk_ok && nb_drives_opt == 0)
help(1);
if (!linux_boot && *kernel_cmdline != '\0') {