From ea0f4084743f1d90e19a660dcf3eb8767c3923ec Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Mon, 4 Oct 2021 15:34:26 +0200 Subject: [PATCH] qemu: Always assume presence of QEMU_CAPS_VIRTIO_(BLK|NET)_EVENT_IDX MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Ján Tomko --- 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 d0410a9f23..96247e953c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2257,8 +2257,7 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, virBufferAsprintf(&opt, ",iothread=iothread%u", disk->iothread); 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=%s", virTristateSwitchTypeToString(disk->event_idx)); } @@ -3999,8 +3998,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=%s", virTristateSwitchTypeToString(net->driver.virtio.event_idx)); } -- 2.47.2