From nobody Thu May 2 23:53:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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=1575915238; cv=none; d=zohomail.com; s=zohoarc; b=m+jzppyPm3JepIWj4cjfCNbiY/jgnCQkH+N2sCnflJFzm8XL0iBkmJ+LnSBdjep4QRric4bPcI2yzLPoqdLItJulN7H1SFU9OAQoFsdM/VKFe+YG9ewhKQPv+0HRgF/jV67+xIvRKGJUhsjSlyPKgGSaKj2zav3c/TCChUFIw30= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575915238; 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=6BVxNg0xRMaLSNzBdbAzkKilYs9g6Du5U085FrsyU78=; b=C4WZcPZXpfr5vVv6BObivyXK7/8/Dopa7/YXabsKnwrBw+uX2Ahej85QsnJc6/sYzdv7eA1Vd5w63/vpMntrn2aRUMxPcwrn6Jo0gJiwduR3ewULEolzR2Bz/DuuE8Y6ZL3lB9gAW9Df613F1zhBXPCjN80bkP1+tMQMCpHE6ZI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1575915238937682.5188844578868; Mon, 9 Dec 2019 10:13:58 -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-368-k9R8GvJCOOijkcW6byixig-1; Mon, 09 Dec 2019 13:13:56 -0500 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 BF68310054E3; Mon, 9 Dec 2019 18:13:50 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 900A160476; Mon, 9 Dec 2019 18:13:50 +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 367B48354C; Mon, 9 Dec 2019 18:13:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id xB9IDm4O020060 for ; Mon, 9 Dec 2019 13:13:48 -0500 Received: by smtp.corp.redhat.com (Postfix) id C170660496; Mon, 9 Dec 2019 18:13:48 +0000 (UTC) Received: from worklaptop.redhat.com (ovpn-123-82.rdu2.redhat.com [10.10.123.82]) by smtp.corp.redhat.com (Postfix) with ESMTP id CBFD260476; Mon, 9 Dec 2019 18:13:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575915237; 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=6BVxNg0xRMaLSNzBdbAzkKilYs9g6Du5U085FrsyU78=; b=DsX5Hfi1pELAVt0ac3JDa4AxkRacmDXxtwHT1Q7Fw1vKxQaU4t6o+1amNNb4iVMcfqBVx8 6jbPbAsEuKlmAMxL36W4h50XZpwsy3+x2mkTHXzStx1LpAONx60/cK9o0r0oCQLfUcAMUr Ox7BYzyR6ZhKV8m+GC+Iiw5s4XqFrmA= From: Cole Robinson To: libvirt-list@redhat.com Date: Mon, 9 Dec 2019 13:15:02 -0500 Message-Id: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Cole Robinson Subject: [libvirt] [PATCH] lxc: Refresh capabilities if they have never been initalized 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 X-MC-Unique: k9R8GvJCOOijkcW6byixig-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Adjust virLXCDriverGetCapabilities to fill in driver->caps if it has never been set, regardless of the passed 'refresh' boolean. This fixes LXC XML startup parsing for me Signed-off-by: Cole Robinson --- src/lxc/lxc_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lxc/lxc_conf.c b/src/lxc/lxc_conf.c index 2df1537b22..803176f52b 100644 --- a/src/lxc/lxc_conf.c +++ b/src/lxc/lxc_conf.c @@ -186,7 +186,7 @@ virCapsPtr virLXCDriverGetCapabilities(virLXCDriverPtr = driver, bool refresh) { virCapsPtr ret; - if (refresh) { + if (refresh || !driver->caps) { virCapsPtr caps =3D NULL; if ((caps =3D virLXCDriverCapsInit(driver)) =3D=3D NULL) return NULL; --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list