From nobody Mon Feb 9 09:28:58 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=1593416638; cv=none; d=zohomail.com; s=zohoarc; b=cvJPIWoQKgxfRpICESYdkaakP/19vNkXP9+qbzEPzpjZ1vfPv1/HTWHlp8rAvn1V3UhfztnvvEtb+3P0gbR30xghhPZeJFaKIp+1y/abHV+C9WA08Use9W666GAIcnNEuiJPgLW9+X2lqAHmHMjKRA84C7igMzHUYSBj1aBYMDU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593416638; 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=h9EpJtOtPPnJBKRh+vFmUUXFd10As1ozJBPSd8bBsPg=; b=lMzDUHBtWvH8RkTFoneZwKNcrdWNop8D+Pe6URGlC2FSNgWB+G/A057z84hYYBE22bYbnwC7cupbxUsTqsBogqEIkbXzqvLI/Pctbt26J/Ckj6yLRDOLZczsubIDKc2ryIbZ8S5RQiq/O74Ds3aq4vo4Q+bJ1lVCztKz5Mi+gHg= 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 1593416638931508.56702891366876; Mon, 29 Jun 2020 00:43:58 -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-127-M0fc8pddOaCKi6d9ctrDHQ-1; Mon, 29 Jun 2020 03:43:54 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 81832BFC0; Mon, 29 Jun 2020 07:43: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 3C0075C1BD; Mon, 29 Jun 2020 07:43: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 776298788F; Mon, 29 Jun 2020 07:43:47 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 05T7hjM5004571 for ; Mon, 29 Jun 2020 03:43:45 -0400 Received: by smtp.corp.redhat.com (Postfix) id ED1DF5C1D2; Mon, 29 Jun 2020 07:43:45 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.193.241]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6E4FA5C1BD for ; Mon, 29 Jun 2020 07:43:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593416637; 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=h9EpJtOtPPnJBKRh+vFmUUXFd10As1ozJBPSd8bBsPg=; b=AaPAPpvlavVyTWPTbdI4gcfz94ANXwe8ZPfSeHSWvsK6Zd3aeRMN60upy3uT1g0xTP6BEh N1Ev8ZjZh2m8vFw68SIpJRcJlqaj/1XvXNaz7LMtxNcW6X26C+uDaaE6ZmtlKkMqusotee ZKeLs2OrlO4RCRg1knuZg7d9JOAfCBM= X-MC-Unique: M0fc8pddOaCKi6d9ctrDHQ-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 3/3] qemu_validate: Fix how qemuValidateDomainDeviceDefZPCIAddress() is called Date: Mon, 29 Jun 2020 09:43:38 +0200 Message-Id: <7e6930c712f30683364a72e9281b992359a11264.1593416559.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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.16 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" To make the code future proof, the rest of the qemuValidateDomainDeviceDefAddress() has to be executed (even though there is nothing there yet) instead of returning directly. Signed-off-by: Michal Privoznik --- src/qemu/qemu_validate.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 2d3a2ec93a..ed1497c425 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -1063,7 +1063,8 @@ qemuValidateDomainDeviceDefAddress(const virDomainDev= iceDef *dev, =20 switch ((virDomainDeviceAddressType) info->type) { case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI: - return qemuValidateDomainDeviceDefZPCIAddress(info, qemuCaps); + if (qemuValidateDomainDeviceDefZPCIAddress(info, qemuCaps) < 0) + return -1; =20 case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE: /* Address validation might happen before we have had a chance to --=20 2.26.2