From nobody Sun Feb 8 20:26:35 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 1727092287066683.2157378986027; Mon, 23 Sep 2024 04:51:27 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 448231750; Mon, 23 Sep 2024 07:51:25 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id EAF29173C; Mon, 23 Sep 2024 07:48:21 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id ED90913F7; Mon, 23 Sep 2024 07:48:06 -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 46E831414 for ; Mon, 23 Sep 2024 07:48:06 -0400 (EDT) Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-664-NrPmc6X0PheA8VZTQKsWlw-1; Mon, 23 Sep 2024 07:48:04 -0400 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-a8d2e6a69b6so354176366b.2 for ; Mon, 23 Sep 2024 04:48:04 -0700 (PDT) Received: from wheatley.localdomain (37-188-137-5.red.o2.cz. [37.188.137.5]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a90611164d0sm1207898766b.91.2024.09.23.04.48.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Sep 2024 04:48:02 -0700 (PDT) Received: from wheatley.pinto-pinecone.ts.net (wheatley.k8r.cz [127.0.0.1]) by wheatley.localdomain (Postfix) with ESMTP id 9A3FC26732EC for ; Mon, 23 Sep 2024 13:48:00 +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.6 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=1727092086; 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: in-reply-to:in-reply-to:references:references; bh=j+TZgQqel5Hdn4Q3Sp4KkTYCAamhh3IS0zYdE4JJqLA=; b=RFyEGhsuirb9lwCHxdp5rSDKYp6Zb/O9GluZd45xaupD5D0maSyvXyWvCpW6N96pxGteCA MoCwWXE5rEf9v6bSkiJNv9uE7+9ZeptKKx3A2yFz6MqSFL3jkpRhh0wJIZQ9YOBpoWOr8O F3ChC0tcAZTrqrg6ylvdyj9p45d0Gx8= X-MC-Unique: NrPmc6X0PheA8VZTQKsWlw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727092083; x=1727696883; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=j+TZgQqel5Hdn4Q3Sp4KkTYCAamhh3IS0zYdE4JJqLA=; b=Vb0S+M2GWiR3FO1DeDnkv7O/Rn0fjYAzjdqLDifZYM2ure7gWCAX+ZuxNI60DBNqRX rNbIUbtkSInIIl1v2NE1fz0+nMFZr6Da1RjzQ3iWItoJHdCNn0sPsUPhAH3jrq8EjlBQ 1w7F1frzuyIvjp69phHlnyzIos7LLm/zLW8FdD4H5sAm88aCTK8DuZ2yJKXjLgFaPQpp 2BDAhruQr2gZ2M1Q8ImILgDrAd0IQWGBsY1nlpl6BTKVdS8QiXgveSLKfomcrQHpKvtS HkJp9C+SGvhaaKDRVNMwYnhfHBx0FkpyXlA5Qf0iolYlJvNNEjpCQhvCTJ69elePDwkQ +Lag== X-Gm-Message-State: AOJu0Yzh7ss9MLcvtAoYjNn/fnd9gI8ktyK8Gf3u8CRFioPCiRJGPCO6 NQrUYLd/VloRsJTH4UDxczHEQRaS9A8HaOQuG1Se421u/wI26tRS9FymGCLsMlE7tNMuvzTK7V1 ToDPXFN1QTzC2l2DGQr8zMzTr7RXr37ZZjuObJBi1JMbnrdjacJe+29RfmoJVLY4ZJfPoE7i3E8 a1l7RXETJsJsmPF2Cnnc7PZgf92kMT1326jwuQJGY= X-Received: by 2002:a17:906:f59b:b0:a86:a30f:4aef with SMTP id a640c23a62f3a-a90d56db444mr1104717366b.22.1727092083405; Mon, 23 Sep 2024 04:48:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEqGykdXceoIvCw0A5CA+x1glYBH+GIxeDObT1z9kuIPwPtpu7YJGNAi3Jm3JEOLMuWJ4AOHg== X-Received: by 2002:a17:906:f59b:b0:a86:a30f:4aef with SMTP id a640c23a62f3a-a90d56db444mr1104715366b.22.1727092082889; Mon, 23 Sep 2024 04:48:02 -0700 (PDT) From: Martin Kletzander To: devel@lists.libvirt.org Subject: [PATCH v2 4/8] qemu: Set memoryBackingDir in private data upon start Date: Mon, 23 Sep 2024 13:47:54 +0200 Message-ID: X-Mailer: git-send-email 2.46.1 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: SQYVWU7B43PE4PA2DX6NQ7FQLWYWTWY5 X-Message-ID-Hash: SQYVWU7B43PE4PA2DX6NQ7FQLWYWTWY5 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 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: 1727092288907116600 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 76bcb70a5699..b05b1c9647a8 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1795,7 +1795,7 @@ qemuGetMemoryBackingPath(qemuDomainObjPrivate *priv, =20 =20 /* This is the old way of setting up per-domain directories */ -static void +static int qemuDomainSetPrivatePathsOld(virQEMUDriver *driver, virDomainObj *vm) { @@ -1808,6 +1808,13 @@ qemuDomainSetPrivatePathsOld(virQEMUDriver *driver, if (!priv->channelTargetDir) priv->channelTargetDir =3D g_strdup_printf("%s/domain-%s", cfg->channelTargetDir, vm= ->def->name); + + if (!priv->memoryBackingDir && + qemuGetMemoryBackingDomainPath(priv, vm->def, + &priv->memoryBackingDir) < 0) + return -1; + + return 0; } =20 =20 @@ -1829,6 +1836,11 @@ qemuDomainSetPrivatePaths(virQEMUDriver *driver, priv->channelTargetDir =3D g_strdup_printf("%s/%s", cfg->channelTargetDir, do= mname); =20 + if (!priv->memoryBackingDir && + qemuGetMemoryBackingDomainPath(priv, vm->def, + &priv->memoryBackingDir) < 0) + return -1; + return 0; } =20 @@ -3434,7 +3446,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.1