Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 26 Jan 2023 19:28:34 GMT
From:      John Baldwin <jhb@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 2d0d8aa835d5 - stable/13 - vmm: fix "set but not used" warnings
Message-ID:  <202301261928.30QJSY9U078657@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by jhb:

URL: https://cgit.FreeBSD.org/src/commit/?id=2d0d8aa835d55516103dc03de9f8009b3f3ee8bf

commit 2d0d8aa835d55516103dc03de9f8009b3f3ee8bf
Author:     Robert Wing <rew@FreeBSD.org>
AuthorDate: 2022-02-28 23:46:08 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
CommitDate: 2023-01-26 19:26:08 +0000

    vmm: fix "set but not used" warnings
    
    (cherry picked from commit 73505a10760c8b6f459b9c790bbf3a365f990a0b)
---
 sys/amd64/vmm/vmm.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c
index 06ec385ba25d..90edfbe7673c 100644
--- a/sys/amd64/vmm/vmm.c
+++ b/sys/amd64/vmm/vmm.c
@@ -864,7 +864,7 @@ static void
 vm_free_memmap(struct vm *vm, int ident)
 {
 	struct mem_map *mm;
-	int error;
+	int error __diagused;
 
 	mm = &vm->mem_maps[ident];
 	if (mm->len) {
@@ -1848,7 +1848,7 @@ vm_restart_instruction(void *arg, int vcpuid)
 	struct vcpu *vcpu;
 	enum vcpu_state state;
 	uint64_t rip;
-	int error;
+	int error __diagused;
 
 	vm = arg;
 	if (vcpuid < 0 || vcpuid >= vm->maxcpus)
@@ -2087,7 +2087,7 @@ vm_inject_exception(struct vm *vm, int vcpuid, int vector, int errcode_valid,
 {
 	struct vcpu *vcpu;
 	uint64_t regval;
-	int error;
+	int error __diagused;
 
 	if (vcpuid < 0 || vcpuid >= vm->maxcpus)
 		return (EINVAL);
@@ -2147,7 +2147,7 @@ vm_inject_fault(void *vmarg, int vcpuid, int vector, int errcode_valid,
     int errcode)
 {
 	struct vm *vm;
-	int error, restart_instruction;
+	int error __diagused, restart_instruction;
 
 	vm = vmarg;
 	restart_instruction = 1;
@@ -2161,7 +2161,7 @@ void
 vm_inject_pf(void *vmarg, int vcpuid, int error_code, uint64_t cr2)
 {
 	struct vm *vm;
-	int error;
+	int error __diagused;
 
 	vm = vmarg;
 	VCPU_CTR2(vm, vcpuid, "Injecting page fault: error_code %#x, cr2 %#lx",



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202301261928.30QJSY9U078657>