On 10/7/20 5:32 AM, Vladimir Sementsov-Ogievskiy wrote: > 30.09.2020 15:11, Eric Blake wrote: >> Honoring just SIGTERM on Linux is too weak; we also want to handle >> other common signals, and do so even on BSD. Why? Because at least >> 'qemu-nbd -B bitmap' needs a chance to clean up the in-use bit on >> bitmaps when the server is shut down via a signal. > > Probably not bad to update a comment [*] if you have a good wording in > mind. > >> >> See also: http://bugzilla.redhat.com/1883608 >> >> Signed-off-by: Eric Blake <ebl...@redhat.com> > > Reviewed-by: Vladimir Sementsov-Ogievskiy <vsement...@virtuozzo.com> > >> --- >> qemu-nbd.c | 6 +++--- >> 1 file changed, 3 insertions(+), 3 deletions(-) >> >> diff --git a/qemu-nbd.c b/qemu-nbd.c >> index bacb69b0898b..e7520261134f 100644 >> --- a/qemu-nbd.c >> +++ b/qemu-nbd.c >> @@ -581,7 +581,7 @@ int main(int argc, char **argv) >> const char *pid_file_name = NULL; >> BlockExportOptions *export_opts; >> >> -#if HAVE_NBD_DEVICE >> +#ifdef CONFIG_POSIX >> /* The client thread uses SIGTERM to interrupt the server. A >> signal >> * handler ensures that "qemu-nbd -v -c" exits with a nice >> status code. > > [*] >
Sure, I went with: diff --git i/qemu-nbd.c w/qemu-nbd.c index e7520261134f..c731dda04ec0 100644 --- i/qemu-nbd.c +++ w/qemu-nbd.c @@ -582,8 +582,9 @@ int main(int argc, char **argv) BlockExportOptions *export_opts; #ifdef CONFIG_POSIX - /* The client thread uses SIGTERM to interrupt the server. A signal - * handler ensures that "qemu-nbd -v -c" exits with a nice status code. + /* + * Exit gracefully on various signals, which includes SIGTERM used + * by 'qemu-nbd -v -c'. */ struct sigaction sa_sigterm; memset(&sa_sigterm, 0, sizeof(sa_sigterm)); -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
signature.asc
Description: OpenPGP digital signature