system/qemu
system/qemu
1
0
Fork 0
mirror of https://gitlab.com/qemu-project/qemu synced 2024-07-23 11:24:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

nbd: disable signals and forking on Windows builds

Browse source 
Disabling these parts are sufficient to get the qemu-nbd program
compiling in a Windows build.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20200825103850.119911-4-berrange@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2020-08-25 11:38:50 +01:00 committed by Eric Blake
parent 6e64dd572a
commit eb705985f4
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
meson.build
View file

@ -1095,12 +1095,9 @@ if have_tools
dependencies: [authz, block, crypto, io, qom, qemuutil], install: true) dependencies: [authz, block, crypto, io, qom, qemuutil], install: true)
qemu_io = executable('qemu-io', files('qemu-io.c'), qemu_io = executable('qemu-io', files('qemu-io.c'),
dependencies: [block, qemuutil], install: true) dependencies: [block, qemuutil], install: true)
qemu_block_tools += [qemu_img, qemu_io] qemu_nbd = executable('qemu-nbd', files('qemu-nbd.c'),
if targetos != 'windows'
qemu_nbd = executable('qemu-nbd', files('qemu-nbd.c'),
dependencies: [block, qemuutil], install: true) dependencies: [block, qemuutil], install: true)
qemu_block_tools += [qemu_nbd] qemu_block_tools += [qemu_img, qemu_io, qemu_nbd]
endif
subdir('storage-daemon') subdir('storage-daemon')
subdir('contrib/rdmacm-mux') subdir('contrib/rdmacm-mux')

5
qemu-nbd.c
View file

@ -899,6 +899,7 @@ int main(int argc, char **argv)
#endif #endif
if ((device && !verbose) || fork_process) { if ((device && !verbose) || fork_process) {
#ifndef WIN32
int stderr_fd[2]; int stderr_fd[2];
pid_t pid; pid_t pid;
int ret; int ret;
@ -962,6 +963,10 @@ int main(int argc, char **argv)
*/ */
exit(errors); exit(errors);
} }
#else /* WIN32 */
error_report("Unable to fork into background on Windows hosts");
exit(EXIT_FAILURE);
#endif /* WIN32 */
} }
if (device != NULL && sockpath == NULL) { if (device != NULL && sockpath == NULL) {