# HG changeset patch
# User mikael
# Date 1338952916 -7200
# Node ID 6882e094a6b50ae7de7d8ac14e2f2eb1036e09f0
# Parent  c0a91066589556e12248cc6c4d6e24f8380796e2
7170275: os::print_os_info needs to know about Windows 8
Summary: Recognize Windows 8 and Windows Server 2012
Reviewed-by: sla, kvn, azeemj

diff -r c0a910665895 -r 6882e094a6b5 hotspot/src/os/windows/vm/os_windows.cpp
--- a/hotspot/src/os/windows/vm/os_windows.cpp	Tue Jun 05 06:48:00 2012 -0700
+++ b/hotspot/src/os/windows/vm/os_windows.cpp	Wed Jun 06 05:21:56 2012 +0200
@@ -1591,7 +1591,8 @@
     case 5001: st->print(" Windows XP"); break;
     case 5002:
     case 6000:
-    case 6001: {
+    case 6001:
+    case 6002: {
       // Retrieve SYSTEM_INFO from GetNativeSystemInfo call so that we could
       // find out whether we are running on 64 bit processor or not.
       SYSTEM_INFO si;
@@ -1623,6 +1624,14 @@
         }
         if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
             st->print(" , 64 bit");
+      } else if (os_vers == 6002) {
+        if (osvi.wProductType == VER_NT_WORKSTATION) {
+            st->print(" Windows 8");
+        } else {
+            st->print(" Windows Server 2012");
+        }
+        if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
+            st->print(" , 64 bit");
       } else { // future os
         // Unrecognized windows, print out its major and minor versions
         st->print(" Windows NT %d.%d", osvi.dwMajorVersion, osvi.dwMinorVersion);