[src/netbsd-6]: src/sys/arch/xen/xen Pull up following revision(s) (requested...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6592f1847ceb
branches:  netbsd-6
changeset: 774014:6592f1847ceb
user:      snj <snj%NetBSD.org@localhost>
date:      Wed Apr 18 19:53:28 2012 +0000

description:
Pull up following revision(s) (requested by riz in ticket #184):
        sys/arch/xen/xen/hypervisor.c: revision 1.62
Retrive and print the hypervisor "extra" (teeny) version.
>From Manuel Bouyer.

diffstat:

 sys/arch/xen/xen/hypervisor.c |  11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r a47888934799 -r 6592f1847ceb sys/arch/xen/xen/hypervisor.c
--- a/sys/arch/xen/xen/hypervisor.c     Mon Apr 16 15:37:49 2012 +0000
+++ b/sys/arch/xen/xen/hypervisor.c     Wed Apr 18 19:53:28 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: hypervisor.c,v 1.60.2.1 2012/02/22 18:48:45 riz Exp $ */
+/* $NetBSD: hypervisor.c,v 1.60.2.2 2012/04/18 19:53:28 snj Exp $ */
 
 /*
  * Copyright (c) 2005 Manuel Bouyer.
@@ -53,7 +53,7 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hypervisor.c,v 1.60.2.1 2012/02/22 18:48:45 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hypervisor.c,v 1.60.2.2 2012/04/18 19:53:28 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -210,12 +210,15 @@
 #endif
 #endif /* NPCI */
        union hypervisor_attach_cookie hac;
+       char xen_extra_version[XEN_EXTRAVERSION_LEN];
 
        xenkernfs_init();
 
        xen_version = HYPERVISOR_xen_version(XENVER_version, NULL);
-       aprint_normal(": Xen version %d.%d\n", XEN_MAJOR(xen_version),
-              XEN_MINOR(xen_version));
+       memset(xen_extra_version, 0, sizeof(xen_extra_version));
+       HYPERVISOR_xen_version(XENVER_extraversion, xen_extra_version);
+       aprint_normal(": Xen version %d.%d%s\n", XEN_MAJOR(xen_version),
+               XEN_MINOR(xen_version), xen_extra_version);
 
        xengnt_init();
        events_init();