You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
63 lines
2.5 KiB
63 lines
2.5 KiB
2 years ago
|
From 019d5a0ca5d13f837a59b9e2815e2fd7ac120807 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Stefan Hajnoczi <stefanha@redhat.com>
|
||
|
|
Date: Tue, 17 May 2022 09:28:06 +0100
|
||
|
|
Subject: [PATCH 11/16] virtio-scsi: clean up virtio_scsi_handle_event_vq()
|
||
|
|
|
||
|
|
RH-Author: Stefan Hajnoczi <stefanha@redhat.com>
|
||
|
|
RH-MergeRequest: 88: virtio-scsi: fix 100% CPU consumption with IOThreads
|
||
|
|
RH-Commit: [3/6] f8dbc4c1991c61e4cf8dea50942c3cd509c9c4bd (stefanha/centos-stream-qemu-kvm)
|
||
|
|
RH-Bugzilla: 2079347
|
||
|
|
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||
|
|
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
||
|
|
RH-Acked-by: Stefano Garzarella <sgarzare@redhat.com>
|
||
|
|
|
||
|
|
virtio_scsi_handle_event_vq() is only called from hw/scsi/virtio-scsi.c
|
||
|
|
now and its return value is no longer used. Remove the function
|
||
|
|
prototype from virtio-scsi.h and drop the return value.
|
||
|
|
|
||
|
|
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
||
|
|
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
|
||
|
|
Message-id: 20220427143541.119567-4-stefanha@redhat.com
|
||
|
|
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
||
|
|
(cherry picked from commit 37ce2de95169dacab3fb53d11bd4509b9c2e3a4c)
|
||
|
|
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
||
|
|
---
|
||
|
|
hw/scsi/virtio-scsi.c | 4 +---
|
||
|
|
include/hw/virtio/virtio-scsi.h | 1 -
|
||
|
|
2 files changed, 1 insertion(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c
|
||
|
|
index 7b69eeed64..dd2185b943 100644
|
||
|
|
--- a/hw/scsi/virtio-scsi.c
|
||
|
|
+++ b/hw/scsi/virtio-scsi.c
|
||
|
|
@@ -856,13 +856,11 @@ void virtio_scsi_push_event(VirtIOSCSI *s, SCSIDevice *dev,
|
||
|
|
virtio_scsi_complete_req(req);
|
||
|
|
}
|
||
|
|
|
||
|
|
-bool virtio_scsi_handle_event_vq(VirtIOSCSI *s, VirtQueue *vq)
|
||
|
|
+static void virtio_scsi_handle_event_vq(VirtIOSCSI *s, VirtQueue *vq)
|
||
|
|
{
|
||
|
|
if (s->events_dropped) {
|
||
|
|
virtio_scsi_push_event(s, NULL, VIRTIO_SCSI_T_NO_EVENT, 0);
|
||
|
|
- return true;
|
||
|
|
}
|
||
|
|
- return false;
|
||
|
|
}
|
||
|
|
|
||
|
|
static void virtio_scsi_handle_event(VirtIODevice *vdev, VirtQueue *vq)
|
||
|
|
diff --git a/include/hw/virtio/virtio-scsi.h b/include/hw/virtio/virtio-scsi.h
|
||
|
|
index 543681bc18..5957597825 100644
|
||
|
|
--- a/include/hw/virtio/virtio-scsi.h
|
||
|
|
+++ b/include/hw/virtio/virtio-scsi.h
|
||
|
|
@@ -151,7 +151,6 @@ void virtio_scsi_common_realize(DeviceState *dev,
|
||
|
|
Error **errp);
|
||
|
|
|
||
|
|
void virtio_scsi_common_unrealize(DeviceState *dev);
|
||
|
|
-bool virtio_scsi_handle_event_vq(VirtIOSCSI *s, VirtQueue *vq);
|
||
|
|
bool virtio_scsi_handle_cmd_vq(VirtIOSCSI *s, VirtQueue *vq);
|
||
|
|
bool virtio_scsi_handle_ctrl_vq(VirtIOSCSI *s, VirtQueue *vq);
|
||
|
|
void virtio_scsi_init_req(VirtIOSCSI *s, VirtQueue *vq, VirtIOSCSIReq *req);
|
||
|
|
--
|
||
|
|
2.31.1
|
||
|
|
|