--- old/src/hotspot/share/runtime/vm_version.cpp 2019-04-10 18:51:02.596333700 -0400 +++ new/src/hotspot/share/runtime/vm_version.cpp 2019-04-10 18:51:01.674241500 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -44,8 +44,6 @@ unsigned int Abstract_VM_Version::_logical_processors_per_package = 1U; unsigned int Abstract_VM_Version::_L1_data_cache_line_size = 0; -VirtualizationType Abstract_VM_Version::_detected_virtualization = NoDetectedVirtualization; - #ifndef HOTSPOT_VERSION_STRING #error HOTSPOT_VERSION_STRING must be defined #endif @@ -297,6 +295,7 @@ (Abstract_VM_Version::vm_build_number() & 0xFF); } + void VM_Version_init() { VM_Version::initialize(); @@ -307,27 +306,3 @@ os::print_cpu_info(&ls, buf, sizeof(buf)); } } - -bool Abstract_VM_Version::print_matching_lines_from_file(const char* filename, outputStream* st, const char* keywords_to_match[]) { - char line[500]; - FILE* fp = fopen(filename, "r"); - if (fp == NULL) { - return false; - } - - st->print_cr("Virtualization information:"); - while (fgets(line, sizeof(line), fp) != NULL) { - int i = 0; - while (keywords_to_match[i] != NULL) { - if (strncmp(line, keywords_to_match[i], strlen(keywords_to_match[i])) == 0) { - st->print("%s", line); - break; - } - i++; - } - } - fclose(fp); - return true; -} - -