From nobody Mon Feb 9 23:00:48 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 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=1616054520; cv=none; d=zohomail.com; s=zohoarc; b=M4qmXL8RcUIBweo29OhZdsjj8isSqRtv6w7JhejmEKMs0Bohv7546SmM58gfUX9o+b1v0xTazQhHK/qqeUbad2Ha9XB6jPukivWd5gZ3wz8RbK1Fh4mkYG+fXblYbOR5ThsDtupwn8gZFSe54BD6GzFZFnBLqUnCJIzfMhF7Rsw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616054520; 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=mOF2so2PD4qFHxpnjITZkmzdfn1qXRnzNBlFgNRBSjQ=; b=g08vng3MTf1M2DJUmHR7oz9+x32cqhoAX8NlH5jZmfbgw916bSHO/dJKn6L9misM3zQbyrQLW5NLPyiwFpnhFf94ZCWSNjxQ18OFxQ7xzlFT2N0SY6zKiqcf5eebN1VGQeTnOKAAWZwS8Wh2QiM0sRpEaRTfYZQp2edcgNIGtgY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 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-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1616054520620296.7422605489693; Thu, 18 Mar 2021 01:02:00 -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-48-yHervd1hMrOpkAC04XzkDg-1; Thu, 18 Mar 2021 04:01:55 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EF860107ACCD; Thu, 18 Mar 2021 08:01:49 +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 C4C8029ACA; Thu, 18 Mar 2021 08:01:49 +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 7FF234A70D; Thu, 18 Mar 2021 08:01:49 +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 12I81mjo028337 for ; Thu, 18 Mar 2021 04:01:48 -0400 Received: by smtp.corp.redhat.com (Postfix) id 26B0E6268F; Thu, 18 Mar 2021 08:01:48 +0000 (UTC) Received: from work.redhat.com (ovpn-112-180.ams2.redhat.com [10.36.112.180]) by smtp.corp.redhat.com (Postfix) with ESMTP id A4C5D62951; Thu, 18 Mar 2021 08:01:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616054517; 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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=mOF2so2PD4qFHxpnjITZkmzdfn1qXRnzNBlFgNRBSjQ=; b=BiRzjqM1fe3S/OqDwAiqp6myEVwbO5yDOWJPt+yRnDyEBa931s8oOVlZ61zcPjDefYaEoi ZwrbXgcEgk2X3oIFvtI3V1eMfq2o5AwF2Y+0DH9k5AHKoMHfiF0MnUUJ8hZkdFr7WDaYzW FJhoS0EzXQi4dt6+fOvg4kgO1JeEyTk= X-MC-Unique: yHervd1hMrOpkAC04XzkDg-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 16/38] domain_conf: Use virXMLProp(OnOff|YesNo) in virDomainGraphicsDefParseXMLVNC Date: Thu, 18 Mar 2021 09:00:55 +0100 Message-Id: <20210318080117.70255-17-twiederh@redhat.com> In-Reply-To: <20210318080117.70255-1-twiederh@redhat.com> References: <20210318080117.70255-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake 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.14 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" Signed-off-by: Tim Wiederhake --- src/conf/domain_conf.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b4928a94c2..756a35f33b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13077,7 +13077,6 @@ virDomainGraphicsDefParseXMLVNC(virDomainGraphicsDe= fPtr def, g_autofree char *websocketGenerated =3D virXMLPropString(node, "websoc= ketGenerated"); g_autofree char *sharePolicy =3D virXMLPropString(node, "sharePolicy"); g_autofree char *autoport =3D virXMLPropString(node, "autoport"); - g_autofree char *powerControl =3D virXMLPropString(node, "powerControl= "); xmlNodePtr audioNode; VIR_XPATH_NODE_AUTORESTORE(ctxt) =20 @@ -13136,15 +13135,8 @@ virDomainGraphicsDefParseXMLVNC(virDomainGraphicsD= efPtr def, } } =20 - if (powerControl) { - int powerControlVal =3D virTristateBoolTypeFromString(powerControl= ); - if (powerControlVal < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot parse vnc power control '%s'"), power= Control); - return -1; - } - def->data.vnc.powerControl =3D powerControlVal; - } + if ((virXMLPropYesNo(node, "powerControl", &def->data.vnc.powerControl= )) < 0) + return -1; =20 def->data.vnc.keymap =3D virXMLPropString(node, "keymap"); =20 --=20 2.26.2