From nobody Mon Feb 9 00:20:05 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1616689601; cv=none; d=zohomail.com; s=zohoarc; b=jVa18TuQHTk3R4kR9FObJkZg6Cg6uNUfLIOMUN+K3zpZyLZVDnZX4YIEkEoYA64yITHKp6xjl5/265XTWEnBnbrB0NT4JbE0ow6cHJ1ODO3o0ahU03IXIs50MrAM7o6UkU2aZ2a5oY8eS32Apll8Ejylp1J/iIc+133yiA0uBbs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616689601; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=QE6hw45T14W487UPFaSAanfrfDnQc1vl3wMwhbOEfhk=; b=SUTCsmuCVQMpECAbft2UvpSfHp/exO9pUxaYf6sKYHxeaqyosae8kO/loryDjlPL2w93cwKXRyY/wKPFF+C7EZevVnqMovRgiG/MXuRtjomFS4+N4bD8RdLIQOyyQC1JDVZZ43TI670iOPLQ67N51JVESImLLWjS2DRiBE8Zqcc= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1616689601261459.56604989310586; Thu, 25 Mar 2021 09:26:41 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-564-J_0BvgIDOW64qxDOIo9rYQ-1; Thu, 25 Mar 2021 12:26:37 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E20BF8189D8; Thu, 25 Mar 2021 16:26:32 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 259C050AC0; Thu, 25 Mar 2021 16:26:32 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 926631809C84; Thu, 25 Mar 2021 16:26:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12PGQQXo032170 for ; Thu, 25 Mar 2021 12:26:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id C08D120E1D81; Thu, 25 Mar 2021 16:26:26 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BA7DF20E1D80 for ; Thu, 25 Mar 2021 16:26:26 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A20818007B1 for ; Thu, 25 Mar 2021 16:26:26 +0000 (UTC) Received: from mo4-p02-ob.smtp.rzone.de (mo4-p02-ob.smtp.rzone.de [85.215.255.83]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-451-XjxetckCORSvLV8SrJDywg-1; Thu, 25 Mar 2021 12:26:24 -0400 Received: from sender by smtp.strato.de (RZmta 47.22.0 SBL|AUTH) with ESMTPSA id 204541x2PGQL6TV (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256 bits)) (Client did not present a certificate); Thu, 25 Mar 2021 17:26:21 +0100 (CET) X-MC-Unique: J_0BvgIDOW64qxDOIo9rYQ-1 X-MC-Unique: XjxetckCORSvLV8SrJDywg-1 X-RZG-AUTH: ":P2EQZWCpfu+qG7CngxMFH1J+3q8wa/QXkBR9MXjAuzBW/OdlBZQ4AHSS32Qg" X-RZG-CLASS-ID: mo00 From: Olaf Hering To: libvir-list@redhat.com Subject: [PATCH v2 11/12] libxl: add API wrapper for libxl_set_memory_target Date: Thu, 25 Mar 2021 17:26:11 +0100 Message-Id: <20210325162612.8355-12-olaf@aepfle.de> In-Reply-To: <20210325162612.8355-1-olaf@aepfle.de> References: <20210325162612.8355-1-olaf@aepfle.de> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Cc: Olaf Hering X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Upcoming changes will use different LIBXL_API_VERSION variants. Prepare libxl_set_memory_target, which changed the storage size of parameter "target_memkb" in Xen 4.8. No functional change intended. Signed-off-by: Olaf Hering --- src/libxl/libxl_api_wrapper.h | 27 +++++++++++++++++++++++++++ src/libxl/libxl_domain.c | 6 +++--- src/libxl/libxl_driver.c | 4 ++-- 3 files changed, 32 insertions(+), 5 deletions(-) diff --git a/src/libxl/libxl_api_wrapper.h b/src/libxl/libxl_api_wrapper.h index 26c2215cb7..a9627f7983 100644 --- a/src/libxl/libxl_api_wrapper.h +++ b/src/libxl/libxl_api_wrapper.h @@ -20,6 +20,7 @@ =20 #pragma once =20 +#include #include =20 static inline int @@ -188,3 +189,29 @@ libxlSendTriggerWrapper(libxl_ctx *ctx, =20 return ret; } + +static inline int +libxlSetMemoryTargetWrapper(libxl_ctx *ctx, + uint32_t domid, + uint64_t target_memkb, + int relative, + int enforce) +{ + int ret =3D -1; + + /* Technically this guard could be LIBXL_HAVE_MEMKB_64BITS */ +#if LIBXL_API_VERSION < 0x040800 + if (target_memkb < UINT_MAX) { + uint32_t val32 =3D target_memkb; + + ret =3D libxl_set_memory_target(ctx, domid, val32, relative, enfor= ce); + } +#else + if (target_memkb < LLONG_MAX) { + int64_t val64 =3D target_memkb; + ret =3D libxl_set_memory_target(ctx, domid, val64, relative, enfor= ce); + } +#endif + + return ret; +} diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index ac613b96b9..7ffafb9023 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -1010,7 +1010,7 @@ libxlDomainFreeMem(libxl_ctx *ctx, libxl_domain_confi= g *d_config) { uint64_t needed_mem; uint64_t free_mem; - int32_t target_mem; + uint64_t target_mem; int tries =3D 3; int wait_secs =3D 10; =20 @@ -1025,8 +1025,8 @@ libxlDomainFreeMem(libxl_ctx *ctx, libxl_domain_confi= g *d_config) return 0; =20 target_mem =3D free_mem - needed_mem; - if (libxl_set_memory_target(ctx, 0, target_mem, - /* relative */ 1, 0) < 0) + if (libxlSetMemoryTargetWrapper(ctx, 0, target_mem, + /* relative */ 1, 0) < 0) goto error; =20 if (libxl_wait_for_memory_target(ctx, 0, wait_secs) < 0) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 18098734fc..f130790484 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -1695,8 +1695,8 @@ libxlDomainSetMemoryFlags(virDomainPtr dom, unsigned = long newmem, =20 /* Unlock virDomainObj while ballooning memory */ virObjectUnlock(vm); - res =3D libxl_set_memory_target(cfg->ctx, vm->def->id, newmem,= 0, - /* force */ 1); + res =3D libxlSetMemoryTargetWrapper(cfg->ctx, vm->def->id, new= mem, 0, + /* force */ 1); virObjectLock(vm); if (res < 0) { virReportError(VIR_ERR_INTERNAL_ERROR,