diff options
| author | John Sonnenschein <johns@joyent.com> | 2012-05-17 18:26:57 +0000 |
|---|---|---|
| committer | John Sonnenschein <johns@joyent.com> | 2012-05-17 18:26:57 +0000 |
| commit | 04b244dd661c24b510ac22936decfc0972d202d3 (patch) | |
| tree | 3ebfef98afc303fddf3415d6fba64e8682f495e8 /usr/src/uts/i86xpv/os/xpv_panic.c | |
| parent | eac250589e41f1b705e1b7427b02b3379aac9f9e (diff) | |
| parent | a69187741b83640a90dd8586195456dd50c016a8 (diff) | |
| download | illumos-joyent-20120517.tar.gz | |
Merge git.joyent.com:illumos-joyent20120517
Diffstat (limited to 'usr/src/uts/i86xpv/os/xpv_panic.c')
| -rw-r--r-- | usr/src/uts/i86xpv/os/xpv_panic.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/usr/src/uts/i86xpv/os/xpv_panic.c b/usr/src/uts/i86xpv/os/xpv_panic.c index 132b9fb724..336fa406c3 100644 --- a/usr/src/uts/i86xpv/os/xpv_panic.c +++ b/usr/src/uts/i86xpv/os/xpv_panic.c @@ -19,6 +19,8 @@ * CDDL HEADER END */ /* + * Copyright (c) 2012 Gary Mills + * * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. */ @@ -121,7 +123,7 @@ xpv_panic_putc(int m) struct cons_polledio *c = cons_polledio; /* This really shouldn't happen */ - if (console == CONS_HYPERVISOR) + if (boot_console_type(NULL) == CONS_HYPERVISOR) return; if (use_polledio == B_TRUE) @@ -700,7 +702,7 @@ xpv_do_panic(void *arg) * to stop. */ use_polledio = B_FALSE; - if (console == CONS_HYPERVISOR) { + if (boot_console_type(NULL) == CONS_HYPERVISOR) { bcons_device_change(CONS_HYPERVISOR); } else if (cons_polledio != NULL && cons_polledio->cons_polledio_putchar != NULL) { |