From nobody Sun Feb 8 18:04: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 1727092145869413.8228249162986; Mon, 23 Sep 2024 04:49:05 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id C34281485; Mon, 23 Sep 2024 07:49:04 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 4E93116C2; Mon, 23 Sep 2024 07:48:10 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 971B012F2; Mon, 23 Sep 2024 07:48:05 -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 02F2E12F2 for ; Mon, 23 Sep 2024 07:48:04 -0400 (EDT) Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-278-ANTQGy1RP7WQiQ-OaMFLqg-1; Mon, 23 Sep 2024 07:48:03 -0400 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-a8a8308cceaso543440166b.0 for ; Mon, 23 Sep 2024 04:48:03 -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-a90612e5731sm1213369466b.183.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:01 -0700 (PDT) Received: from wheatley.pinto-pinecone.ts.net (wheatley.k8r.cz [127.0.0.1]) by wheatley.localdomain (Postfix) with ESMTP id 7829B26732E9 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=1727092084; 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=m1ghKEy9uYpTvCovAoaZcIIr4TFMK2dugFQyzODzn6g=; b=ERKmZ0SN/g8WMdXoS532PEpDOE4j1WtsKTv3oL/HanSaske+XjOy2GBNAlmu4GSILaJvm4 RMqMoX7sLBMUszM+jE78Q6088CmvJESYSZhkdMqze82bGvW/2fIX7nKWMZzxsCDm0LIg71 eFWvYN6hVba6Ver59WiiTj5IgS/8NsI= X-MC-Unique: ANTQGy1RP7WQiQ-OaMFLqg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727092082; x=1727696882; 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=m1ghKEy9uYpTvCovAoaZcIIr4TFMK2dugFQyzODzn6g=; b=tf8u9xmLvQf4jK9HHJb42U1+HhKgODJ5JCUhIDFLOrpw6GdEofmMqD0pNVXsBLduj3 ExG4NIK3fYbnXnKqd5qOUTUxabEEI668+LAZj/R+xCGlZ9kOKRTfeR5PW+fPDQGOx2dx bzqrKtbfFplzp8Gu7AAF35lfMaQns6SVveJKeCMVTWF0yw+Jb9MRwnEZ3AjeH3SvWJC7 zU+QGKD4uJwlJFaGsQ1/fYUWpqu3K8trHVsmR13B4AU5K9reX8D4gjX7eC3y29NdbKol 74wyUkKQEJAIa877yDSfUERsAY184kSbBU88FI+0UfEUvlLrv0MjwT+vTTMEuWjZWRfB ZnGg== X-Gm-Message-State: AOJu0Ywky8GUuyVn5Cn9GyXlWD6mb9mjt9fk3GrBOn3pt9f2hk2tO5jg 8fFim3Sme89hAuyxOxOm1XDpXd6k3bfTE7dqL0APQnWTed+DcPfFvrXQyxIo6NxRmb0Y/XUKgrt 26bdby0ZG7L8oBu2zinERHa2HAdDD0zkrD4TSEJDnZIWR7Fb6f6BWJ/XSwxzbgV6Cpq5R5sZv4A 8JfFTWE5heClqRYLzEjM59fcogQR4ZiY45XjT5M4A= X-Received: by 2002:a17:906:f58e:b0:a8d:481a:563a with SMTP id a640c23a62f3a-a90c1d6e848mr1591828166b.25.1727092082311; Mon, 23 Sep 2024 04:48:02 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEIPs1qOkWUmgSLvk096vzlZtOjOQjFJRcWi/mhSeV0WnFievZIeKWvoaAgbTMsxHLhZ7z/5A== X-Received: by 2002:a17:906:f58e:b0:a8d:481a:563a with SMTP id a640c23a62f3a-a90c1d6e848mr1591825766b.25.1727092081868; Mon, 23 Sep 2024 04:48:01 -0700 (PDT) From: Martin Kletzander To: devel@lists.libvirt.org Subject: [PATCH v2 1/8] qemu: Move domain-related functions to qemu_domain Date: Mon, 23 Sep 2024 13:47:51 +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: QHYABSHZ2URB7OBQMXZBRWS7KMBBXH7B X-Message-ID-Hash: QHYABSHZ2URB7OBQMXZBRWS7KMBBXH7B 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: 1727092146297116600 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 | 9 +++++++ 4 files changed, 67 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..cd891fd58f52 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1735,6 +1735,64 @@ qemuDomainSecretPrepare(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; +} + + /* This is the old way of setting up per-domain directories */ static void qemuDomainSetPrivatePathsOld(virQEMUDriver *driver, diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index d799f6c08676..9d897b761e3a 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -936,6 +936,15 @@ void qemuDomainCleanupStorageSourceFD(virStorageSource= *src); =20 void qemuDomainStartupCleanup(virDomainObj *vm); =20 +int qemuGetMemoryBackingDomainPath(virQEMUDriver *driver, + const virDomainDef *def, + char **path); + +int qemuGetMemoryBackingPath(virQEMUDriver *driver, + const virDomainDef *def, + const char *alias, + char **memPath); + int qemuDomainSecretPrepare(virQEMUDriver *driver, virDomainObj *vm) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); --=20 2.46.1