From 3bc30e2963f5dc551383777ca0086937c632b21d Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Tue, 14 Sep 2021 19:32:22 +0200 Subject: sys/linux: fix KVM defines We don't support # comments at the end of defines. This never worked and .const file wasn't even re-generated (otherwise it would contain ???). --- sys/linux/dev_kvm.txt | 15 ++++++++++----- sys/linux/dev_kvm.txt.const | 5 +++++ 2 files changed, 15 insertions(+), 5 deletions(-) (limited to 'sys/linux') diff --git a/sys/linux/dev_kvm.txt b/sys/linux/dev_kvm.txt index 713c6cb40..9026bdd82 100644 --- a/sys/linux/dev_kvm.txt +++ b/sys/linux/dev_kvm.txt @@ -301,11 +301,16 @@ define KVM_SETUP_VM (1<<6) kvm_setup_flags_ppc64 = KVM_SETUP_PPC64_LE, KVM_SETUP_PPC64_IR, KVM_SETUP_PPC64_DR, KVM_SETUP_PPC64_PR, KVM_SETUP_PPC64_PID1 -define KVM_SETUP_PPC64_LE (1<<0) # Little endian -define KVM_SETUP_PPC64_IR (1<<1) # Paging for instructions -define KVM_SETUP_PPC64_DR (1<<2) # Paging for data -define KVM_SETUP_PPC64_PR (1<<3) # Run with MSR_PR (==usermode) -define KVM_SETUP_PPC64_PID1 (1<<4) # Set PID=1 i.e. not kernel's PID +# Little endian +define KVM_SETUP_PPC64_LE (1<<0) +# Paging for instructions +define KVM_SETUP_PPC64_IR (1<<1) +# Paging for data +define KVM_SETUP_PPC64_DR (1<<2) +# Run with MSR_PR (==usermode) +define KVM_SETUP_PPC64_PR (1<<3) +# Set PID=1 i.e. not kernel's PID +define KVM_SETUP_PPC64_PID1 (1<<4) kvm_guest_debug { ctrl flags[kvm_guest_debug_flags, int32] diff --git a/sys/linux/dev_kvm.txt.const b/sys/linux/dev_kvm.txt.const index 7ff6e6921..1615d022d 100644 --- a/sys/linux/dev_kvm.txt.const +++ b/sys/linux/dev_kvm.txt.const @@ -129,6 +129,11 @@ KVM_S390_VCPU_FAULT = 1074310738, 386:1074048594, arm:riscv64:???, mips64le:ppc6 KVM_SETUP_CPL3 = 8, arm:riscv64:??? KVM_SETUP_PAE = 2, arm:riscv64:??? KVM_SETUP_PAGING = 1, arm:riscv64:??? +KVM_SETUP_PPC64_DR = 4, arm:riscv64:??? +KVM_SETUP_PPC64_IR = 2, arm:riscv64:??? +KVM_SETUP_PPC64_LE = 1, arm:riscv64:??? +KVM_SETUP_PPC64_PID1 = 16, arm:riscv64:??? +KVM_SETUP_PPC64_PR = 8, arm:riscv64:??? KVM_SETUP_PROTECTED = 4, arm:riscv64:??? KVM_SETUP_SMM = 32, arm:riscv64:??? KVM_SETUP_VIRT86 = 16, arm:riscv64:??? -- cgit mrf-deployment