From nobody Mon Feb 9 12:12:07 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=1633622288; cv=none; d=zohomail.com; s=zohoarc; b=NYDjpeutusUtPc/0Sjr2LI3WwJLQ3cHFsN/Tws9bIeQmBr9s6I78W42OSJyXGFmvGHS5wEW11X227FcLaB2cuUKvT3KXOeRl6+4ij5M2EgACGBOlN1pvuLFhlDPkj0uTIp6q+PEvkuiqB3zxQhVa+cFfHxvVmnXZeUZDFKOC8w8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1633622288; 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=dJodepgthC+iw+oWOLa4uxX3ugUcfh43rZx2961FdqE=; b=nvUs+U4zZ3rsTe5jL+C3UL75i6l3G8NBYAlTSO2MiW521dqEqAYPWZiJAGwMU1xf16fR8WZfreXa7w25w+kZqsHtdKWlRVouXd914gGrmanOxjRpVRaPGQeNrGZlN1Dh3qrLwkqdt2ejVtWGQnyLKoC+svMlSHrsSNZJMPc41sk= 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) 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 1633622288237327.82582978290225; Thu, 7 Oct 2021 08:58:08 -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-28-8iI9-L7nOyuRSlu_wPHa-Q-1; Thu, 07 Oct 2021 11:58:02 -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 2FA15198088A; Thu, 7 Oct 2021 15:49:36 +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 68CF514F6BD; Thu, 7 Oct 2021 15:49:35 +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 E25614EA37; Thu, 7 Oct 2021 15:49:34 +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 197FKwEA024357 for ; Thu, 7 Oct 2021 11:20:58 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8AC0D5D6D5; Thu, 7 Oct 2021 15:20:58 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.5]) by smtp.corp.redhat.com (Postfix) with ESMTP id E8E6F5D6BA for ; Thu, 7 Oct 2021 15:20:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633622286; 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=dJodepgthC+iw+oWOLa4uxX3ugUcfh43rZx2961FdqE=; b=Z2mJhHILv2Gug0cK/7un3HeszhJKu1x7b8pN0GK6jP86GDFz048jxG3aeHvH2QYjj2X1yw tLKZ9UezBd8gbxmqVxqj4DZCFfXbZODV0hJbkwOFClKfPdqvcacb4FXV1e8UOGLyojQ7AF 8KLJ2NFC9QNPspUZQshHfbKi8rEQufM= X-MC-Unique: 8iI9-L7nOyuRSlu_wPHa-Q-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 077/103] qemu: Always assume presence of QEMU_CAPS_VIRTIO_(BLK|NET)_EVENT_IDX Date: Thu, 7 Oct 2021 17:18:05 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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) X-ZM-MESSAGEID: 1633622289919100001 Content-Type: text/plain; charset="utf-8" The 'event_idx' option for virtio devices was introduced by QEMU commit bcbabae8f which is contained in v0.15.0-rc0 and can't be compiled out, thus we don't need to conditionally enable it. Signed-off-by: Peter Krempa --- src/qemu/qemu_command.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 0ff933fde9..a7fceeb50c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2250,8 +2250,7 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, virBufferAsprintf(&opt, ",iothread=3Diothread%u", disk->iothre= ad); qemuBuildIoEventFdStr(&opt, disk->ioeventfd, qemuCaps); - if (disk->event_idx && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_BLK_EVENT_IDX)) { + if (disk->event_idx) { virBufferAsprintf(&opt, ",event_idx=3D%s", virTristateSwitchTypeToString(disk->event_id= x)); } @@ -3988,8 +3987,7 @@ qemuBuildNicDevStr(virDomainDef *def, } } qemuBuildIoEventFdStr(&buf, net->driver.virtio.ioeventfd, qemuCaps= ); - if (net->driver.virtio.event_idx && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_NET_EVENT_IDX)) { + if (net->driver.virtio.event_idx) { virBufferAsprintf(&buf, ",event_idx=3D%s", virTristateSwitchTypeToString(net->driver.vi= rtio.event_idx)); } --=20 2.31.1