From nobody Sun Feb 8 21:29:12 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.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 207.211.31.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=1593701191; cv=none; d=zohomail.com; s=zohoarc; b=G8MFZUnPf6Q/8Jdcl7fPW/BrmPrwkDyFrXQ6np7cBxOoxPZ6rTLm29e2B4MN9LITqYWR1wwlrpXjv6BZoiMbt8iHpmyjN8C9dGGvguqAP6Ocvw74WSawwlTt/MANzuMWYbSD5UgHy8zpuQcojslYm7m7LgIrlC1vfBc/8V4AHJg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593701191; h=Content-Type:Content-Transfer-Encoding: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=T1RpkmGdjRWToaUNoxm9pU0ME/5huBmaCIqjEWOoftk=; b=dN1coOjjRsOBsYGf3jSBBKX0ANJf9XH6pEnDwf3J4UcuSqFpB5e5v8IpptN/3YuFF6H3WE4zjUyz817rjBeHgzHwZlDTk2WPn8nzSUz2Hp4J+IrhDX2++fj0BFjFSLvoxrKk/kEbbvs0To73EN8WmOBzWQ8iST7xA18su/AsfWM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.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 [207.211.31.120]) by mx.zohomail.com with SMTPS id 1593701191505422.9456931856944; Thu, 2 Jul 2020 07:46:31 -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-297-tmT0PPt7NjOwq9CXbl1G2A-1; Thu, 02 Jul 2020 10:46:28 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9F35887950E; Thu, 2 Jul 2020 14:46:22 +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 7FBC67BEBE; Thu, 2 Jul 2020 14:46:22 +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 4F3106C9CE; Thu, 2 Jul 2020 14:46:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 062EeK9n011709 for ; Thu, 2 Jul 2020 10:40:20 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7EC6110002A2; Thu, 2 Jul 2020 14:40:20 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id E6D04104C41A for ; Thu, 2 Jul 2020 14:40:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593701190; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=T1RpkmGdjRWToaUNoxm9pU0ME/5huBmaCIqjEWOoftk=; b=Gf3c6wm2q6n2AetWtFDfLCaumWpZDwQx3eYKnSWjvz0oJCefC0xSR0Hhevkyjc3abxYnd0 JcocpJdQqdh95Zkn0x2+8ydlZVt4kUVdD7MZ6K3Vk0OkG9PErKFJojHxgfYb6cfL/LFEfw zJwf07hGWzmBlvHQWLiqTWCLWR3fuWk= X-MC-Unique: tmT0PPt7NjOwq9CXbl1G2A-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 05/24] virQEMUDriverConfigLoadSpecificTLSEntry: Move fetching of 'chardev_tls' above macro Date: Thu, 2 Jul 2020 16:39:51 +0200 Message-Id: <6c13cd8a4acdfff17bca6a3cd220a089c9ac44be.1593700474.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com 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.13 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 X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Move the extraction of the config value so that it makes more sense after upcoming refactors. Signed-off-by: Peter Krempa Reviewed-by: Eric Blake --- src/qemu/qemu_conf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 33b3989268..2cbff1348a 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -483,6 +483,8 @@ virQEMUDriverConfigLoadSpecificTLSEntry(virQEMUDriverCo= nfigPtr cfg, return -1; if (virConfGetValueString(conf, "nbd_tls_x509_cert_dir", &cfg->nbdTLSx= 509certdir) < 0) return -1; + if (virConfGetValueBool(conf, "chardev_tls", &cfg->chardevTLS) < 0) + return -1; #define GET_CONFIG_TLS_CERTINFO(val) \ do { \ @@ -500,8 +502,6 @@ virQEMUDriverConfigLoadSpecificTLSEntry(virQEMUDriverCo= nfigPtr cfg, return -1; \ } while (0) - if (virConfGetValueBool(conf, "chardev_tls", &cfg->chardevTLS) < 0) - return -1; GET_CONFIG_TLS_CERTINFO(chardev); GET_CONFIG_TLS_CERTINFO(migrate); --=20 2.26.2