From nobody Sat May 4 02:50:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1575973603; cv=none; d=zohomail.com; s=zohoarc; b=exO79n087ws7b/L7NqanhMALXMjUKVIkPLRq5zm/FqwKb6qRVcd1NCJXN3XVuAk4W3i4DcptgyjktiZUWCxWpNkPMDHd5ssZFmr+dsqNd+XUgjZCl5vm/FTbV7yZGxc1/kWJa+dqKQYbNUhyGsoNtokj10Aswe8d/8HhIO4MPjs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575973603; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=L78V2ZRiDQnu3DxADeypJabMVaM24LTJQommPwEqm6Y=; b=BW/4GRV0g57wtW3OOAH8ME5qfecSWUqjBrakAoEGcLj4JvX0WUV3T4oL4ioZtb/ASXYArlFcjYhRVgzn6bBkKjs4CM2uXvqoh9Wsf6jNCzAGabio7YPgJyHC7QEb6ok+9nn6c6OY+pLY0RbZ8tmQtLXn6Jn+LUuVkSi2njpZgKQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1575973603367154.59975649038302; Tue, 10 Dec 2019 02:26:43 -0800 (PST) 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-371-694Wgi1XM4mPn4wKJpC1cw-1; Tue, 10 Dec 2019 05:26:39 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4FD432F60; Tue, 10 Dec 2019 10:26:34 +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 22AA05D72A; Tue, 10 Dec 2019 10:26:34 +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 DDD6A1803C32; Tue, 10 Dec 2019 10:26:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id xBAAQWHE010765 for ; Tue, 10 Dec 2019 05:26:32 -0500 Received: by smtp.corp.redhat.com (Postfix) id 6E7AB5D6D8; Tue, 10 Dec 2019 10:26:32 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-61.ams2.redhat.com [10.36.112.61]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6A3475D6D4; Tue, 10 Dec 2019 10:26:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575973601; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=L78V2ZRiDQnu3DxADeypJabMVaM24LTJQommPwEqm6Y=; b=bCeYIct4mGpQ4IrrmQH4hlXVJwHYCYifuNl3D8mfKRERVEImgnH+QJojjlaci3PSYT9+Pw JlU7oyBMkYdnbWddbf6d9IXVeIrCoQhDXyWlOTgEg1ebtbCKN8J6uQ26JIzh8gb69vEDLL I4iJBjMmrd9H+nO88xw6bQT5wf/xvOw= From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Tue, 10 Dec 2019 10:26:25 +0000 Message-Id: <20191210102625.499873-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Wang Huaqiang Subject: [libvirt] [PATCH] Revert "qemu: directly create virResctrlInfo ignoring capabilities" 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.15 X-MC-Unique: 694Wgi1XM4mPn4wKJpC1cw-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) This reverts commit 7be5fe66cd024b9ffba7c52cdbf5effedeac2c0d. This commit broke resctrl, because it missed the fact that the virResctrlInfoGetCache() has side-effects causing it to actually change the virResctrlInfo parameter, not merely get data from it. This code will need some refactoring before we can try separating it from virCapabilities again. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Cole Robinson --- src/qemu/qemu_process.c | 24 ++++++++++++++++-------- src/util/virresctrl.h | 2 -- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 10259027c9..23cc528817 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2724,24 +2724,29 @@ qemuProcessSetupEmulator(virDomainObjPtr vm) =20 =20 static int -qemuProcessResctrlCreate(virDomainObjPtr vm) +qemuProcessResctrlCreate(virQEMUDriverPtr driver, + virDomainObjPtr vm) { + int ret =3D -1; size_t i =3D 0; + virCapsPtr caps =3D NULL; qemuDomainObjPrivatePtr priv =3D vm->privateData; - g_autoptr(virResctrlInfo) resctrl =3D NULL; =20 if (!vm->def->nresctrls) return 0; =20 - if (!(resctrl =3D virResctrlInfoNew())) + /* Force capability refresh since resctrl info can change + * XXX: move cache info into virresctrl so caps are not needed */ + caps =3D virQEMUDriverGetCapabilities(driver, true); + if (!caps) return -1; =20 for (i =3D 0; i < vm->def->nresctrls; i++) { size_t j =3D 0; - if (virResctrlAllocCreate(resctrl, + if (virResctrlAllocCreate(caps->host.resctrl, vm->def->resctrls[i]->alloc, priv->machineName) < 0) - return -1; + goto cleanup; =20 for (j =3D 0; j < vm->def->resctrls[i]->nmonitors; j++) { virDomainResctrlMonDefPtr mon =3D NULL; @@ -2749,11 +2754,14 @@ qemuProcessResctrlCreate(virDomainObjPtr vm) mon =3D vm->def->resctrls[i]->monitors[j]; if (virResctrlMonitorCreate(mon->instance, priv->machineName) < 0) - return -1; + goto cleanup; } } =20 - return 0; + ret =3D 0; + cleanup: + virObjectUnref(caps); + return ret; } =20 =20 @@ -6881,7 +6889,7 @@ qemuProcessLaunch(virConnectPtr conn, goto cleanup; =20 VIR_DEBUG("Setting up resctrl"); - if (qemuProcessResctrlCreate(vm) < 0) + if (qemuProcessResctrlCreate(driver, vm) < 0) goto cleanup; =20 VIR_DEBUG("Setting up managed PR daemon"); diff --git a/src/util/virresctrl.h b/src/util/virresctrl.h index 759320d0fd..3dd7c96348 100644 --- a/src/util/virresctrl.h +++ b/src/util/virresctrl.h @@ -100,8 +100,6 @@ typedef virResctrlInfo *virResctrlInfoPtr; virResctrlInfoPtr virResctrlInfoNew(void); =20 -G_DEFINE_AUTOPTR_CLEANUP_FUNC(virResctrlInfo, virObjectUnref); - int virResctrlInfoGetCache(virResctrlInfoPtr resctrl, unsigned int level, --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list