summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorStefan Hajnoczi2020-09-29 14:55:15 +0200
committerStefan Hajnoczi2020-10-23 14:42:16 +0200
commitcbc20bfb8fc293333abbef6aacf052f5f8d72f98 (patch)
tree45821c5f9e4fcf2ae34979ee9a22aca44f67f614 /block
parentqemu-storage-daemon: avoid compiling blockdev_ss twice (diff)
downloadqemu-cbc20bfb8fc293333abbef6aacf052f5f8d72f98.tar.gz
qemu-cbc20bfb8fc293333abbef6aacf052f5f8d72f98.tar.xz
qemu-cbc20bfb8fc293333abbef6aacf052f5f8d72f98.zip
block: move block exports to libblockdev
Block exports are used by softmmu, qemu-storage-daemon, and qemu-nbd. They are not used by other programs and are not otherwise needed in libblock. Undo the recent move of blockdev-nbd.c from blockdev_ss into block_ss. Since bdrv_close_all() (libblock) calls blk_exp_close_all() (libblockdev) a stub function is required.. Make qemu-nbd.c use signal handling utility functions instead of duplicating the code. This helps because os-posix.c is in libblockdev and it depends on a qemu_system_killed() symbol that qemu-nbd.c lacks. Once we use the signal handling utility functions we also end up providing the necessary symbol. Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Message-id: 20200929125516.186715-4-stefanha@redhat.com [Fixed s/ndb/nbd/ typo in commit description as suggested by Eric Blake --Stefan] Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'block')
-rw-r--r--block/export/meson.build4
1 files changed, 2 insertions, 2 deletions
diff --git a/block/export/meson.build b/block/export/meson.build
index fffe6b09e8..9fb4fbf81d 100644
--- a/block/export/meson.build
+++ b/block/export/meson.build
@@ -1,2 +1,2 @@
-block_ss.add(files('export.c'))
-block_ss.add(when: ['CONFIG_LINUX', 'CONFIG_VHOST_USER'], if_true: files('vhost-user-blk-server.c'))
+blockdev_ss.add(files('export.c'))
+blockdev_ss.add(when: ['CONFIG_LINUX', 'CONFIG_VHOST_USER'], if_true: files('vhost-user-blk-server.c'))