mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-06 01:03:55 -06:00
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>
This commit is contained in:
parent
4fb9071f65
commit
cbc20bfb8f
6 changed files with 22 additions and 17 deletions
|
@ -1443,7 +1443,6 @@ subdir('dump')
|
|||
|
||||
block_ss.add(files(
|
||||
'block.c',
|
||||
'blockdev-nbd.c',
|
||||
'blockjob.c',
|
||||
'job.c',
|
||||
'qemu-io-cmds.c',
|
||||
|
@ -1456,6 +1455,7 @@ subdir('block')
|
|||
|
||||
blockdev_ss.add(files(
|
||||
'blockdev.c',
|
||||
'blockdev-nbd.c',
|
||||
'iothread.c',
|
||||
'job-qmp.c',
|
||||
))
|
||||
|
@ -1832,7 +1832,7 @@ if have_tools
|
|||
qemu_io = executable('qemu-io', files('qemu-io.c'),
|
||||
dependencies: [block, qemuutil], install: true)
|
||||
qemu_nbd = executable('qemu-nbd', files('qemu-nbd.c'),
|
||||
dependencies: [block, qemuutil], install: true)
|
||||
dependencies: [blockdev, qemuutil], install: true)
|
||||
|
||||
subdir('storage-daemon')
|
||||
subdir('contrib/rdmacm-mux')
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue