From nobody Fri Dec 19 21:51:42 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1746810949054733.2014696664636; Fri, 9 May 2025 10:15:49 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 6A77F1735; Fri, 9 May 2025 13:15:48 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id C3B811805; Fri, 9 May 2025 13:13:23 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 68964178D; Fri, 9 May 2025 13:13:15 -0400 (EDT) Received: from mail-ed1-f51.google.com (mail-ed1-f51.google.com [209.85.208.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id D1258175E for ; Fri, 9 May 2025 13:13:04 -0400 (EDT) Received: by mail-ed1-f51.google.com with SMTP id 4fb4d7f45d1cf-5f7ec0e4978so4268972a12.1 for ; Fri, 09 May 2025 10:13:04 -0700 (PDT) Received: from tulp.my.domain (80-115-115-199.cable.dynamic.v4.ziggo.nl. [80.115.115.199]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5fcb3773b04sm581106a12.10.2025.05.09.10.13.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 May 2025 10:13:01 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746810783; x=1747415583; darn=lists.libvirt.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ceITU7dPeFpCiahH6tNcp5qrqKOt7BV51G7EadIWkJs=; b=GyldilOX7FpKEf8TjiXA1M5skiznZtU+kHKnJXsERG/BEWp2RWnQc2US96GVJhBAky EOWOJL9JgdHQErhgoVbwA7KyXLHzkxaif0DVfp8yXBQk/n7pe95GUQKQzu/1fBpDcLUd WMqxXpWt0/2jKWjEf+VHaz6yKKUCXgaUijXM/C+YrKD/7Kir6fD2P88iBgVnadw2XaQg ASGVayww2CU7AEf5NdmKgEJ+jXFSBQmT5UUeUq26NhvbhUmQkgDgE2qa2lLnYCQbaxju ho+GVkZ2KX0ohNqXzXjhC6tg3feKhRj2rarjMbokHopaqU/rNU1h713DgcW8bNZHd8Jp 88CA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746810783; x=1747415583; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ceITU7dPeFpCiahH6tNcp5qrqKOt7BV51G7EadIWkJs=; b=ObeXMXk1F8teMGUqzZXRim69gd2d4Fj991p68CMpabHeBdV/R6eoohtVV8YSoiysfB LJ8IRFLUj9UOV264nLFXhFnHMQO951NRl88QSbvJhco+nz4o4Ox4DDoKHjWa0Y+WW0Qw N8Ukac2C6ScSWux0txOF45nwToHeoFJb00cUinTzB0xF+fG0qN8D6BgFAJectdSJyMvp MJaXE1sYtQ2BozdQIsjEG4oPH9AhmhcmzCU5gjfyqd1SCq7nJKFxKsEJmwuk8KIRzP2D bbtr+Ggz262M+giSIyVoLiqmdOdaX7Gagw6u4i0e/3pS0SLSymq2XJonfipp5AMv6t4q xteA== X-Gm-Message-State: AOJu0Yxa603i2XXIMmrBqR4JeEyXcFrRMLXNKa3ihUCjZ4hxBmRPaO4b JSQL7qgKAX42Fc4SOoV4XQ623HobBcY6jlsFDY6KBbVmw6YHye/NbKMh8+cD1yoZTw== X-Gm-Gg: ASbGncsrkxImW3AABi44Q2s7LbgmkNNh4mbS83Xm4wKbKFQvHBMl0oFWnl2n1RD82xE rTWsyibg0nKYQFpLaHIJTxHp17x08jTt7rfMVN9NBWH+4ZCVpRkudhvNQl4/ESrh7H/+76e6e+A ryJBKXCD2umu9s+EFTfxM/PG9t3QrFxvILjnpcFVhM/BD+YRL+6xuDiw6YN+P1L04AK1pZkYPA6 Gck1MGITTfvlVXtR+y9njj/D3aF+srYH9drYqk0zromwhsQyUYRXJ7EhnP/hKgmmNRo03smC/+/ MD9rCqlycrbtg/yi0i+1ZQ6YrDaBh3oxPTPsfie4g2OtUo69Q/ruJdWqSDBNxvJogf3YS8DSWIc i9E66oDjhB0v9xA== X-Google-Smtp-Source: AGHT+IGdrGVWnT+dvALBN+5Ng+IJTO+7Z0sM/k6clb1UC1OteghQCEfJ0f2yG5Gzs/IYhswiT0S7Hw== X-Received: by 2002:a05:6402:90a:b0:5fb:d4a5:a3c2 with SMTP id 4fb4d7f45d1cf-5fca0759839mr3461741a12.10.1746810782823; Fri, 09 May 2025 10:13:02 -0700 (PDT) From: Roman Bogorodskiy To: devel@lists.libvirt.org Subject: [PATCH 5/5] bhyve: support removing NVRAM on domain undefine Date: Fri, 9 May 2025 19:11:51 +0200 Message-ID: <20250509171151.31305-6-bogorodskiy@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250509171151.31305-1-bogorodskiy@gmail.com> References: <20250509171151.31305-1-bogorodskiy@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: JASWWDCANDXIXVMYGTSJF5GTTETWP6VJ X-Message-ID-Hash: JASWWDCANDXIXVMYGTSJF5GTTETWP6VJ X-MailFrom: bogorodskiy@gmail.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: Roman Bogorodskiy X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1746810950455019000 Content-Type: text/plain; charset="utf-8" Signed-off-by: Roman Bogorodskiy --- src/bhyve/bhyve_driver.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 684346952d..db7d440a97 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -533,9 +533,19 @@ bhyveDomainUndefineFlags(virDomainPtr domain, unsigned= int flags) struct _bhyveConn *privconn =3D domain->conn->privateData; virObjectEvent *event =3D NULL; virDomainObj *vm; + g_autofree char *nvram_path =3D NULL; int ret =3D -1; =20 - virCheckFlags(0, -1); + virCheckFlags(VIR_DOMAIN_UNDEFINE_NVRAM | + VIR_DOMAIN_UNDEFINE_KEEP_NVRAM, -1); + + if ((flags & VIR_DOMAIN_UNDEFINE_NVRAM) && + (flags & VIR_DOMAIN_UNDEFINE_KEEP_NVRAM)) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("cannot both keep and delete nvram")); + return -1; + } + if (!(vm =3D bhyveDomObjFromDomain(domain))) goto cleanup; =20 @@ -548,6 +558,26 @@ bhyveDomainUndefineFlags(virDomainPtr domain, unsigned= int flags) goto cleanup; } =20 + if (vm->def->os.loader && vm->def->os.loader->nvram && + virStorageSourceIsLocalStorage(vm->def->os.loader->nvram)) { + nvram_path =3D g_strdup(vm->def->os.loader->nvram->path); + } + + if (nvram_path && virFileExists(nvram_path)) { + if ((flags & VIR_DOMAIN_UNDEFINE_NVRAM)) { + if (unlink(nvram_path) < 0) { + virReportSystemError(errno, + _("failed to remove nvram: %1$s"), + nvram_path); + goto cleanup; + } + } else if (!(flags & VIR_DOMAIN_UNDEFINE_KEEP_NVRAM)) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("cannot undefine domain with nvram")); + goto cleanup; + } + } + if (virDomainDeleteConfig(BHYVE_CONFIG_DIR, BHYVE_AUTOSTART_DIR, vm) < 0) --=20 2.49.0