From nobody Thu Feb 06 16:27:37 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YpjF60P2Dz5mh5c; Thu, 06 Feb 2025 16:27:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YpjF54y3Cz4MsH; Thu, 06 Feb 2025 16:27:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738859257; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BllM5R94kPTmrOSw2U7naXwiTw0MEfLTXs/IsQz0mUc=; b=sBAIkMK208PS+7hmgVk5/kmWd1tAv2DA7GxZzPB+/m9roTw+/tVVXIopc39oryj8pFl3aI J8xLAKO9aW4xP7Facce4nBxpBR5EVDzdZs5r7+VhFZR6PCGVBKFO+/proQq1SjiNSP/jHC FAVDUeclsCYPmRnFhc0LQ4MTSyH+6VsZPARniGtRiuwxsNCFWnt0UofIhm3IqbmVbANiz4 hxh3F1hPwWeem2FikpE6NUSvaakhKPx7C358Erd9mWyUVChl/snrwhIjyu6c4u0v+hSY6B fRy8Ss3MrVv9qT0lFb8ZEkBCBGqHj00+NIrU2n4E51pg1TfaGwPH+i7Uqd+svQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738859257; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BllM5R94kPTmrOSw2U7naXwiTw0MEfLTXs/IsQz0mUc=; b=KplGVp6Xs3ge/CzbQ81DNclZ9HsyFUFFpDv//gNJ18cwsL6XdSL3dfZVFOma/TEnLy0is5 8Rb9HGOdTTn97mlnH078tlQNPkPvglJReiKwtOkDBS/syHZrTa1F1RHdE4/6Qv4JjhWo05 M/W26Qde4MJz3ZSX6/JsquVD46IlMliLuQLXWDTjbPOzFWVhugrQ2ZB3q/1W8Bziv517Xr ROH01yTbm7ogzP8vAmT1+6d8K96YUUsbbmSCQPMv0HuHpkydru55FzOEv0rUtEqVp5Ue02 zFr+i4MCQqy4O3Vl6QnbaWjMgYDWlq6HY3ga06cLUWC7zPHnpEHvtw3gqWcOuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738859257; a=rsa-sha256; cv=none; b=A5xpiJpe0mC0aR4vZRqITBWFL+70LTdDFkI8tIJr+6yv+IIDE3xogH2Ol+9fqAp02cy+G9 VZQ6UnPp3hhCHuJbuIqgPCU2OLxosO4OEm4gez4GCkbJtWcOxzcNvYBZmG/XLLsPCngcFk 3ElKdickq7Xv3mgQ+qxANsBovk/wiGV97mP5rle63Lyosd3PYChT5cqurLUam9RUqkfUOB jp48lQRZ3LqAMLyBazHMIW9Z9qh4FCVe3tWSmhM9o+digQf2FWIa4kaHpkF3IyINWWnUhW H81ZmhGna58VqATmO7hnQ/BGulftRRLItxVF/yl0tX80AYN4fuAKp+7IO65zEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YpjF54N4rzmFR; Thu, 06 Feb 2025 16:27:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 516GRb3D095524; Thu, 6 Feb 2025 16:27:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 516GRb5t095521; Thu, 6 Feb 2025 16:27:37 GMT (envelope-from git) Date: Thu, 6 Feb 2025 16:27:37 GMT Message-Id: <202502061627.516GRb5t095521@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 23a28fe7776f - main - libvmmapi: Fix auto-loading of vmm.ko List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 23a28fe7776f6d76643a6ac16758d114dfbbeec2 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=23a28fe7776f6d76643a6ac16758d114dfbbeec2 commit 23a28fe7776f6d76643a6ac16758d114dfbbeec2 Author: Mark Johnston AuthorDate: 2025-02-06 14:37:46 +0000 Commit: Mark Johnston CommitDate: 2025-02-06 16:25:42 +0000 libvmmapi: Fix auto-loading of vmm.ko - We should autoload vmm.ko when creating a VM with vm_openf(), to preserve behaviour prior to commit 99127fd10362. - kldload(2) returns a non-zero value upon success, so the existing code was wrong. Reviewed by: jhb Reported by: olivier Fixes: 99127fd10362 ("libvmmapi: Use the vmmctl device file to create and destroy VMs") Differential Revision: https://reviews.freebsd.org/D48797 --- lib/libvmmapi/vmmapi.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/lib/libvmmapi/vmmapi.c b/lib/libvmmapi/vmmapi.c index 5042a1f3914e..a1a5d56ff8a2 100644 --- a/lib/libvmmapi/vmmapi.c +++ b/lib/libvmmapi/vmmapi.c @@ -90,6 +90,14 @@ vm_device_open(const char *name) return (open(devpath, O_RDWR)); } +static int +vm_ctl_open(void) +{ + if (modfind("vmm") < 0) + (void)kldload("vmm"); + return (open("/dev/vmmctl", O_RDWR, 0)); +} + static int vm_ctl_create(const char *name, int ctlfd) { @@ -108,16 +116,10 @@ vm_create(const char *name) { int error, fd; - /* Try to load vmm(4) module before creating a guest. */ - if (modfind("vmm") < 0) { - error = kldload("vmm"); - if (error != 0) - return (-1); - } - - fd = open("/dev/vmmctl", O_RDWR, 0); + fd = vm_ctl_open(); if (fd < 0) - return (fd); + return (-1); + error = vm_ctl_create(name, fd); if (error != 0) { error = errno; @@ -153,7 +155,7 @@ vm_openf(const char *name, int flags) strcpy(vm->name, name); memset(vm->memsegs, 0, sizeof(vm->memsegs)); - if ((vm->ctlfd = open("/dev/vmmctl", O_RDWR, 0)) < 0) + if ((vm->ctlfd = vm_ctl_open()) < 0) goto err; vm->fd = vm_device_open(vm->name);