diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2024-01-19 08:57:43 -0500 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2024-01-26 11:16:58 +0100 |
| commit | 3bcc17f06526754fd675dcf601414442044fa0b6 (patch) | |
| tree | f1d63b58476b221a9e045d63b1125ce45b0f976d /meson.build | |
| parent | effd60c878176bcaf97fa7ce2b12d04bb8ead6f7 (diff) | |
virtio-blk: move dataplane code into virtio-blk.c
The dataplane code used to be significantly different from the
non-dataplane code and therefore had a separate source file.
Over time the difference has gotten smaller because the I/O code paths
were unified. Nowadays the distinction between the VirtIOBlock and
VirtIOBlockDataPlane structs is more of an inconvenience that hinders
code simplification.
Move hw/block/dataplane/virtio-blk.c into hw/block/virtio-blk.c, merging
VirtIOBlockDataPlane's fields into VirtIOBlock.
hw/block/virtio-blk.c used VirtIOBlock->dataplane to check if
virtio_blk_data_plane_create() was successful. This is not necessary
because ->dataplane_started and ->dataplane_disabled can be used
instead. This patch makes those changes in order to drop
VirtIOBlock->dataplane.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-ID: <20240119135748.270944-2-stefanha@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/meson.build b/meson.build index d0329966f1..5ffa8c9716 100644 --- a/meson.build +++ b/meson.build @@ -3286,7 +3286,6 @@ if have_system 'hw/arm', 'hw/audio', 'hw/block', - 'hw/block/dataplane', 'hw/char', 'hw/display', 'hw/dma', |