1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8303575: adjust Xen handling on Linux aarch64

Browse Source 
Reviewed-by: lucy, mdoerr
This commit is contained in:
Matthias Baesken 2023-03-08 11:38:37 +00:00
parent d988252378
commit 8eaf84f094
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/hotspot/cpu/aarch64/vm_version_aarch64.cpp
View File

@ -609,18 +609,20 @@ void VM_Version::check_virtualizations() {
if (check_info_file(pname_file, "KVM", KVM, "VMWare", VMWare)) { if (check_info_file(pname_file, "KVM", KVM, "VMWare", VMWare)) {
return; return;
} }
check_info_file(tname_file, "Xen", XenHVM, NULL, NoDetectedVirtualization); check_info_file(tname_file, "Xen", XenPVHVM, NULL, NoDetectedVirtualization);
#endif #endif
} }
void VM_Version::print_platform_virtualization_info(outputStream* st) { void VM_Version::print_platform_virtualization_info(outputStream* st) {
#if defined(LINUX) #if defined(LINUX)
VirtualizationType vrt = VM_Version::get_detected_virtualization(); VirtualizationType vrt = VM_Version::get_detected_virtualization();
if (vrt == KVM) { if (vrt == KVM) {
st->print_cr("KVM virtualization detected"); st->print_cr("KVM virtualization detected");
} else if (vrt == VMWare) { } else if (vrt == VMWare) {
st->print_cr("VMWare virtualization detected"); st->print_cr("VMWare virtualization detected");
} } else if (vrt == XenPVHVM) {
st->print_cr("Xen virtualization detected");
}
#endif #endif
} }

4
src/hotspot/share/jfr/periodic/jfrOSInterface.cpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -253,6 +253,8 @@ const char* JfrOSInterface::virtualization_name() {
VirtualizationType vrt = VM_Version::get_detected_virtualization(); VirtualizationType vrt = VM_Version::get_detected_virtualization();
if (vrt == XenHVM) { if (vrt == XenHVM) {
return "Xen hardware-assisted virtualization"; return "Xen hardware-assisted virtualization";
} else if (vrt == XenPVHVM) {
return "Xen optimized paravirtualization";
} else if (vrt == KVM) { } else if (vrt == KVM) {
return "KVM virtualization"; return "KVM virtualization";
} else if (vrt == VMWare) { } else if (vrt == VMWare) {

1
src/hotspot/share/runtime/abstract_vm_version.hpp
View File

@ -31,6 +31,7 @@
typedef enum { typedef enum {
NoDetectedVirtualization, NoDetectedVirtualization,
XenHVM, XenHVM,
XenPVHVM, // mix-mode on Linux aarch64
KVM, KVM,
VMWare, VMWare,
HyperV, HyperV,