From 916b154777c03001385d7553acc2d6430fb1a919 Mon Sep 17 00:00:00 2001 From: rin Date: Wed, 23 Aug 2023 14:00:11 +0000 Subject: [PATCH] libkvm: whitespace --- lib/libkvm/kvm.c | 12 ++++++------ lib/libkvm/kvm_aarch64.c | 14 +++++++------- lib/libkvm/kvm_alpha.c | 12 ++++++------ lib/libkvm/kvm_i386pae.c | 6 +++--- lib/libkvm/kvm_or1k.c | 6 +++--- lib/libkvm/kvm_powerpc.c | 6 +++--- lib/libkvm/kvm_powerpc64.c | 6 +++--- lib/libkvm/kvm_riscv.c | 6 +++--- lib/libkvm/kvm_sparc64.c | 18 +++++++++--------- 9 files changed, 43 insertions(+), 43 deletions(-) diff --git a/lib/libkvm/kvm.c b/lib/libkvm/kvm.c index 259e1657b4fd..56a0d9f86bdb 100644 --- a/lib/libkvm/kvm.c +++ b/lib/libkvm/kvm.c @@ -1,4 +1,4 @@ -/* $NetBSD: kvm.c,v 1.110 2022/01/10 19:51:30 christos Exp $ */ +/* $NetBSD: kvm.c,v 1.111 2023/08/23 14:00:11 rin Exp $ */ /*- * Copyright (c) 1989, 1992, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)kvm.c 8.2 (Berkeley) 2/13/94"; #else -__RCSID("$NetBSD: kvm.c,v 1.110 2022/01/10 19:51:30 christos Exp $"); +__RCSID("$NetBSD: kvm.c,v 1.111 2023/08/23 14:00:11 rin Exp $"); #endif #endif /* LIBC_SCCS and not lint */ @@ -187,9 +187,9 @@ _kvm_pread(kvm_t *kd, int fd, void *buf, size_t size, off_t off) } /* If aligned nothing to do. */ - if (((off % kd->fdalign) | (size % kd->fdalign)) == 0) { + if (((off % kd->fdalign) | (size % kd->fdalign)) == 0) { return pread(fd, buf, size, off); - } + } /* * Otherwise must buffer. We can't tolerate short reads in this @@ -397,7 +397,7 @@ _kvm_open(kvm_t *kd, const char *uf, const char *mf, const char *sf, int flag, goto failed; } kd->dump_size = (size_t)st.st_size; - kd->dump_mem = mmap(NULL, kd->dump_size, PROT_READ|PROT_WRITE, + kd->dump_mem = mmap(NULL, kd->dump_size, PROT_READ|PROT_WRITE, MAP_FILE|MAP_PRIVATE, kd->pmfd, 0); } return (kd); @@ -635,7 +635,7 @@ clear_gap(kvm_t *kd, bool (*write_buf)(void *, const void *, size_t), return -1; } size -= len; - } + } return 0; } diff --git a/lib/libkvm/kvm_aarch64.c b/lib/libkvm/kvm_aarch64.c index 23fa9a3f8da3..814cbd373c4b 100644 --- a/lib/libkvm/kvm_aarch64.c +++ b/lib/libkvm/kvm_aarch64.c @@ -1,4 +1,4 @@ -/* $NetBSD: kvm_aarch64.c,v 1.11 2022/01/10 19:51:30 christos Exp $ */ +/* $NetBSD: kvm_aarch64.c,v 1.12 2023/08/23 14:00:11 rin Exp $ */ /*- * Copyright (c) 2014, 2018 The NetBSD Foundation, Inc. @@ -49,7 +49,7 @@ #include "kvm_private.h" -__RCSID("$NetBSD: kvm_aarch64.c,v 1.11 2022/01/10 19:51:30 christos Exp $"); +__RCSID("$NetBSD: kvm_aarch64.c,v 1.12 2023/08/23 14:00:11 rin Exp $"); /*ARGSUSED*/ void @@ -68,10 +68,10 @@ _kvm_initvtop(kvm_t *kd) int _kvm_kvatop(kvm_t *kd, vaddr_t va, paddr_t *pa) { - if (ISALIVE(kd)) { - _kvm_err(kd, 0, "vatop called in live kernel!"); - return(0); - } + if (ISALIVE(kd)) { + _kvm_err(kd, 0, "vatop called in live kernel!"); + return(0); + } if ((va & AARCH64_DIRECTMAP_MASK) != AARCH64_DIRECTMAP_START) { /* @@ -154,7 +154,7 @@ lose: } if (--levels == 0) { *pa = (pte & page_addr) | (va & page_mask); - return page_size - (va & page_mask); + return page_size - (va & page_mask); } /* diff --git a/lib/libkvm/kvm_alpha.c b/lib/libkvm/kvm_alpha.c index b763c349c9f3..a808aff0b6b5 100644 --- a/lib/libkvm/kvm_alpha.c +++ b/lib/libkvm/kvm_alpha.c @@ -1,4 +1,4 @@ -/* $NetBSD: kvm_alpha.c,v 1.28 2022/01/10 19:51:30 christos Exp $ */ +/* $NetBSD: kvm_alpha.c,v 1.29 2023/08/23 14:00:11 rin Exp $ */ /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. @@ -50,7 +50,7 @@ #include "kvm_private.h" -__RCSID("$NetBSD: kvm_alpha.c,v 1.28 2022/01/10 19:51:30 christos Exp $"); +__RCSID("$NetBSD: kvm_alpha.c,v 1.29 2023/08/23 14:00:11 rin Exp $"); /*ARGSUSED*/ void @@ -74,10 +74,10 @@ _kvm_kvatop(kvm_t *kd, vaddr_t va, paddr_t *pa) u_long pteoff, page_off; int rv; - if (ISALIVE(kd)) { - _kvm_err(kd, 0, "vatop called in live kernel!"); - return(0); - } + if (ISALIVE(kd)) { + _kvm_err(kd, 0, "vatop called in live kernel!"); + return(0); + } cpu_kh = kd->cpu_data; page_off = va & (cpu_kh->page_size - 1); diff --git a/lib/libkvm/kvm_i386pae.c b/lib/libkvm/kvm_i386pae.c index 5791a2de315f..e45df3f5c7e6 100644 --- a/lib/libkvm/kvm_i386pae.c +++ b/lib/libkvm/kvm_i386pae.c @@ -1,4 +1,4 @@ -/* $NetBSD: kvm_i386pae.c,v 1.3 2020/04/25 05:17:16 maxv Exp $ */ +/* $NetBSD: kvm_i386pae.c,v 1.4 2023/08/23 14:00:11 rin Exp $ */ /* * Copyright (c) 2010 Jean-Yves Migeon. @@ -26,7 +26,7 @@ */ #include -__RCSID("$NetBSD: kvm_i386pae.c,v 1.3 2020/04/25 05:17:16 maxv Exp $"); +__RCSID("$NetBSD: kvm_i386pae.c,v 1.4 2023/08/23 14:00:11 rin Exp $"); /* * This will expose PAE functions, macros, definitions and constants. @@ -75,7 +75,7 @@ _kvm_kvatop_i386pae(kvm_t *kd, vaddr_t va, paddr_t *pa) cpu_kh = kd->cpu_data; page_off = va & PGOFSET; - + /* * Find and read the PDE. Ignore the L3, as it is only a per-CPU * page, not needed for kernel VA => PA translations. diff --git a/lib/libkvm/kvm_or1k.c b/lib/libkvm/kvm_or1k.c index a5a93e18bda0..3eb4073a042a 100644 --- a/lib/libkvm/kvm_or1k.c +++ b/lib/libkvm/kvm_or1k.c @@ -1,4 +1,4 @@ -/* $NetBSD: kvm_or1k.c,v 1.2 2022/01/10 19:51:30 christos Exp $ */ +/* $NetBSD: kvm_or1k.c,v 1.3 2023/08/23 14:00:11 rin Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -51,7 +51,7 @@ #include #include -__RCSID("$NetBSD: kvm_or1k.c,v 1.2 2022/01/10 19:51:30 christos Exp $"); +__RCSID("$NetBSD: kvm_or1k.c,v 1.3 2023/08/23 14:00:11 rin Exp $"); void _kvm_freevtop(kvm_t *kd) @@ -96,7 +96,7 @@ _kvm_pa2off(kvm_t *kd, paddr_t pa) cpu_kh = kd->cpu_data; e = (char *) kd->cpu_data + kd->cpu_dsize; - ram = (void *)((char *)(void *)cpu_kh + ALIGN(sizeof *cpu_kh)); + ram = (void *)((char *)(void *)cpu_kh + ALIGN(sizeof *cpu_kh)); off = kd->dump_off; do { if (pa >= ram->start && (pa - ram->start) < ram->size) { diff --git a/lib/libkvm/kvm_powerpc.c b/lib/libkvm/kvm_powerpc.c index c019cb2ee34c..b72374ac8f64 100644 --- a/lib/libkvm/kvm_powerpc.c +++ b/lib/libkvm/kvm_powerpc.c @@ -1,4 +1,4 @@ -/* $NetBSD: kvm_powerpc.c,v 1.14 2022/01/10 19:51:30 christos Exp $ */ +/* $NetBSD: kvm_powerpc.c,v 1.15 2023/08/23 14:00:11 rin Exp $ */ /* * Copyright (c) 2005 Wasabi Systems, Inc. @@ -91,7 +91,7 @@ #include #include -__RCSID("$NetBSD: kvm_powerpc.c,v 1.14 2022/01/10 19:51:30 christos Exp $"); +__RCSID("$NetBSD: kvm_powerpc.c,v 1.15 2023/08/23 14:00:11 rin Exp $"); static int _kvm_match_601bat(kvm_t *, vaddr_t, paddr_t *, int *); static int _kvm_match_bat(kvm_t *, vaddr_t, paddr_t *, int *); @@ -341,7 +341,7 @@ _kvm_pa2off(kvm_t *kd, paddr_t pa) cpu_kh = kd->cpu_data; e = (char *) kd->cpu_data + kd->cpu_dsize; - ram = (void *)((char *)(void *)cpu_kh + ALIGN(sizeof *cpu_kh)); + ram = (void *)((char *)(void *)cpu_kh + ALIGN(sizeof *cpu_kh)); off = kd->dump_off; do { if (pa >= ram->start && (pa - ram->start) < ram->size) { diff --git a/lib/libkvm/kvm_powerpc64.c b/lib/libkvm/kvm_powerpc64.c index 96aa59fc70b6..ee764d0c8ad8 100644 --- a/lib/libkvm/kvm_powerpc64.c +++ b/lib/libkvm/kvm_powerpc64.c @@ -1,4 +1,4 @@ -/* $NetBSD: kvm_powerpc64.c,v 1.7 2022/01/10 19:51:30 christos Exp $ */ +/* $NetBSD: kvm_powerpc64.c,v 1.8 2023/08/23 14:00:11 rin Exp $ */ /* * Copyright (c) 2005 Wasabi Systems, Inc. @@ -90,7 +90,7 @@ #include #include -__RCSID("$NetBSD: kvm_powerpc64.c,v 1.7 2022/01/10 19:51:30 christos Exp $"); +__RCSID("$NetBSD: kvm_powerpc64.c,v 1.8 2023/08/23 14:00:11 rin Exp $"); void _kvm_freevtop(kvm_t *kd) @@ -144,7 +144,7 @@ _kvm_pa2off(kvm_t *kd, paddr_t pa) cpu_kh = kd->cpu_data; e = (char *) kd->cpu_data + kd->cpu_dsize; - ram = (void *)((char *)(void *)cpu_kh + ALIGN(sizeof *cpu_kh)); + ram = (void *)((char *)(void *)cpu_kh + ALIGN(sizeof *cpu_kh)); off = kd->dump_off; do { if (pa >= ram->start && (pa - ram->start) < ram->size) { diff --git a/lib/libkvm/kvm_riscv.c b/lib/libkvm/kvm_riscv.c index 2e0020cb84cf..4c3463e370b4 100644 --- a/lib/libkvm/kvm_riscv.c +++ b/lib/libkvm/kvm_riscv.c @@ -1,4 +1,4 @@ -/* $NetBSD: kvm_riscv.c,v 1.2 2022/01/10 19:51:30 christos Exp $ */ +/* $NetBSD: kvm_riscv.c,v 1.3 2023/08/23 14:00:11 rin Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -51,7 +51,7 @@ #include #include -__RCSID("$NetBSD: kvm_riscv.c,v 1.2 2022/01/10 19:51:30 christos Exp $"); +__RCSID("$NetBSD: kvm_riscv.c,v 1.3 2023/08/23 14:00:11 rin Exp $"); void _kvm_freevtop(kvm_t *kd) @@ -96,7 +96,7 @@ _kvm_pa2off(kvm_t *kd, paddr_t pa) cpu_kh = kd->cpu_data; e = (char *) kd->cpu_data + kd->cpu_dsize; - ram = (void *)((char *)(void *)cpu_kh + ALIGN(sizeof *cpu_kh)); + ram = (void *)((char *)(void *)cpu_kh + ALIGN(sizeof *cpu_kh)); off = kd->dump_off; do { if (pa >= ram->start && (pa - ram->start) < ram->size) { diff --git a/lib/libkvm/kvm_sparc64.c b/lib/libkvm/kvm_sparc64.c index d737c1c1116c..ee1fe70a7f44 100644 --- a/lib/libkvm/kvm_sparc64.c +++ b/lib/libkvm/kvm_sparc64.c @@ -1,4 +1,4 @@ -/* $NetBSD: kvm_sparc64.c,v 1.18 2022/01/10 19:51:30 christos Exp $ */ +/* $NetBSD: kvm_sparc64.c,v 1.19 2023/08/23 14:00:11 rin Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)kvm_sparc.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: kvm_sparc64.c,v 1.18 2022/01/10 19:51:30 christos Exp $"); +__RCSID("$NetBSD: kvm_sparc64.c,v 1.19 2023/08/23 14:00:11 rin Exp $"); #endif #endif /* LIBC_SCCS and not lint */ @@ -147,7 +147,7 @@ _kvm_kvatop(kvm_t *kd, vaddr_t va, paddr_t *pa) /* * old format: just a textbase/size and database/size */ - if (va > cpup->ktextbase && va < + if (va > cpup->ktextbase && va < (cpup->ktextbase + cpup->ktextsz)) { u_long vaddr; @@ -155,7 +155,7 @@ _kvm_kvatop(kvm_t *kd, vaddr_t va, paddr_t *pa) *pa = cpup->ktextp + vaddr; return (int)(cpup->ktextsz - vaddr); } - if (va > cpup->kdatabase && va < + if (va > cpup->kdatabase && va < (cpup->kdatabase + cpup->kdatasz)) { u_long vaddr; @@ -170,7 +170,7 @@ _kvm_kvatop(kvm_t *kd, vaddr_t va, paddr_t *pa) */ pseg = (uint64_t *)(u_long)cpup->segmapoffset; if (_kvm_pread(kd, kd->pmfd, &pdir, sizeof(pdir), - _kvm_pa2off(kd, (paddr_t)&pseg[va_to_seg(va)])) + _kvm_pa2off(kd, (paddr_t)&pseg[va_to_seg(va)])) != sizeof(pdir)) { _kvm_syserr(kd, 0, "could not read L1 PTE"); goto lose; @@ -182,7 +182,7 @@ _kvm_kvatop(kvm_t *kd, vaddr_t va, paddr_t *pa) } if (_kvm_pread(kd, kd->pmfd, &ptbl, sizeof(ptbl), - _kvm_pa2off(kd, (paddr_t)&pdir[va_to_dir(va)])) + _kvm_pa2off(kd, (paddr_t)&pdir[va_to_dir(va)])) != sizeof(ptbl)) { _kvm_syserr(kd, 0, "could not read L2 PTE"); goto lose; @@ -194,7 +194,7 @@ _kvm_kvatop(kvm_t *kd, vaddr_t va, paddr_t *pa) } if (_kvm_pread(kd, kd->pmfd, &data, sizeof(data), - _kvm_pa2off(kd, (paddr_t)&ptbl[va_to_pte(va)])) + _kvm_pa2off(kd, (paddr_t)&ptbl[va_to_pte(va)])) != sizeof(data)) { _kvm_syserr(kd, 0, "could not read TTE"); goto lose; @@ -204,8 +204,8 @@ _kvm_kvatop(kvm_t *kd, vaddr_t va, paddr_t *pa) _kvm_err(kd, 0, "invalid L2 TTE"); goto lose; } - - /* + + /* * Calculate page offsets and things. * * XXXX -- We could support multiple page sizes.