diff options
49 files changed, 124 insertions, 124 deletions
diff --git a/lib/libc/rpc/rpc_prot.c b/lib/libc/rpc/rpc_prot.c index edf5a0cd1de..501015c928a 100644 --- a/lib/libc/rpc/rpc_prot.c +++ b/lib/libc/rpc/rpc_prot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rpc_prot.c,v 1.16 2020/08/30 23:15:31 mortimer Exp $ */ +/* $OpenBSD: rpc_prot.c,v 1.17 2024/09/20 02:00:46 jsg Exp $ */ /* * Copyright (c) 2010, Oracle America, Inc. @@ -234,7 +234,7 @@ _seterr_reply(struct rpc_msg *msg, struct rpc_err *error) if (msg->acpted_rply.ar_stat == SUCCESS) { error->re_status = RPC_SUCCESS; return; - }; + } accepted(msg->acpted_rply.ar_stat, error); break; diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c index 17ba5fb1274..cad8e5d6a19 100644 --- a/lib/libc/stdlib/malloc.c +++ b/lib/libc/stdlib/malloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: malloc.c,v 1.296 2024/03/30 07:50:39 miod Exp $ */ +/* $OpenBSD: malloc.c,v 1.297 2024/09/20 02:00:46 jsg Exp $ */ /* * Copyright (c) 2008, 2010, 2011, 2016, 2023 Otto Moerbeek <otto@drijf.net> * Copyright (c) 2012 Matthew Dempsky <matthew@openbsd.org> @@ -2350,7 +2350,7 @@ aligned_alloc(size_t alignment, size_t size) if (((alignment - 1) & alignment) != 0 || alignment == 0) { errno = EINVAL; return NULL; - }; + } /* Per spec, size should be a multiple of alignment */ if ((size & (alignment - 1)) != 0) { errno = EINVAL; diff --git a/lib/libc/thread/rthread_mutex.c b/lib/libc/thread/rthread_mutex.c index c9a490033b3..8f39feab98b 100644 --- a/lib/libc/thread/rthread_mutex.c +++ b/lib/libc/thread/rthread_mutex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rthread_mutex.c,v 1.5 2019/02/13 13:09:32 mpi Exp $ */ +/* $OpenBSD: rthread_mutex.c,v 1.6 2024/09/20 02:00:46 jsg Exp $ */ /* * Copyright (c) 2017 Martin Pieuchot <mpi@openbsd.org> * Copyright (c) 2012 Philip Guenther <guenther@openbsd.org> @@ -197,7 +197,7 @@ _rthread_mutex_timedlock(pthread_mutex_t *mutexp, int trywait, * doubt set the state to CONTENDED. */ lock = atomic_swap_uint(&mutex->lock, CONTENDED); - }; + } membar_enter_after_atomic(); mutex->owner = self; diff --git a/lib/libfuse/fuse_private.h b/lib/libfuse/fuse_private.h index 208c997828a..f598180cb3c 100644 --- a/lib/libfuse/fuse_private.h +++ b/lib/libfuse/fuse_private.h @@ -1,4 +1,4 @@ -/* $OpenBSD: fuse_private.h,v 1.22 2018/11/16 02:16:17 tedu Exp $ */ +/* $OpenBSD: fuse_private.h,v 1.23 2024/09/20 02:00:46 jsg Exp $ */ /* * Copyright (c) 2013 Sylvestre Gallon <ccna.syl@gmail.com> * @@ -134,13 +134,13 @@ char *build_realname(struct fuse *, ino_t); #define tree_empty(t) SPLAY_EMPTY((t)) int tree_check(struct tree *, uint64_t); void *tree_set(struct tree *, uint64_t, void *); -void *tree_get(struct tree *, uint64_t);; +void *tree_get(struct tree *, uint64_t); void *tree_pop(struct tree *, uint64_t); /* dict.c */ int dict_check(struct dict *, const char *); void *dict_set(struct dict *, const char *, void *); -void *dict_get(struct dict *, const char *);; +void *dict_get(struct dict *, const char *); void *dict_pop(struct dict *, const char *); #define FUSE_VERSION_PKG_INFO "2.8.0" diff --git a/lib/libutil/pkcs5_pbkdf2.c b/lib/libutil/pkcs5_pbkdf2.c index 7da657e7496..4ad519e62ae 100644 --- a/lib/libutil/pkcs5_pbkdf2.c +++ b/lib/libutil/pkcs5_pbkdf2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pkcs5_pbkdf2.c,v 1.11 2019/11/21 16:07:24 tedu Exp $ */ +/* $OpenBSD: pkcs5_pbkdf2.c,v 1.12 2024/09/20 02:00:46 jsg Exp $ */ /*- * Copyright (c) 2008 Damien Bergamini <damien.bergamini@free.fr> @@ -111,7 +111,7 @@ pkcs5_pbkdf2(const char *pass, size_t pass_len, const uint8_t *salt, memcpy(key, obuf, r); key += r; key_len -= r; - }; + } freezero(asalt, salt_len + 4); explicit_bzero(d1, sizeof(d1)); explicit_bzero(d2, sizeof(d2)); diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y index 2032095625f..a694fbce211 100644 --- a/sbin/pfctl/parse.y +++ b/sbin/pfctl/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.716 2024/07/14 19:51:08 sashan Exp $ */ +/* $OpenBSD: parse.y,v 1.717 2024/09/20 02:00:46 jsg Exp $ */ /* * Copyright (c) 2001 Markus Friedl. All rights reserved. @@ -5609,7 +5609,7 @@ mv_tables(struct pfctl *pf, struct pfr_ktablehead *ktables, char *path_cut; int sz; struct pfr_uktable *ukt; - SLIST_HEAD(, pfr_uktable) ukt_list;; + SLIST_HEAD(, pfr_uktable) ukt_list; /* * Here we need to rename anchor path from temporal names such as diff --git a/sys/arch/alpha/pci/pci_2100_a50.c b/sys/arch/alpha/pci/pci_2100_a50.c index 07ea4d6d118..559d0cf327f 100644 --- a/sys/arch/alpha/pci/pci_2100_a50.c +++ b/sys/arch/alpha/pci/pci_2100_a50.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_2100_a50.c,v 1.25 2024/09/19 01:05:48 jsg Exp $ */ +/* $OpenBSD: pci_2100_a50.c,v 1.26 2024/09/20 02:00:46 jsg Exp $ */ /* $NetBSD: pci_2100_a50.c,v 1.12 1996/11/13 21:13:29 cgd Exp $ */ /* @@ -139,7 +139,7 @@ dec_2100_a50_intr_map(pa, ihp) case PCI_INTERRUPT_PIN_C: pirq = 1; break; - }; + } break; case 12: /* slot 2 */ @@ -155,7 +155,7 @@ dec_2100_a50_intr_map(pa, ihp) case PCI_INTERRUPT_PIN_C: pirq = 2; break; - }; + } break; case 13: /* slot 3 */ @@ -171,7 +171,7 @@ dec_2100_a50_intr_map(pa, ihp) case PCI_INTERRUPT_PIN_C: pirq = 0; break; - }; + } break; default: diff --git a/sys/arch/alpha/pci/pci_axppci_33.c b/sys/arch/alpha/pci/pci_axppci_33.c index 86788a56325..3a828a19fc5 100644 --- a/sys/arch/alpha/pci/pci_axppci_33.c +++ b/sys/arch/alpha/pci/pci_axppci_33.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_axppci_33.c,v 1.22 2017/09/08 05:36:51 deraadt Exp $ */ +/* $OpenBSD: pci_axppci_33.c,v 1.23 2024/09/20 02:00:46 jsg Exp $ */ /* $NetBSD: pci_axppci_33.c,v 1.10 1996/11/13 21:13:29 cgd Exp $ */ /* @@ -139,7 +139,7 @@ dec_axppci_33_intr_map(pa, ihp) case PCI_INTERRUPT_PIN_C: pirq = 1; break; - }; + } break; case 12: /* slot 2 */ @@ -155,7 +155,7 @@ dec_axppci_33_intr_map(pa, ihp) case PCI_INTERRUPT_PIN_C: pirq = 2; break; - }; + } break; case 8: /* slot 3 */ @@ -171,7 +171,7 @@ dec_axppci_33_intr_map(pa, ihp) case PCI_INTERRUPT_PIN_C: pirq = 0; break; - }; + } break; default: diff --git a/sys/arch/amd64/amd64/pmap.c b/sys/arch/amd64/amd64/pmap.c index c7d2dca5e73..cf699b04f4f 100644 --- a/sys/arch/amd64/amd64/pmap.c +++ b/sys/arch/amd64/amd64/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.173 2024/09/03 17:19:53 bluhm Exp $ */ +/* $OpenBSD: pmap.c,v 1.174 2024/09/20 02:00:46 jsg Exp $ */ /* $NetBSD: pmap.c,v 1.3 2003/05/08 18:13:13 thorpej Exp $ */ /* @@ -693,7 +693,7 @@ pmap_bootstrap(paddr_t first_avail, paddr_t max_pa) */ protection_codes[PROT_NONE] = pg_nx; /* --- */ - protection_codes[PROT_EXEC] = pg_xo; ; /* --x */ + protection_codes[PROT_EXEC] = pg_xo; /* --x */ protection_codes[PROT_READ] = PG_RO | pg_nx; /* -r- */ protection_codes[PROT_READ | PROT_EXEC] = PG_RO; /* -rx */ protection_codes[PROT_WRITE] = PG_RW | pg_nx; /* w-- */ diff --git a/sys/arch/arm/arm/disassem.c b/sys/arch/arm/arm/disassem.c index cb12814bd29..86497fba6af 100644 --- a/sys/arch/arm/arm/disassem.c +++ b/sys/arch/arm/arm/disassem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disassem.c,v 1.5 2018/06/30 15:23:35 deraadt Exp $ */ +/* $OpenBSD: disassem.c,v 1.6 2024/09/20 02:00:46 jsg Exp $ */ /* $NetBSD: disassem.c,v 1.14 2003/03/27 16:58:36 mycroft Exp $ */ /* @@ -522,7 +522,7 @@ disasm(const disasm_interface_t *di, vaddr_t loc, int altfmt) else di->di_printf(", "); } - }; + } di->di_printf("\n"); diff --git a/sys/arch/mips64/mips64/db_disasm.c b/sys/arch/mips64/mips64/db_disasm.c index 883eaa1e884..4f78b889abe 100644 --- a/sys/arch/mips64/mips64/db_disasm.c +++ b/sys/arch/mips64/mips64/db_disasm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_disasm.c,v 1.20 2020/01/02 16:00:54 visa Exp $ */ +/* $OpenBSD: db_disasm.c,v 1.21 2024/09/20 02:00:46 jsg Exp $ */ /* * Copyright (c) 2010 Miodrag Vallat. @@ -51,7 +51,7 @@ * SUCH DAMAGE. * * from: @(#)kadb.c 8.1 (Berkeley) 6/10/93 - * $Id: db_disasm.c,v 1.20 2020/01/02 16:00:54 visa Exp $ + * $Id: db_disasm.c,v 1.21 2024/09/20 02:00:46 jsg Exp $ */ #ifdef _KERNEL @@ -697,7 +697,7 @@ dbmd_print_insn(uint32_t ins, vaddr_t mdbdot, int (*pr)(const char *, ...)) (*pr)("\t%s,%s,%s", reg_name[i.RType.rd], reg_name[i.RType.rs], reg_name[i.RType.rt]); - }; + } break; case OP_BCOND: @@ -855,7 +855,7 @@ unknown: break; default: goto unknown; - }; + } break; case OP_COP1: @@ -893,7 +893,7 @@ unknown: (*pr)("%s.%s\tf%d,f%d,f%d", insn, fmt_name[i.FRType.fmt], i.FRType.fd, i.FRType.fs, i.FRType.ft); - }; + } break; case OP_COP2: @@ -917,7 +917,7 @@ unknown: goto pr_displ; default: goto unknown; - }; + } break; case OP_COP1X: diff --git a/sys/arch/mips64/mips64/trap.c b/sys/arch/mips64/mips64/trap.c index c4751488c23..ff253cd3a02 100644 --- a/sys/arch/mips64/mips64/trap.c +++ b/sys/arch/mips64/mips64/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.171 2024/01/11 19:16:26 miod Exp $ */ +/* $OpenBSD: trap.c,v 1.172 2024/09/20 02:00:46 jsg Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -1230,7 +1230,7 @@ loop: case OP_SYSCALL: case OP_BREAK: more = 1; /* stop now */ - }; + } break; case OP_BCOND: @@ -1250,7 +1250,7 @@ loop: switch (i.RType.rs) { case OP_BC: more = 2; /* stop after next instruction */ - }; + } break; case OP_SD: diff --git a/sys/arch/riscv64/riscv64/db_disasm.c b/sys/arch/riscv64/riscv64/db_disasm.c index 38d5a99bb1b..754824f06c2 100644 --- a/sys/arch/riscv64/riscv64/db_disasm.c +++ b/sys/arch/riscv64/riscv64/db_disasm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_disasm.c,v 1.5 2021/05/12 23:08:19 deraadt Exp $ */ +/* $OpenBSD: db_disasm.c,v 1.6 2024/09/20 02:00:46 jsg Exp $ */ /*- * Copyright (c) 2016-2018 Ruslan Bukin <br@bsdpad.com> @@ -452,7 +452,7 @@ oprint(struct riscv_op *op, vaddr_t loc, int insn) imm = ((insn >> 2) & 0x1f) << 0; imm |= ((insn >> 12) & 0x1) << 5; db_printf("%d", imm); - }; + } break; case 'd': db_printf("%s", reg_name[rd]); @@ -592,7 +592,7 @@ db_disasm(vaddr_t loc, int altfmt) oprint(op, loc, insn); return (loc + 4); } - }; + } insn = db_get_value(loc, 2, 0); for (j = 0; riscv_c_opcodes[j].name != NULL; j++) { @@ -601,7 +601,7 @@ db_disasm(vaddr_t loc, int altfmt) oprint(op, loc, insn); break; } - }; + } db_printf("\n"); return (loc + 2); diff --git a/sys/arch/sparc64/sparc64/db_disasm.c b/sys/arch/sparc64/sparc64/db_disasm.c index b697ad5e163..7a6393e0161 100644 --- a/sys/arch/sparc64/sparc64/db_disasm.c +++ b/sys/arch/sparc64/sparc64/db_disasm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_disasm.c,v 1.9 2020/09/11 09:27:10 mpi Exp $ */ +/* $OpenBSD: db_disasm.c,v 1.10 2024/09/20 02:00:46 jsg Exp $ */ /* $NetBSD: db_disasm.c,v 1.9 2000/08/16 11:29:42 pk Exp $ */ /* @@ -944,7 +944,7 @@ db_disasm(vaddr_t loc, int altfmt) break; } i_ptr++; - }; + } if (!matchp) { db_printf("undefined\n"); @@ -1115,7 +1115,7 @@ db_disasm(vaddr_t loc, int altfmt) } if (*(++f_ptr)) db_printf(", "); - }; + } db_printf("\n"); diff --git a/sys/dev/acpi/dsdt.c b/sys/dev/acpi/dsdt.c index d179cfdd136..78b10be0ea0 100644 --- a/sys/dev/acpi/dsdt.c +++ b/sys/dev/acpi/dsdt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dsdt.c,v 1.270 2024/08/06 17:38:56 kettenis Exp $ */ +/* $OpenBSD: dsdt.c,v 1.271 2024/09/20 02:00:46 jsg Exp $ */ /* * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org> * @@ -1731,7 +1731,7 @@ aml_val_to_string(const struct aml_value *val) default: snprintf(buffer, sizeof(buffer), "Failed to convert type %d to string!", val->type); - }; + } return (buffer); } diff --git a/sys/dev/ic/adv.c b/sys/dev/ic/adv.c index e32f1da5b26..fdc232da655 100644 --- a/sys/dev/ic/adv.c +++ b/sys/dev/ic/adv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: adv.c,v 1.53 2022/04/16 19:19:58 naddy Exp $ */ +/* $OpenBSD: adv.c,v 1.54 2024/09/20 02:00:46 jsg Exp $ */ /* $NetBSD: adv.c,v 1.6 1998/10/28 20:39:45 dante Exp $ */ /* @@ -468,7 +468,7 @@ adv_attach(ASC_SOFTC *sc) */ error = adv_alloc_ccbs(sc); if (error) - return; /* (error) */ ; + return; /* (error) */ /* * Create and initialize the Control Blocks. diff --git a/sys/dev/ic/adw.c b/sys/dev/ic/adw.c index e91d2b24586..33e253ed3e9 100644 --- a/sys/dev/ic/adw.c +++ b/sys/dev/ic/adw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: adw.c,v 1.70 2024/04/13 23:44:11 jsg Exp $ */ +/* $OpenBSD: adw.c,v 1.71 2024/09/20 02:00:46 jsg Exp $ */ /* $NetBSD: adw.c,v 1.23 2000/05/27 18:24:50 dante Exp $ */ /* @@ -423,7 +423,7 @@ adw_attach(ADW_SOFTC *sc) */ error = adw_alloc_controls(sc); if (error) - return; /* (error) */ ; + return; /* (error) */ /* * Create and initialize the Control Blocks. @@ -444,7 +444,7 @@ adw_attach(ADW_SOFTC *sc) */ error = adw_alloc_carriers(sc); if (error) - return; /* (error) */ ; + return; /* (error) */ /* * Zero's the freeze_device status diff --git a/sys/dev/ic/ami.c b/sys/dev/ic/ami.c index 98195eccd6c..8833497c885 100644 --- a/sys/dev/ic/ami.c +++ b/sys/dev/ic/ami.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ami.c,v 1.263 2024/06/26 01:40:49 jsg Exp $ */ +/* $OpenBSD: ami.c,v 1.264 2024/09/20 02:00:46 jsg Exp $ */ /* * Copyright (c) 2001 Michael Shalayeff @@ -1772,7 +1772,7 @@ ami_mgmt(struct ami_softc *sc, u_int8_t opcode, u_int8_t par1, u_int8_t par2, cmd->acc_io.aio_param = par2; cmd->acc_io.aio_pad[0] = par3; break; - }; + } cmd->acc_io.aio_data = am ? htole32(AMIMEM_DVA(am)) : 0; diff --git a/sys/dev/ic/rt2860.c b/sys/dev/ic/rt2860.c index 1bab22ffac2..07aeeff7171 100644 --- a/sys/dev/ic/rt2860.c +++ b/sys/dev/ic/rt2860.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rt2860.c,v 1.103 2024/04/14 03:26:25 jsg Exp $ */ +/* $OpenBSD: rt2860.c,v 1.104 2024/09/20 02:00:46 jsg Exp $ */ /*- * Copyright (c) 2007-2010 Damien Bergamini <damien.bergamini@free.fr> @@ -3271,7 +3271,7 @@ rt2860_read_eeprom(struct rt2860_softc *sc) sc->ext_5ghz_lna = (val >> 3) & 1; sc->ext_2ghz_lna = (val >> 2) & 1; /* check if RF supports automatic Tx access gain control */ - sc->calib_2ghz = sc->calib_5ghz = 0; /* XXX (val >> 1) & 1 */; + sc->calib_2ghz = sc->calib_5ghz = 0; /* XXX (val >> 1) & 1 */ /* check if we have a hardware radio switch */ sc->rfswitch = val & 1; } diff --git a/sys/dev/ic/rtwn.c b/sys/dev/ic/rtwn.c index 3df98b19fa7..0bc314e7d56 100644 --- a/sys/dev/ic/rtwn.c +++ b/sys/dev/ic/rtwn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtwn.c,v 1.58 2024/06/26 01:40:49 jsg Exp $ */ +/* $OpenBSD: rtwn.c,v 1.59 2024/09/20 02:00:46 jsg Exp $ */ /*- * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr> @@ -2536,7 +2536,7 @@ rtwn_set_chan(struct rtwn_softc *sc, struct ieee80211_channel *c, rtwn_rf_write(sc, i, 0x87, 0x65); rtwn_rf_write(sc, i, 0x1c, 0); rtwn_rf_write(sc, i, 0xdf, 0x0140); - rtwn_rf_write(sc, i, 0x1b, 0x1c6c);; + rtwn_rf_write(sc, i, 0x1b, 0x1c6c); } } } diff --git a/sys/dev/ic/ti.c b/sys/dev/ic/ti.c index c1cc0df7d05..1aae1d1f148 100644 --- a/sys/dev/ic/ti.c +++ b/sys/dev/ic/ti.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ti.c,v 1.30 2023/11/10 15:51:20 bluhm Exp $ */ +/* $OpenBSD: ti.c,v 1.31 2024/09/20 02:00:46 jsg Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -781,7 +781,7 @@ ti_init_rx_ring_jumbo(struct ti_softc *sc) for (i = 0; i < TI_JUMBO_RX_RING_CNT; i++) { if (ti_newbuf_jumbo(sc, i, NULL, 0) == ENOBUFS) return (ENOBUFS); - }; + } TI_UPDATE_JUMBOPROD(sc, i - 1); sc->ti_jumbo = i - 1; @@ -812,7 +812,7 @@ ti_init_rx_ring_mini(struct ti_softc *sc) for (i = 0; i < TI_MSLOTS; i++) { if (ti_newbuf_mini(sc, i, NULL, 0) == ENOBUFS) return (ENOBUFS); - }; + } TI_UPDATE_MINIPROD(sc, i - 1); sc->ti_mini = i - 1; diff --git a/sys/dev/pci/auixp.c b/sys/dev/pci/auixp.c index 9cd54932dbc..74db46167f3 100644 --- a/sys/dev/pci/auixp.c +++ b/sys/dev/pci/auixp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auixp.c,v 1.54 2024/08/18 14:42:56 deraadt Exp $ */ +/* $OpenBSD: auixp.c,v 1.55 2024/09/20 02:00:46 jsg Exp $ */ /* $NetBSD: auixp.c,v 1.9 2005/06/27 21:13:09 thorpej Exp $ */ /* @@ -145,7 +145,7 @@ void auixp_dma_update(struct auixp_softc *, struct auixp_dma *); void auixp_update_busbusy(struct auixp_softc *); #ifdef DEBUG_AUIXP -#define DPRINTF(x) printf x; +#define DPRINTF(x) printf x #else #define DPRINTF(x) #endif @@ -1383,7 +1383,7 @@ auixp_reset_aclink(struct auixp_softc *sc) /* have to wait at least 10 usec for it to initialise */ DELAY(20); - }; + } printf("%s: soft resetting aclink\n", sc->sc_dev.dv_xname); @@ -1427,15 +1427,15 @@ auixp_reset_aclink(struct auixp_softc *sc) timeout--; if (timeout == 0) break; - }; + } if (timeout == 0) { printf("%s: giving up aclink reset\n", sc->sc_dev.dv_xname); - }; + } if (timeout != 10) { printf("%s: aclink hardware reset successful\n", sc->sc_dev.dv_xname); - }; + } /* assert reset and sync for safety */ value = bus_space_read_4(iot, ioh, ATI_REG_CMD); diff --git a/sys/dev/pci/drm/i915/i915_driver.c b/sys/dev/pci/drm/i915/i915_driver.c index 00ab1ef519b..5e3629934d6 100644 --- a/sys/dev/pci/drm/i915/i915_driver.c +++ b/sys/dev/pci/drm/i915/i915_driver.c @@ -2274,7 +2274,7 @@ inteldrm_attach(struct device *parent, struct device *self, void *aux) & (PCI_COMMAND_IO_ENABLE | PCI_COMMAND_MEM_ENABLE)) == (PCI_COMMAND_IO_ENABLE | PCI_COMMAND_MEM_ENABLE)) { dev_priv->primary = 1; - dev_priv->console = vga_is_console(pa->pa_iot, -1);; + dev_priv->console = vga_is_console(pa->pa_iot, -1); vga_console_attached = 1; } diff --git a/sys/dev/pci/maestro.c b/sys/dev/pci/maestro.c index f87067e5e56..865f5743330 100644 --- a/sys/dev/pci/maestro.c +++ b/sys/dev/pci/maestro.c @@ -1,4 +1,4 @@ -/* $OpenBSD: maestro.c,v 1.55 2024/09/04 07:54:52 mglocker Exp $ */ +/* $OpenBSD: maestro.c,v 1.56 2024/09/20 02:00:46 jsg Exp $ */ /* $FreeBSD: /c/ncvs/src/sys/dev/sound/pci/maestro.c,v 1.3 2000/11/21 12:22:11 julian Exp $ */ /* * FreeBSD's ESS Agogo/Maestro driver @@ -627,7 +627,7 @@ maestro_attach(struct device *parent, struct device *self, void *aux) 0, &sc->iot, &sc->ioh, NULL, NULL, 0)) != 0) { printf(", can't map i/o space\n"); goto bad; - }; + } /* Allocate fixed DMA segment :-( */ sc->dmasize = MAESTRO_BUFSIZ * 16; diff --git a/sys/dev/pci/vmwpvs.c b/sys/dev/pci/vmwpvs.c index 6ac67d1db4a..84d0a0d85d6 100644 --- a/sys/dev/pci/vmwpvs.c +++ b/sys/dev/pci/vmwpvs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmwpvs.c,v 1.29 2024/09/04 07:54:52 mglocker Exp $ */ +/* $OpenBSD: vmwpvs.c,v 1.30 2024/09/20 02:00:46 jsg Exp $ */ /* * Copyright (c) 2013 David Gwynne <dlg@openbsd.org> @@ -799,7 +799,7 @@ vmwpvs_msg_task(void *xsc) printf("%s: error probing target %d lun %d\n", DEVNAME(sc), letoh32(dvmsg->target), dvmsg->lun[1]); - }; + } break; case VMWPVS_MSG_T_REMOVED: @@ -817,7 +817,7 @@ vmwpvs_msg_task(void *xsc) printf("%s: error detaching target %d lun %d\n", DEVNAME(sc), letoh32(dvmsg->target), dvmsg->lun[1]); - }; + } break; default: diff --git a/sys/dev/usb/ubsa.c b/sys/dev/usb/ubsa.c index d1921deb04f..aa778437c9a 100644 --- a/sys/dev/usb/ubsa.c +++ b/sys/dev/usb/ubsa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ubsa.c,v 1.70 2024/05/23 03:21:09 jsg Exp $ */ +/* $OpenBSD: ubsa.c,v 1.71 2024/09/20 02:00:46 jsg Exp $ */ /* $NetBSD: ubsa.c,v 1.5 2002/11/25 00:51:33 fvdl Exp $ */ /*- * Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>. @@ -478,7 +478,7 @@ ubsa_baudrate(struct ubsa_softc *sc, speed_t speed) sc->sc_dev.dv_xname)); value = B230400 / B9600; break; - }; + } if (speed == B0) { ubsa_flow(sc, 0, 0); diff --git a/sys/isofs/udf/udf_vnops.c b/sys/isofs/udf/udf_vnops.c index 21440614f09..da152237159 100644 --- a/sys/isofs/udf/udf_vnops.c +++ b/sys/isofs/udf/udf_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: udf_vnops.c,v 1.73 2024/09/12 09:04:51 claudio Exp $ */ +/* $OpenBSD: udf_vnops.c,v 1.74 2024/09/20 02:00:46 jsg Exp $ */ /* * Copyright (c) 2001, 2002 Scott Long <scottl@freebsd.org> @@ -471,7 +471,7 @@ udf_read(void *v) } if (error) break; - }; + } return (error); } diff --git a/sys/lib/libsa/pkcs5_pbkdf2.c b/sys/lib/libsa/pkcs5_pbkdf2.c index 73cdb27c7e9..2340fbc814f 100644 --- a/sys/lib/libsa/pkcs5_pbkdf2.c +++ b/sys/lib/libsa/pkcs5_pbkdf2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pkcs5_pbkdf2.c,v 1.1 2016/09/10 16:38:16 jsing Exp $ */ +/* $OpenBSD: pkcs5_pbkdf2.c,v 1.2 2024/09/20 02:00:46 jsg Exp $ */ /*- * Copyright (c) 2008 Damien Bergamini <damien.bergamini@free.fr> @@ -65,7 +65,7 @@ pkcs5_pbkdf2(const char *pass, size_t pass_len, const char *salt, memcpy(key, obuf, r); key += r; key_len -= r; - }; + } explicit_bzero(asalt, salt_len + 4); free(asalt, salt_len + 4); explicit_bzero(d1, sizeof(d1)); diff --git a/sys/net/if_pppx.c b/sys/net/if_pppx.c index c7f15df7b26..62d92e6aa71 100644 --- a/sys/net/if_pppx.c +++ b/sys/net/if_pppx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pppx.c,v 1.130 2024/09/09 07:37:47 mvs Exp $ */ +/* $OpenBSD: if_pppx.c,v 1.131 2024/09/20 02:00:46 jsg Exp $ */ /* * Copyright (c) 2010 Claudio Jeker <claudio@openbsd.org> @@ -1069,7 +1069,7 @@ pppacopen(dev_t dev, int flags, int mode, struct proc *p) ifp->if_softc = sc; ifp->if_type = IFT_L3IPVLAN; - ifp->if_hdrlen = sizeof(uint32_t); /* for BPF */; + ifp->if_hdrlen = sizeof(uint32_t); /* for BPF */ ifp->if_mtu = MAXMCLBYTES - sizeof(uint32_t); ifp->if_flags = IFF_SIMPLEX | IFF_BROADCAST; ifp->if_xflags = IFXF_CLONED | IFXF_MPSAFE; diff --git a/sys/net/route.c b/sys/net/route.c index 028199bd4c0..4fef5e99316 100644 --- a/sys/net/route.c +++ b/sys/net/route.c @@ -1,4 +1,4 @@ -/* $OpenBSD: route.c,v 1.436 2024/03/31 15:53:12 bluhm Exp $ */ +/* $OpenBSD: route.c,v 1.437 2024/09/20 02:00:46 jsg Exp $ */ /* $NetBSD: route.c,v 1.14 1996/02/13 22:00:46 christos Exp $ */ /* @@ -1128,7 +1128,7 @@ rt_setgate(struct rtentry *rt, const struct sockaddr *gate, u_int rtableid) if (rt->rt_gateway == gate) { /* nop */ return (0); - }; + } sa = malloc(glen, M_RTABLE, M_NOWAIT | M_ZERO); if (sa == NULL) diff --git a/sys/ufs/ext2fs/ext2fs_lookup.c b/sys/ufs/ext2fs/ext2fs_lookup.c index 435f8c7c662..5c5097d06d1 100644 --- a/sys/ufs/ext2fs/ext2fs_lookup.c +++ b/sys/ufs/ext2fs/ext2fs_lookup.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ext2fs_lookup.c,v 1.47 2024/09/12 09:04:51 claudio Exp $ */ +/* $OpenBSD: ext2fs_lookup.c,v 1.48 2024/09/20 02:00:46 jsg Exp $ */ /* $NetBSD: ext2fs_lookup.c,v 1.16 2000/08/03 20:29:26 thorpej Exp $ */ /* @@ -776,7 +776,7 @@ ext2fs_direnter(struct inode *ip, struct vnode *dvp, newdir.e2d_type = inot2ext2dt(IFTODT(ip->i_e2fs_mode)); } else { newdir.e2d_type = 0; - }; + } memcpy(newdir.e2d_name, cnp->cn_nameptr, (unsigned)cnp->cn_namelen + 1); newentrysize = EXT2FS_DIRSIZ(cnp->cn_namelen); if (dp->i_count == 0) { diff --git a/usr.bin/dig/lib/isc/regex.c b/usr.bin/dig/lib/isc/regex.c index d86faf462b9..a5da7e58e0b 100644 --- a/usr.bin/dig/lib/isc/regex.c +++ b/usr.bin/dig/lib/isc/regex.c @@ -251,7 +251,7 @@ isc_regex_validate(const char *c) { range_start = *c & 0xff; ++c; break; - }; + } break; case parse_ce: switch (*c) { diff --git a/usr.bin/mandoc/mdoc_validate.c b/usr.bin/mandoc/mdoc_validate.c index aa47566638a..997d8b6a395 100644 --- a/usr.bin/mandoc/mdoc_validate.c +++ b/usr.bin/mandoc/mdoc_validate.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mdoc_validate.c,v 1.306 2022/06/08 16:29:12 schwarze Exp $ */ +/* $OpenBSD: mdoc_validate.c,v 1.307 2024/09/20 02:00:46 jsg Exp $ */ /* * Copyright (c) 2010-2021 Ingo Schwarze <schwarze@openbsd.org> * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> @@ -3042,6 +3042,6 @@ macro2len(enum roff_tok macro) return 10; default: break; - }; + } return 0; } diff --git a/usr.bin/mg/interpreter.c b/usr.bin/mg/interpreter.c index d73e3d64339..79521e56f94 100644 --- a/usr.bin/mg/interpreter.c +++ b/usr.bin/mg/interpreter.c @@ -1,4 +1,4 @@ -/* $OpenBSD: interpreter.c,v 1.35 2023/04/17 10:11:30 op Exp $ */ +/* $OpenBSD: interpreter.c,v 1.36 2024/09/20 02:00:46 jsg Exp $ */ /* * This file is in the public domain. * @@ -395,7 +395,7 @@ parsexp(char *begp, const char *par1, const char *par2, int blkid, int expctr, { struct expentry *e1 = NULL; PF funcp; - char *cmdp, *fendp, *valp, *fname, *funb = NULL;; + char *cmdp, *fendp, *valp, *fname, *funb = NULL; int numparams, ret; cmdp = begp; diff --git a/usr.bin/sort/bwstring.c b/usr.bin/sort/bwstring.c index c899462f179..0ded6fd7a7c 100644 --- a/usr.bin/sort/bwstring.c +++ b/usr.bin/sort/bwstring.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bwstring.c,v 1.9 2019/05/15 09:33:34 schwarze Exp $ */ +/* $OpenBSD: bwstring.c,v 1.10 2024/09/20 02:00:46 jsg Exp $ */ /*- * Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org> @@ -293,7 +293,7 @@ bwscsbdup(const unsigned char *str, size_t len) /* NOTREACHED */ err(2, "mbrtowc error"); cptr += charlen; - }; + } } ret->len = chars; diff --git a/usr.bin/sort/coll.c b/usr.bin/sort/coll.c index 9faf50b0f43..3631620be53 100644 --- a/usr.bin/sort/coll.c +++ b/usr.bin/sort/coll.c @@ -1,4 +1,4 @@ -/* $OpenBSD: coll.c,v 1.12 2019/05/13 17:00:12 schwarze Exp $ */ +/* $OpenBSD: coll.c,v 1.13 2024/09/20 02:00:46 jsg Exp $ */ /*- * Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org> @@ -672,7 +672,7 @@ setsuffix(wchar_t c, unsigned char *si) break; default: *si = 0; - }; + } } /* diff --git a/usr.bin/sort/file.c b/usr.bin/sort/file.c index d3b97f5b2df..a19ffa02563 100644 --- a/usr.bin/sort/file.c +++ b/usr.bin/sort/file.c @@ -1,4 +1,4 @@ -/* $OpenBSD: file.c,v 1.23 2019/12/30 16:07:13 millert Exp $ */ +/* $OpenBSD: file.c,v 1.24 2024/09/20 02:00:46 jsg Exp $ */ /*- * Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org> @@ -1102,7 +1102,7 @@ sort_list_to_file(struct sort_list *list, const char *outfile) default: errx(2, "The chosen sort method cannot be used with " "stable and/or unique sort"); - }; + } } if (sort_opts_vals.sort_method == SORT_DEFAULT) diff --git a/usr.bin/ssh/ssh-keyscan.c b/usr.bin/ssh/ssh-keyscan.c index df8abc2e62e..76e8c12ae4f 100644 --- a/usr.bin/ssh/ssh-keyscan.c +++ b/usr.bin/ssh/ssh-keyscan.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-keyscan.c,v 1.161 2024/09/09 02:39:57 djm Exp $ */ +/* $OpenBSD: ssh-keyscan.c,v 1.162 2024/09/20 02:00:46 jsg Exp $ */ /* * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. * @@ -624,7 +624,7 @@ do_host(char *host) if (addr_cmp(&addr, &end_addr) == 0) break; addr_increment(&addr); - }; + } } } diff --git a/usr.bin/ssh/ssh-pkcs11.c b/usr.bin/ssh/ssh-pkcs11.c index 97c98cc9472..0174255849c 100644 --- a/usr.bin/ssh/ssh-pkcs11.c +++ b/usr.bin/ssh/ssh-pkcs11.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-pkcs11.c,v 1.63 2024/08/15 00:51:51 djm Exp $ */ +/* $OpenBSD: ssh-pkcs11.c,v 1.64 2024/09/20 02:00:46 jsg Exp $ */ /* * Copyright (c) 2010 Markus Friedl. All rights reserved. * Copyright (c) 2014 Pedro Martelletto. All rights reserved. @@ -1171,7 +1171,7 @@ pkcs11_fetch_certs(struct pkcs11_provider *p, CK_ULONG slotidx, } note_key(p, slotidx, __func__, key); if (pkcs11_key_included(keysp, nkeys, key)) { - debug2_f("key already included");; + debug2_f("key already included"); sshkey_free(key); } else { /* expand key array and add key */ @@ -1283,7 +1283,7 @@ pkcs11_fetch_keys(struct pkcs11_provider *p, CK_ULONG slotidx, } note_key(p, slotidx, __func__, key); if (pkcs11_key_included(keysp, nkeys, key)) { - debug2_f("key already included");; + debug2_f("key already included"); sshkey_free(key); } else { /* expand key array and add key */ diff --git a/usr.bin/systat/if.c b/usr.bin/systat/if.c index 66733cff0dc..55166b78bcd 100644 --- a/usr.bin/systat/if.c +++ b/usr.bin/systat/if.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if.c,v 1.27 2021/11/29 06:39:23 deraadt Exp $ */ +/* $OpenBSD: if.c,v 1.28 2024/09/20 02:00:46 jsg Exp $ */ /* * Copyright (c) 2004 Markus Friedl <markus@openbsd.org> * @@ -488,7 +488,7 @@ if_keyboard_callback(int ch) break; default: return keyboard_callback(ch); - }; + } return 1; } diff --git a/usr.bin/systat/main.c b/usr.bin/systat/main.c index ce7851d8bd2..bdc61bf0ff4 100644 --- a/usr.bin/systat/main.c +++ b/usr.bin/systat/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.77 2022/12/04 18:01:57 cheloha Exp $ */ +/* $OpenBSD: main.c,v 1.78 2024/09/20 02:00:46 jsg Exp $ */ /* * Copyright (c) 2001, 2007 Can Erkin Acar * Copyright (c) 2001 Daniel Hartmeier @@ -376,7 +376,7 @@ keyboard_callback(int ch) break; default: return 0; - }; + } return 1; } diff --git a/usr.bin/systat/netstat.c b/usr.bin/systat/netstat.c index 5f80827e70d..24864f07d10 100644 --- a/usr.bin/systat/netstat.c +++ b/usr.bin/systat/netstat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: netstat.c,v 1.46 2023/10/10 09:27:03 tb Exp $ */ +/* $OpenBSD: netstat.c,v 1.47 2024/09/20 02:00:46 jsg Exp $ */ /* $NetBSD: netstat.c,v 1.3 1995/06/18 23:53:07 cgd Exp $ */ /*- @@ -488,7 +488,7 @@ ns_keyboard_callback(int ch) break; default: return keyboard_callback(ch); - }; + } return 1; } diff --git a/usr.sbin/bgpd/parse.y b/usr.sbin/bgpd/parse.y index 29af28a313a..c2f24cc9158 100644 --- a/usr.sbin/bgpd/parse.y +++ b/usr.sbin/bgpd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.467 2024/08/22 08:17:54 florian Exp $ */ +/* $OpenBSD: parse.y,v 1.468 2024/09/20 02:00:46 jsg Exp $ */ /* * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -4361,9 +4361,9 @@ parselargecommunity(struct community *c, char *s) getcommunity(q, 1, &c->data3, &dflag3) == -1) return (-1); c->flags = COMMUNITY_TYPE_LARGE; - c->flags |= dflag1 << 8;; - c->flags |= dflag2 << 16;; - c->flags |= dflag3 << 24;; + c->flags |= dflag1 << 8; + c->flags |= dflag2 << 16; + c->flags |= dflag3 << 24; return (0); } diff --git a/usr.sbin/mopd/common/print.c b/usr.sbin/mopd/common/print.c index 266028c1880..13df7d84c78 100644 --- a/usr.sbin/mopd/common/print.c +++ b/usr.sbin/mopd/common/print.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print.c,v 1.15 2024/04/23 13:34:51 jsg Exp $ */ +/* $OpenBSD: print.c,v 1.16 2024/09/20 02:00:46 jsg Exp $ */ /* * Copyright (c) 1993-96 Mats O Jansson. All rights reserved. @@ -62,7 +62,7 @@ mopPrintBPTY(FILE *fd, u_char bpty) default: fprintf(fd, "Unknown"); break; - }; + } } void @@ -84,7 +84,7 @@ mopPrintPGTY(FILE *fd, u_char pgty) default: fprintf(fd, "Unknown"); break; - }; + } } void @@ -550,7 +550,7 @@ mopPrintInfo(FILE *fd, u_char *pkt, int *idx, u_short moplen, u_char mopcode, default: fprintf(fd, "Unknown\n"); break; - }; + } break; case MOP_K_INFO_DLTY: tmpc = mopGetChar(pkt, idx); @@ -568,7 +568,7 @@ mopPrintInfo(FILE *fd, u_char *pkt, int *idx, u_short moplen, u_char mopcode, default: fprintf(fd, "Unknown\n"); break; - }; + } break; case MOP_K_INFO_DLBSZ: tmps = mopGetShort(pkt, idx); diff --git a/usr.sbin/mopd/mopchk/mopchk.c b/usr.sbin/mopd/mopchk/mopchk.c index f740a6a5503..134343310e8 100644 --- a/usr.sbin/mopd/mopchk/mopchk.c +++ b/usr.sbin/mopd/mopchk/mopchk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mopchk.c,v 1.21 2023/09/06 11:03:30 jsg Exp $ */ +/* $OpenBSD: mopchk.c,v 1.22 2024/09/20 02:00:46 jsg Exp $ */ /* * Copyright (c) 1995-96 Mats O Jansson. All rights reserved. @@ -132,7 +132,7 @@ main(int argc, char **argv) if (GetMopFileInfo(&dl, INFO_PRINT) < 0) { printf("Some failure in GetMopFileInfo\n"); } - }; + } } (void)close(dl.ldfd); } diff --git a/usr.sbin/npppd/npppd/npppd_subr.c b/usr.sbin/npppd/npppd/npppd_subr.c index 7096ebb26f5..efadb216e05 100644 --- a/usr.sbin/npppd/npppd/npppd_subr.c +++ b/usr.sbin/npppd/npppd/npppd_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: npppd_subr.c,v 1.22 2024/08/22 07:56:47 florian Exp $ */ +/* $OpenBSD: npppd_subr.c,v 1.23 2024/09/20 02:00:46 jsg Exp $ */ /*- * Copyright (c) 2009 Internet Initiative Japan Inc. @@ -69,7 +69,7 @@ skip_space(const char *s) { const char *r; for (r = s; *r != '\0' && isspace((unsigned char)*r); r++) - ;; /* skip */ + ; /* skip */ return r; } diff --git a/usr.sbin/relayd/util.c b/usr.sbin/relayd/util.c index 65d6660e40d..751e82c43c8 100644 --- a/usr.sbin/relayd/util.c +++ b/usr.sbin/relayd/util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: util.c,v 1.4 2023/06/21 07:49:24 claudio Exp $ */ +/* $OpenBSD: util.c,v 1.5 2024/09/20 02:00:46 jsg Exp $ */ /* * Copyright (c) 2006 - 2015 Reyk Floeter <reyk@openbsd.org> @@ -149,7 +149,7 @@ host_status(enum host_status status) return ("unknown"); case HOST_UP: return ("up"); - }; + } /* NOTREACHED */ return ("invalid"); } @@ -173,7 +173,7 @@ table_check(enum table_check check) return ("send expect"); case CHECK_SCRIPT: return ("script"); - }; + } /* NOTREACHED */ return ("invalid"); } @@ -195,7 +195,7 @@ relay_state(enum relay_state state) return ("closed"); case STATE_DONE: return ("done"); - }; + } /* NOTREACHED */ return ("invalid"); } diff --git a/usr.sbin/tftpd/tftpd.c b/usr.sbin/tftpd/tftpd.c index aec254a4550..42839be10b0 100644 --- a/usr.sbin/tftpd/tftpd.c +++ b/usr.sbin/tftpd/tftpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tftpd.c,v 1.51 2024/05/21 05:00:48 jsg Exp $ */ +/* $OpenBSD: tftpd.c,v 1.52 2024/09/20 02:00:46 jsg Exp $ */ /* * Copyright (c) 2012 David Gwynne <dlg@uq.edu.au> @@ -544,7 +544,7 @@ rewrite_res(int fd, short events, void *arg) tftp_open(client, filename); free(filename); - }; + } } int diff --git a/usr.sbin/vmd/sev.c b/usr.sbin/vmd/sev.c index b61034b33a2..11eed72b474 100644 --- a/usr.sbin/vmd/sev.c +++ b/usr.sbin/vmd/sev.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sev.c,v 1.1 2024/09/11 15:42:52 bluhm Exp $ */ +/* $OpenBSD: sev.c,v 1.2 2024/09/20 02:00:46 jsg Exp $ */ /* * Copyright (c) 2023, 2024 Hans-Joerg Hoexer <hshoexer@genua.de> @@ -64,7 +64,7 @@ sev_init(struct vmd_vm *vm) if (psp_launch_start(&handle) < 0) { log_warnx("%s: launch failed", __func__); return (-1); - }; + } vm->vm_sev_handle = handle; if (psp_get_gstate(vm->vm_sev_handle, NULL, NULL, &gstate)) { |