From nobody Mon Feb 9 17:34:42 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1616161289; cv=none; d=zohomail.com; s=zohoarc; b=a9kkzcbfHTDQohdlNdBziQE382OD3sfCZ55fiYxTcxfhQuZrmj5nnb7zLIKJCWFeGu9w5pq2QXONhiDuCf1GdZdRqsDrWybBSO5/h0GJtPLD7/4nE1w8yG7HNMykyEdNjNMUGO/FBynhWKYweXDpeetXLIiH849FVpmDv9BGxwE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161289; 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=MWCYwadtBklBL1yTTZc9xhvHB4gHEJPNJ3OTGGrN+VQ=; b=Qvqzle2pkx55xuLIBOY6mb8hpm44n4zh3Hl5GoUd2lQPeu39yNRhCp2FQtj89ew/ZmXnTOcWtDUDkTQ67uOaZAATpX7F9jjcKSClBJXLzuBUtCttyArcaGr5Fqa2PsGKU4mem6ApLdGcC3qstgDjFjXG7dLR2GVuuqloKFO7FEM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1616161289012969.7070837095092; Fri, 19 Mar 2021 06:41:29 -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-179-En1HltzONUmIpy_5qftQHQ-1; Fri, 19 Mar 2021 09:41:24 -0400 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 0540E83DD28; Fri, 19 Mar 2021 13:41:18 +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 D03474F3C6; Fri, 19 Mar 2021 13:41:17 +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 E95314A7CA; Fri, 19 Mar 2021 13:41:16 +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 12JDfDsO018936 for ; Fri, 19 Mar 2021 09:41:13 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4B5D1369A; Fri, 19 Mar 2021 13:41:13 +0000 (UTC) Received: from work.redhat.com (ovpn-112-175.ams2.redhat.com [10.36.112.175]) by smtp.corp.redhat.com (Postfix) with ESMTP id 905CA63B8C; Fri, 19 Mar 2021 13:41:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161287; 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=MWCYwadtBklBL1yTTZc9xhvHB4gHEJPNJ3OTGGrN+VQ=; b=fPqIEZpcJT0KFMQkq6Hd7Kp4KpjhgLZTfw1Y2XVT+kQMcd/4wU5Rr67zQDCuaLJTVH0qTg 1j/uA1YLFLL9CmQ8dTKrLCpK89LrmjnZ/ZXLdVtp14NJLhNDaARnU8E2J4HEayk+ykKOsD 4KSWvKXVVIkS4JcQzj/HwKgsM1Hcb0Q= X-MC-Unique: En1HltzONUmIpy_5qftQHQ-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 03/51] conf: Use virTristateXXX in virDomainDeviceInfo Date: Fri, 19 Mar 2021 14:40:17 +0100 Message-Id: <20210319134105.442774-4-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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.11 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/device_conf.h | 4 ++-- src/qemu/qemu_command.c | 3 ++- src/qemu/qemu_hotplug.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/conf/device_conf.h b/src/conf/device_conf.h index a51bdf10ee..289af1153a 100644 --- a/src/conf/device_conf.h +++ b/src/conf/device_conf.h @@ -153,8 +153,8 @@ struct _virDomainDeviceInfo { } master; /* rombar and romfile are only used for pci hostdev and network * devices. */ - int romenabled; /* enum virTristateBool */ - int rombar; /* enum virTristateSwitch */ + virTristateBool romenabled; + virTristateSwitch rombar; char *romfile; /* bootIndex is only used for disk, network interface, hostdev * and redirdev devices */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 5717f7b98d..73c28ed7a0 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -660,7 +660,8 @@ qemuBuildRomStr(virBufferPtr buf, case VIR_TRISTATE_SWITCH_ON: virBufferAddLit(buf, ",rombar=3D1"); break; - default: + case VIR_TRISTATE_SWITCH_ABSENT: + case VIR_TRISTATE_SWITCH_LAST: break; } if (info->romfile) { diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index a66354426d..cc49f10198 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3665,7 +3665,7 @@ qemuDomainChangeNet(virQEMUDriverPtr driver, =20 /* device alias is checked already in virDomainDefCompatibleDevice */ =20 - if (newdev->info.rombar =3D=3D VIR_TRISTATE_BOOL_ABSENT) + if (newdev->info.rombar =3D=3D VIR_TRISTATE_SWITCH_ABSENT) newdev->info.rombar =3D olddev->info.rombar; if (olddev->info.rombar !=3D newdev->info.rombar) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", --=20 2.26.2