External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 04:25:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

virsh: block SIGINT while getting BlockJobInfo

Browse Source 
SIGINT hasn't been blocked, which could lead to losing it somewhere in
virDomainGetBlockJobInfo and not aborting the job.
This commit is contained in:
Ján Tomko 2012-10-11 17:12:13 +02:00 committed by Eric Blake
parent 149c87b49d
commit 13fefaf37f
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tools/virsh-domain.c
View File

@ -1308,7 +1308,7 @@ cmdBlockCommit(vshControl *ctl, const vshCmd *cmd)
int timeout = 0; int timeout = 0;
struct sigaction sig_action; struct sigaction sig_action;
struct sigaction old_sig_action; struct sigaction old_sig_action;
sigset_t sigmask; sigset_t sigmask, oldsigmask;
struct timeval start; struct timeval start;
struct timeval curr; struct timeval curr;
const char *path = NULL; const char *path = NULL;
@ -1361,7 +1361,11 @@ cmdBlockCommit(vshControl *ctl, const vshCmd *cmd)
while (blocking) { while (blocking) {
virDomainBlockJobInfo info; virDomainBlockJobInfo info;
int result = virDomainGetBlockJobInfo(dom, path, &info, 0); int result;
pthread_sigmask(SIG_BLOCK, &sigmask, &oldsigmask);
result = virDomainGetBlockJobInfo(dom, path, &info, 0);
pthread_sigmask(SIG_SETMASK, &oldsigmask, NULL);
if (result < 0) { if (result < 0) {
vshError(ctl, _("failed to query job for disk %s"), path); vshError(ctl, _("failed to query job for disk %s"), path);
@ -1450,7 +1454,7 @@ cmdBlockCopy(vshControl *ctl, const vshCmd *cmd)
int timeout = 0; int timeout = 0;
struct sigaction sig_action; struct sigaction sig_action;
struct sigaction old_sig_action; struct sigaction old_sig_action;
sigset_t sigmask; sigset_t sigmask, oldsigmask;
struct timeval start; struct timeval start;
struct timeval curr; struct timeval curr;
const char *path = NULL; const char *path = NULL;
@ -1507,7 +1511,11 @@ cmdBlockCopy(vshControl *ctl, const vshCmd *cmd)
while (blocking) { while (blocking) {
virDomainBlockJobInfo info; virDomainBlockJobInfo info;
int result = virDomainGetBlockJobInfo(dom, path, &info, 0); int result;
pthread_sigmask(SIG_BLOCK, &sigmask, &oldsigmask);
result = virDomainGetBlockJobInfo(dom, path, &info, 0);
pthread_sigmask(SIG_SETMASK, &oldsigmask, NULL);
if (result <= 0) { if (result <= 0) {
vshError(ctl, _("failed to query job for disk %s"), path); vshError(ctl, _("failed to query job for disk %s"), path);
@ -1674,7 +1682,7 @@ cmdBlockPull(vshControl *ctl, const vshCmd *cmd)
int timeout = 0; int timeout = 0;
struct sigaction sig_action; struct sigaction sig_action;
struct sigaction old_sig_action; struct sigaction old_sig_action;
sigset_t sigmask; sigset_t sigmask, oldsigmask;
struct timeval start; struct timeval start;
struct timeval curr; struct timeval curr;
const char *path = NULL; const char *path = NULL;
@ -1727,7 +1735,11 @@ cmdBlockPull(vshControl *ctl, const vshCmd *cmd)
while (blocking) { while (blocking) {
virDomainBlockJobInfo info; virDomainBlockJobInfo info;
int result = virDomainGetBlockJobInfo(dom, path, &info, 0); int result;
pthread_sigmask(SIG_BLOCK, &sigmask, &oldsigmask);
result = virDomainGetBlockJobInfo(dom, path, &info, 0);
pthread_sigmask(SIG_SETMASK, &oldsigmask, NULL);
if (result < 0) { if (result < 0) {
vshError(ctl, _("failed to query job for disk %s"), path); vshError(ctl, _("failed to query job for disk %s"), path);