From nobody Sun Feb 8 11:24:45 2026 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=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1726667137000755.7568225842325; Wed, 18 Sep 2024 06:45:36 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id EE7821C05; Wed, 18 Sep 2024 09:45:35 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id F23461BB4; Wed, 18 Sep 2024 09:42:27 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id E2BE71AFC; Wed, 18 Sep 2024 09:42:13 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 12B061AD5 for ; Wed, 18 Sep 2024 09:42:13 -0400 (EDT) Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-226-sA7jPWExMNyMGRdeWLXY-Q-1; Wed, 18 Sep 2024 09:42:11 -0400 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-42cb830ea86so48337435e9.3 for ; Wed, 18 Sep 2024 06:42:11 -0700 (PDT) Received: from wheatley.localdomain (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42e70537c71sm17421065e9.31.2024.09.18.06.42.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Sep 2024 06:42:09 -0700 (PDT) Received: from wheatley.brq.redhat.com (wheatley.k8r.cz [127.0.0.1]) by wheatley.localdomain (Postfix) with ESMTP id B91C724F687B; Wed, 18 Sep 2024 15:42:07 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1726666932; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gPzZbE8iXZXbiQDMamZvWZ8nAL/sdm1MFEB/Ypo5yyQ=; b=DSb8wGX2wjyg6z/hdghMot07bPvDnNCzG5wgbcaHo+13XRFFnMH8joSoMKTbOLGwQxIxWH igSU7dGnJNuFGF66nw2Shj4DdxFVSNIk1GRR39QliEx/Be7/mrhIMXiIVkGI5iNaboIxoH uDXPkV5Tuu8Tk4Y1+Ju5j5+NgPfdmYY= X-MC-Unique: sA7jPWExMNyMGRdeWLXY-Q-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726666930; x=1727271730; 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=gPzZbE8iXZXbiQDMamZvWZ8nAL/sdm1MFEB/Ypo5yyQ=; b=lr+FJxDaSQjwTRG2jinkk1NqMDKz8LKU6VqzFLgnl42fZPeTtIWxCyf5Vu+XaUT+0A +TyOYgefRovT7nvXKSlbSxydihYerWqAQyJgz4EeIrzBrZdaBDhEzG3BRCHpxU5YwYj1 V/R5ARWOL1QjHzArf9s6ZnGzviXGkStnEW7STPXCVVE8uRCi6yJ0YsMbTB2FU9dol6OH dTMI1+zYrobgRckTatOSLw7sbL3kO9ZeN8S8dYNGn4BumWQK9Hw0evHngHY0sZA4S1Mk 5m0ZMStYSzAlnQk0ChhTqfGtpvKO/h9CwH1aeRZV8IIv+zSPwnAAT+w863h8V0CGmgb/ K3Ng== X-Gm-Message-State: AOJu0Yy4owtnC7Pvu/K7LWdiiL60AsWeg4GgUxNKuPzS6mkBSOpPbnA8 LxBly8C3G1n/hT03U74bLxK48oWkdDjEY2AjSIb0Qp29Y7s4ywRkw2jOVl0V7Ekb6UhWwJTKXh/ PBprQw6vMzFlrWWoaQDpGDf0E94KxXKAhF3ED0FlEjrUx4Xe1nV+6iHrQ4WJtCHo= X-Received: by 2002:a05:600c:3108:b0:42c:be90:fa2f with SMTP id 5b1f17b1804b1-42cdb5662bfmr178959755e9.25.1726666930308; Wed, 18 Sep 2024 06:42:10 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHsGvUHJbDRSsOjxMjFj/WOfXRGw0NRiaJIt1Nxr+GaNGbYL2vkudfxQgTX6TfSmw0c82rLyw== X-Received: by 2002:a05:600c:3108:b0:42c:be90:fa2f with SMTP id 5b1f17b1804b1-42cdb5662bfmr178959545e9.25.1726666929813; Wed, 18 Sep 2024 06:42:09 -0700 (PDT) From: Martin Kletzander To: devel@lists.libvirt.org Subject: [PATCH 6/8] qemu_domain: Set memoryBackingDir in private data upon start Date: Wed, 18 Sep 2024 15:42:04 +0200 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: UX3U5PCZACDBTMKQ3QAFCC2VWTKVV4HM X-Message-ID-Hash: UX3U5PCZACDBTMKQ3QAFCC2VWTKVV4HM X-MailFrom: mkletzan@redhat.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: Michael Galaxy 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: 1726667137980116600 Content-Type: text/plain; charset="utf-8"; x-default="true" This way we keep the path for each running VM. Signed-off-by: Martin Kletzander --- src/qemu/qemu_domain.c | 17 +++++++++++++++-- tests/qemustatusxml2xmldata/backup-pull-in.xml | 1 + .../blockjob-blockdev-in.xml | 1 + .../blockjob-mirror-in.xml | 1 + .../migration-in-params-in.xml | 1 + .../migration-out-nbd-bitmaps-in.xml | 1 + .../migration-out-nbd-out.xml | 1 + .../migration-out-nbd-tls-out.xml | 1 + .../migration-out-params-in.xml | 1 + tests/qemustatusxml2xmldata/modern-in.xml | 1 + tests/qemustatusxml2xmldata/upgrade-out.xml | 1 + tests/qemustatusxml2xmldata/vcpus-multi-in.xml | 1 + 12 files changed, 26 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 577c53050651..fd7c7fd56218 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1757,12 +1757,17 @@ qemuDomainSetPrivateMemPath(qemuDomainObjPrivate *p= riv, =20 =20 /* This is the old way of setting up per-domain directories */ -static void +static int qemuDomainSetPrivatePathsOld(virQEMUDriver *driver, virDomainObj *vm) { qemuDomainObjPrivate *priv =3D vm->privateData; g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); + const char *root =3D priv->driver->embeddedRoot; + g_autofree char *domname =3D virDomainDefGetShortName(vm->def); + + if (!domname) + return -1; =20 if (!priv->libDir) priv->libDir =3D g_strdup_printf("%s/domain-%s", cfg->libDir, vm->= def->name); @@ -1770,6 +1775,10 @@ qemuDomainSetPrivatePathsOld(virQEMUDriver *driver, if (!priv->channelTargetDir) priv->channelTargetDir =3D g_strdup_printf("%s/domain-%s", cfg->channelTargetDir, vm= ->def->name); + + qemuDomainSetPrivateMemPath(priv, cfg, root, domname); + + return 0; } =20 =20 @@ -1779,6 +1788,7 @@ qemuDomainSetPrivatePaths(virQEMUDriver *driver, { g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); qemuDomainObjPrivate *priv =3D vm->privateData; + const char *root =3D priv->driver->embeddedRoot; g_autofree char *domname =3D virDomainDefGetShortName(vm->def); =20 if (!domname) @@ -1791,6 +1801,8 @@ qemuDomainSetPrivatePaths(virQEMUDriver *driver, priv->channelTargetDir =3D g_strdup_printf("%s/%s", cfg->channelTargetDir, do= mname); =20 + qemuDomainSetPrivateMemPath(priv, cfg, root, domname); + return 0; } =20 @@ -3396,7 +3408,8 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, =20 priv->memoryBackingDir =3D virXPathString("string(./memoryBackingDir/@= path)", ctxt); =20 - qemuDomainSetPrivatePathsOld(driver, vm); + if (qemuDomainSetPrivatePathsOld(driver, vm) < 0) + return -1; =20 if (virCPUDefParseXML(ctxt, "./cpu", VIR_CPU_TYPE_GUEST, &priv->origCP= U, false) < 0) diff --git a/tests/qemustatusxml2xmldata/backup-pull-in.xml b/tests/qemusta= tusxml2xmldata/backup-pull-in.xml index e7fdc6c47832..2cedcc3cf227 100644 --- a/tests/qemustatusxml2xmldata/backup-pull-in.xml +++ b/tests/qemustatusxml2xmldata/backup-pull-in.xml @@ -231,6 +231,7 @@ + diff --git a/tests/qemustatusxml2xmldata/blockjob-blockdev-in.xml b/tests/q= emustatusxml2xmldata/blockjob-blockdev-in.xml index 380ef053d2b8..1c45fad370c4 100644 --- a/tests/qemustatusxml2xmldata/blockjob-blockdev-in.xml +++ b/tests/qemustatusxml2xmldata/blockjob-blockdev-in.xml @@ -230,6 +230,7 @@ + diff --git a/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml b/tests/qem= ustatusxml2xmldata/blockjob-mirror-in.xml index 1bcdeffcb876..df11e83cedb5 100644 --- a/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml +++ b/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml @@ -21,6 +21,7 @@ + diff --git a/tests/qemustatusxml2xmldata/migration-in-params-in.xml b/tests= /qemustatusxml2xmldata/migration-in-params-in.xml index 03773a089b3a..861d8eeadb92 100644 --- a/tests/qemustatusxml2xmldata/migration-in-params-in.xml +++ b/tests/qemustatusxml2xmldata/migration-in-params-in.xml @@ -254,6 +254,7 @@ + diff --git a/tests/qemustatusxml2xmldata/migration-out-nbd-bitmaps-in.xml b= /tests/qemustatusxml2xmldata/migration-out-nbd-bitmaps-in.xml index 4ee44ffbd480..5d76545513cc 100644 --- a/tests/qemustatusxml2xmldata/migration-out-nbd-bitmaps-in.xml +++ b/tests/qemustatusxml2xmldata/migration-out-nbd-bitmaps-in.xml @@ -320,6 +320,7 @@ + EPYC-Rome AMD diff --git a/tests/qemustatusxml2xmldata/migration-out-nbd-out.xml b/tests/= qemustatusxml2xmldata/migration-out-nbd-out.xml index de92146eaacb..581cf2828605 100644 --- a/tests/qemustatusxml2xmldata/migration-out-nbd-out.xml +++ b/tests/qemustatusxml2xmldata/migration-out-nbd-out.xml @@ -257,6 +257,7 @@ + diff --git a/tests/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml b/te= sts/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml index 6bdd12825969..dacaa3e42f42 100644 --- a/tests/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml +++ b/tests/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml @@ -286,6 +286,7 @@ + diff --git a/tests/qemustatusxml2xmldata/migration-out-params-in.xml b/test= s/qemustatusxml2xmldata/migration-out-params-in.xml index 24ee86e4c04e..b914236b62fc 100644 --- a/tests/qemustatusxml2xmldata/migration-out-params-in.xml +++ b/tests/qemustatusxml2xmldata/migration-out-params-in.xml @@ -268,6 +268,7 @@ + diff --git a/tests/qemustatusxml2xmldata/modern-in.xml b/tests/qemustatusxm= l2xmldata/modern-in.xml index f0f5df84ab20..3b3e83175997 100644 --- a/tests/qemustatusxml2xmldata/modern-in.xml +++ b/tests/qemustatusxml2xmldata/modern-in.xml @@ -258,6 +258,7 @@ + diff --git a/tests/qemustatusxml2xmldata/upgrade-out.xml b/tests/qemustatus= xml2xmldata/upgrade-out.xml index e663b3dbb5e9..c7bc7128df60 100644 --- a/tests/qemustatusxml2xmldata/upgrade-out.xml +++ b/tests/qemustatusxml2xmldata/upgrade-out.xml @@ -256,6 +256,7 @@ + diff --git a/tests/qemustatusxml2xmldata/vcpus-multi-in.xml b/tests/qemusta= tusxml2xmldata/vcpus-multi-in.xml index fa6a6a99f480..6ee688ce037d 100644 --- a/tests/qemustatusxml2xmldata/vcpus-multi-in.xml +++ b/tests/qemustatusxml2xmldata/vcpus-multi-in.xml @@ -307,6 +307,7 @@ + --=20 2.46.0