Module Name: src
Committed By: nakayama
Date: Fri Aug 14 02:28:18 UTC 2015
Modified Files:
src/sys/arch/sparc64/sparc64: autoconf.c
Log Message:
Detect a boot device more precisely on QEMU by checking the device
name.
To generate a diff of this commit:
cvs rdiff -u -r1.203 -r1.204 src/sys/arch/sparc64/sparc64/autoconf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc64/sparc64/autoconf.c
diff -u src/sys/arch/sparc64/sparc64/autoconf.c:1.203 src/sys/arch/sparc64/sparc64/autoconf.c:1.204
--- src/sys/arch/sparc64/sparc64/autoconf.c:1.203 Sun Jun 14 19:05:27 2015
+++ src/sys/arch/sparc64/sparc64/autoconf.c Fri Aug 14 02:28:18 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.203 2015/06/14 19:05:27 martin Exp $ */
+/* $NetBSD: autoconf.c,v 1.204 2015/08/14 02:28:18 nakayama Exp $ */
/*
* Copyright (c) 1996
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.203 2015/06/14 19:05:27 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.204 2015/08/14 02:28:18 nakayama Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -843,7 +843,8 @@ dev_path_drive_match(device_t dev, int c
snprintf(buf, sizeof(buf), "%s@w%016" PRIx64 ",%d",
name, wwn, lun);
else if (ide_node)
- snprintf(buf, sizeof(buf), "%s@0", name);
+ snprintf(buf, sizeof(buf), "%s@0",
+ device_is_a(dev, "cd") ? "cdrom" : "disk");
else
snprintf(buf, sizeof(buf), "%s@%d,%d",
name, target, lun);
