From nobody Fri May 3 09:29:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1575921472; cv=none; d=zohomail.com; s=zohoarc; b=GT+C2GnrjzNAZhz0woAaAMqN5d5FgC+dvGFQDkSlz2hXZahiOs2TfthYyBUpxMuQEQtKp1jD4XyWnWRJ3TBRf7Yk8suXFtjHdZiiwAFA4MGA/nU0HUsHOsDs18OX2R/O78iPX9OClCJtVx3m0NUYJm90vOwZFSOyIZsc6PWH/ho= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575921472; 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=A2/Khds3RFxpSyuiIDT7iYSh7hJ2wFnDuTqnKrDpvbw=; b=KqgNTh9/g7zLMJftF1l3YilhnUUnaGHiLBme9CDAX9QXHsL1+4hDwrEKX4CbJGGyaFNVIWp0eWCH9VgR41z1Kv916i1EilUgXQK1s9fYjLbmC6/0isJLumwnFaUo9Q4Iledpa1zRqsFcUEJqcZAoiOIALSZPVoLySVrrJg/Xqkw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1575921472771847.6274634835095; Mon, 9 Dec 2019 11:57:52 -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-314-M7vyZBxEOQO96H-n_kuKcw-1; Mon, 09 Dec 2019 14:57:50 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 03ACF8DA5E0; Mon, 9 Dec 2019 19:57:43 +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 23D9D194BB; Mon, 9 Dec 2019 19:57:41 +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 DC11765D2B; Mon, 9 Dec 2019 19:57:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id xB9Jvb8l028474 for ; Mon, 9 Dec 2019 14:57:37 -0500 Received: by smtp.corp.redhat.com (Postfix) id BA93960C81; Mon, 9 Dec 2019 19:57:37 +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 3357060C05; Mon, 9 Dec 2019 19:57:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575921471; 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=A2/Khds3RFxpSyuiIDT7iYSh7hJ2wFnDuTqnKrDpvbw=; b=iGs+GgCMgLpJ29PmU3rnhuzM6MV4Q/LZEy3BEO41txfsftA87mhD4q5z7W5VcstoNKwFCb 9jOuBjY/XepPV0FIoeIVqx4uhTozfMv/orl3lC6F8Pl6wfA+qInBLD2sSf9IGSsqOIvtzC lCYBKnVZ8dv68U8WOY37VMQ0kChg8mE= From: Cole Robinson To: libvirt-list@redhat.com Date: Mon, 9 Dec 2019 14:58:51 -0500 Message-Id: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Cc: Cole Robinson Subject: [libvirt] [PATCH v2] 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.84 on 10.5.11.23 X-MC-Unique: M7vyZBxEOQO96H-n_kuKcw-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 is empty, regardless of the passed 'refresh' value. This matches the pattern used in virQEMUDriverGetCapabilities This fixes LXC XML startup parsing for me Signed-off-by: Cole Robinson Reviewed-by: Daniel P. Berrang=C3=A9 --- v2: Use the virQEMUDriverGetCapabilities like danpb suggested src/lxc/lxc_conf.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/lxc/lxc_conf.c b/src/lxc/lxc_conf.c index 2df1537b22..adf7a0b66c 100644 --- a/src/lxc/lxc_conf.c +++ b/src/lxc/lxc_conf.c @@ -196,6 +196,14 @@ virCapsPtr virLXCDriverGetCapabilities(virLXCDriverPtr= driver, driver->caps =3D caps; } else { lxcDriverLock(driver); + + if (driver->caps =3D=3D NULL || + driver->caps->nguests =3D=3D 0) { + VIR_DEBUG("Capabilities didn't detect any guests. Forcing a " + "refresh."); + lxcDriverUnlock(driver); + return virLXCDriverGetCapabilities(driver, true); + } } =20 ret =3D virObjectRef(driver->caps); --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list