From nobody Mon Feb 9 02:06:26 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 1726666990482680.0968653992697; Wed, 18 Sep 2024 06:43:10 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 6B04C1BD6; Wed, 18 Sep 2024 09:43:09 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 189B91BBC; Wed, 18 Sep 2024 09:42:16 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id F27CA1AD6; Wed, 18 Sep 2024 09:42:11 -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 709B61B03 for ; Wed, 18 Sep 2024 09:42:11 -0400 (EDT) Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-482-roouJeG6Ptq5a8KdIAfJ0Q-1; Wed, 18 Sep 2024 09:42:10 -0400 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-42cb830ea86so48337235e9.3 for ; Wed, 18 Sep 2024 06:42:09 -0700 (PDT) Received: from wheatley.localdomain (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42e704d8a7fsm17655945e9.5.2024.09.18.06.42.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Sep 2024 06:42:07 -0700 (PDT) Received: from wheatley.brq.redhat.com (wheatley.k8r.cz [127.0.0.1]) by wheatley.localdomain (Postfix) with ESMTP id 7C3C024F6876; 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=1726666931; 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=XjJIYQLbNSV6FqH/iwHkqdautA2NfbA12V8/BsJwykQ=; b=QYOvPim34ZFksUdDoLBfm+eZwQqqgZSMojyCuqEDnuKQcW9b0R3kWqpvJhf6NmUSJd41tw MwujZDuXh97dmXdUp5tmGWB/utgriey7fwK+qNoiZ7qMFuJ8QuFnNfgMdA2Bldg9WKkdpe p0Zf66QHM2lm+Err8sxYdmSGUNWJ0m4= X-MC-Unique: roouJeG6Ptq5a8KdIAfJ0Q-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726666929; x=1727271729; 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=XjJIYQLbNSV6FqH/iwHkqdautA2NfbA12V8/BsJwykQ=; b=PLXhfEAMTdN2MdA3nAvPyC2zHfoeyA/TRGxORWQen5bkD8MFLQOJ8jG4Lnk9I93Hea wqDdQspjFDr9PbOycT3gFU2vxFTZtGhio3lu6tMelWXYaHP6mjQROodfflWBSRqcn3qg hZNer55/orY762abDUC5mC9i0nsP1L5Gz5QWc+bZI+JBISyST28sQZA5syQfDcez4MDH CmEKCOKHfiulOAmNiD9C8Ody2PKcv619NmrACGan4dHpH6nyaQX3wyslNETlotdDxD4o PbYjxDKsF/IHB30uXijoeVnCyeQWk/Apyja6HuZ384GzasQjAo5xvaKb7xvDnmozaeM9 zIcQ== X-Gm-Message-State: AOJu0YxJ5XsPol3o8AuzPcGyNWllTxLkTmC94B4E1fe7WpyLvggMSkMV e7oOuwWam/e9GJqD99LGrA00Uwp1nX5nllNAqY1qJ0rkhTZgPVmjlj8qsMl1Hid5UN3BLBJAvwv WTgGqyfjapO2mYlXexazffQV0VnDwp1/NlfBMw3gvi027l1xVFEWrty8kFRPLQO0= X-Received: by 2002:a5d:4e50:0:b0:374:c11c:c5c3 with SMTP id ffacd0b85a97d-378c2d5a7d1mr12004254f8f.41.1726666928805; Wed, 18 Sep 2024 06:42:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGFJmBwlrtJl2ZFeYN75G2zNUMVKSPsox8SqUaFJcxAyAD4D5pX0OGqHlsmrfyWEKd2YL+RDg== X-Received: by 2002:a5d:4e50:0:b0:374:c11c:c5c3 with SMTP id ffacd0b85a97d-378c2d5a7d1mr12004236f8f.41.1726666928369; Wed, 18 Sep 2024 06:42:08 -0700 (PDT) From: Martin Kletzander To: devel@lists.libvirt.org Subject: [PATCH 1/8] qemu: Move domain-related functions to qemu_domain Date: Wed, 18 Sep 2024 15:41:59 +0200 Message-ID: <62d6b5ae529895937a568f53173635625d0685bc.1726666238.git.mkletzan@redhat.com> 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: AU4U4D5W25WPECSXXDS2AV2GA3EDR67P X-Message-ID-Hash: AU4U4D5W25WPECSXXDS2AV2GA3EDR67P 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: 1726666991390116600 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Martin Kletzander --- src/qemu/qemu_conf.c | 58 ------------------------------------------ src/qemu/qemu_conf.h | 8 ------ src/qemu/qemu_domain.c | 58 ++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_domain.h | 8 ++++++ 4 files changed, 66 insertions(+), 66 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index b36bede6c3c6..0d90a8739202 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1603,64 +1603,6 @@ qemuGetDomainHupageMemPath(virQEMUDriver *driver, } =20 =20 -int -qemuGetMemoryBackingDomainPath(virQEMUDriver *driver, - const virDomainDef *def, - char **path) -{ - g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); - const char *root =3D driver->embeddedRoot; - g_autofree char *shortName =3D NULL; - - if (!(shortName =3D virDomainDefGetShortName(def))) - return -1; - - if (root && !STRPREFIX(cfg->memoryBackingDir, root)) { - g_autofree char * hash =3D virDomainDriverGenerateRootHash("qemu",= root); - *path =3D g_strdup_printf("%s/%s-%s", cfg->memoryBackingDir, hash,= shortName); - } else { - *path =3D g_strdup_printf("%s/%s", cfg->memoryBackingDir, shortNam= e); - } - - return 0; -} - - -/** - * qemuGetMemoryBackingPath: - * @driver: the qemu driver - * @def: domain definition - * @alias: memory object alias - * @memPath: constructed path - * - * Constructs path to memory backing dir and stores it at @memPath. - * - * Returns: 0 on success, - * -1 otherwise (with error reported). - */ -int -qemuGetMemoryBackingPath(virQEMUDriver *driver, - const virDomainDef *def, - const char *alias, - char **memPath) -{ - g_autofree char *domainPath =3D NULL; - - if (!alias) { - /* This should never happen (TM) */ - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("memory device alias is not assigned")); - return -1; - } - - if (qemuGetMemoryBackingDomainPath(driver, def, &domainPath) < 0) - return -1; - - *memPath =3D g_strdup_printf("%s/%s", domainPath, alias); - return 0; -} - - int qemuHugepageMakeBasedir(virQEMUDriver *driver, virHugeTLBFS *hugepage) diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index aa1e1a626c1a..c98b6137c1fd 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -368,14 +368,6 @@ int qemuGetDomainHupageMemPath(virQEMUDriver *driver, unsigned long long pagesize, char **memPath); =20 -int qemuGetMemoryBackingDomainPath(virQEMUDriver *driver, - const virDomainDef *def, - char **path); -int qemuGetMemoryBackingPath(virQEMUDriver *driver, - const virDomainDef *def, - const char *alias, - char **memPath); - int qemuHugepageMakeBasedir(virQEMUDriver *driver, virHugeTLBFS *hugepage); =20 diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index ed305d9427f5..550ab5046f00 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -13143,3 +13143,61 @@ qemuDomainStorageUpdatePhysical(virQEMUDriverConfi= g *cfg, =20 return ret; } + + +int +qemuGetMemoryBackingDomainPath(virQEMUDriver *driver, + const virDomainDef *def, + char **path) +{ + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); + const char *root =3D driver->embeddedRoot; + g_autofree char *shortName =3D NULL; + + if (!(shortName =3D virDomainDefGetShortName(def))) + return -1; + + if (root && !STRPREFIX(cfg->memoryBackingDir, root)) { + g_autofree char * hash =3D virDomainDriverGenerateRootHash("qemu",= root); + *path =3D g_strdup_printf("%s/%s-%s", cfg->memoryBackingDir, hash,= shortName); + } else { + *path =3D g_strdup_printf("%s/%s", cfg->memoryBackingDir, shortNam= e); + } + + return 0; +} + + +/** + * qemuGetMemoryBackingPath: + * @driver: the qemu driver + * @def: domain definition + * @alias: memory object alias + * @memPath: constructed path + * + * Constructs path to memory backing dir and stores it at @memPath. + * + * Returns: 0 on success, + * -1 otherwise (with error reported). + */ +int +qemuGetMemoryBackingPath(virQEMUDriver *driver, + const virDomainDef *def, + const char *alias, + char **memPath) +{ + g_autofree char *domainPath =3D NULL; + + if (!alias) { + /* This should never happen (TM) */ + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("memory device alias is not assigned")); + return -1; + } + + if (qemuGetMemoryBackingDomainPath(driver, def, &domainPath) < 0) + return -1; + + *memPath =3D g_strdup_printf("%s/%s", domainPath, alias); + return 0; +} diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index d799f6c08676..e06ee60f4cd9 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -1168,3 +1168,11 @@ int qemuDomainStorageUpdatePhysical(virQEMUDriverConfig *cfg, virDomainObj *vm, virStorageSource *src); + +int qemuGetMemoryBackingDomainPath(virQEMUDriver *driver, + const virDomainDef *def, + char **path); +int qemuGetMemoryBackingPath(virQEMUDriver *driver, + const virDomainDef *def, + const char *alias, + char **memPath); --=20 2.46.0