openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
libvirt/tools
History
Peter Krempa fc09f3d823 virsh: cmdBlock*: Remove 'error:' prefix for an empty line 
When a block copy job fails prior to reaching the synchronized phase
while we are waiting for the job to finish virsh would print the
following:

 $ virsh blockcopy backup-test vda /tmp/dst.qcow2 --wait --reuse-external --transient-job
 error:
 Copy failed

The above message looks like we've forgot to print the error message
itself as the line ends after 'error:'. Unfortunately with the current
API design clients have no way of actually getting the error message as
the VIR_DOMAIN_EVENT_ID_BLOCK_JOB(_2) event only reports the status but
not an error and the job then vanishes.

Fix the expectations by using vshPrintExtra instead of vshError:

 $ virsh blockcopy backup-test vda /tmp/dst.qcow2 --wait --reuse-external --transient-job

 Copy failed

Note that the newline is required to avoid printing the 'Copy failed'
message on the same line when printing the job progress percentage.

Inspired by https://bugzilla.redhat.com/show_bug.cgi?id=1847867

Fix the same issue also for block pull and block commit job

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
 		2020-06-22 17:22:03 +02:00
..
bash-completion tools: Provide bash autompletion file 2018-01-11 18:53:04 +01:00
nss Don't pass NULL to yajl_free() 2020-03-30 16:11:13 +02:00
wireshark Convert all remaining Markdown files to reStructuredText 2020-04-14 16:29:04 +02:00
Makefile.am gnulib: delete all gnulib integration 2020-02-07 15:03:54 +00:00
libvirt-guests.service.in build: don't hardcode /etc in the config related files 2019-08-09 14:06:31 +01:00
libvirt-guests.sh.in tools: libvirt-guests: correctly check shutdown value 2020-06-03 13:56:20 +02:00
libvirt-guests.sysconf systemd: Tweak existing sysconf files 2020-04-03 11:50:35 +02:00
libvirt_recover_xattrs.sh security_util: Remove stale XATTRs 2019-08-22 17:05:17 +02:00
libvirt_win_icon_16x16.ico Move virsh into tools/ directory 2009-09-21 14:41:45 +01:00
libvirt_win_icon_32x32.ico Move virsh into tools/ directory 2009-09-21 14:41:45 +01:00
libvirt_win_icon_48x48.ico Move virsh into tools/ directory 2009-09-21 14:41:45 +01:00
libvirt_win_icon_64x64.ico Move virsh into tools/ directory 2009-09-21 14:41:45 +01:00
virsh-backup.c backup: Implement virsh support for backup 2019-12-10 12:41:56 +01:00
virsh-backup.h backup: Implement virsh support for backup 2019-12-10 12:41:56 +01:00
virsh-checkpoint.c Remove use of variables passed only to 'VIR_FREE' 2020-06-15 10:27:37 +02:00
virsh-checkpoint.h backup: Implement virsh support for checkpoints 2019-07-26 16:48:58 -05:00
virsh-completer-checkpoint.c tools: use g_strdup instead of VIR_STRDUP 2019-10-21 12:51:59 +02:00
virsh-completer-checkpoint.h tools: Separate checkpoint related completers into a file 2019-08-09 09:18:19 +02:00
virsh-completer-domain.c virsh: Expose virDomainGetHostnameFlags 2020-01-16 09:02:35 +01:00
virsh-completer-domain.h virsh: Expose virDomainGetHostnameFlags 2020-01-16 09:02:35 +01:00
virsh-completer-host.c tools: Use g_strdup_printf() instead of virAsprintf() 2019-11-12 16:15:59 +01:00
virsh-completer-host.h tools: Separate host related completers into a file 2019-08-09 09:17:44 +02:00
virsh-completer-interface.c tools: use g_strdup instead of VIR_STRDUP 2019-10-21 12:51:59 +02:00
virsh-completer-interface.h tools: Separate interface related completers into a file 2019-08-09 09:07:51 +02:00
virsh-completer-network.c tools: remove unneeded cleanup labels 2019-11-12 17:54:01 +01:00
virsh-completer-network.h tools: Separate network related completers into a file 2019-08-09 09:09:59 +02:00
virsh-completer-nodedev.c Drop needless ret variable 2019-10-24 08:10:37 +02:00
virsh-completer-nodedev.h tools: Separate nodedev related completers into a file 2019-08-09 09:10:08 +02:00
virsh-completer-nwfilter.c tools: use g_strdup instead of VIR_STRDUP 2019-10-21 12:51:59 +02:00
virsh-completer-nwfilter.h tools: Separate nwfilter related completers into a file 2019-08-09 09:15:36 +02:00
virsh-completer-pool.c Drop needless ret variable 2019-10-24 08:10:37 +02:00
virsh-completer-pool.h virsh: Introduce virshPoolTypeCompleter 2019-08-09 09:20:13 +02:00
virsh-completer-secret.c virsh: Work around virSecretFree quirks 2020-01-28 18:09:57 +01:00
virsh-completer-secret.h tools: Separate secret related completers into a file 2019-08-09 09:16:28 +02:00
virsh-completer-snapshot.c tools: use g_strdup instead of VIR_STRDUP 2019-10-21 12:51:59 +02:00
virsh-completer-snapshot.h tools: Separate snapshot related completers into a file 2019-08-09 09:17:06 +02:00
virsh-completer-volume.c tools: use g_strdup instead of VIR_STRDUP 2019-10-21 12:51:59 +02:00
virsh-completer-volume.h tools: Separate storage volume related completers into a file 2019-08-09 09:07:02 +02:00
virsh-completer.c tools: Use g_strdup_printf() instead of virAsprintf() 2019-11-12 16:15:59 +01:00
virsh-completer.h virsh-completer: Drop needless #include 2019-08-09 09:18:54 +02:00
virsh-console.c use g_ascii_toupper instead of c_toupper from gnulib 2019-12-10 13:49:24 +01:00
virsh-console.h tools: use #pragma once in headers 2019-06-19 17:12:34 +02:00
virsh-domain-monitor.c Add a space before ending a comment 2020-01-30 12:32:03 +01:00
virsh-domain-monitor.h virsh: Fix virshDomainInterfaceSourceCompleter 2020-01-07 16:12:55 +01:00
virsh-domain.c virsh: cmdBlock*: Remove 'error:' prefix for an empty line 2020-06-22 17:22:03 +02:00
virsh-domain.h virsh: Expose virDomainGetHostnameFlags 2020-01-16 09:02:35 +01:00
virsh-edit.c Use G_GNUC_FALLTHROUGH instead of ATTRIBUTE_FALLTHROUGH 2019-10-15 16:14:19 +02:00
virsh-host.c tools: Use g_strdup_printf() instead of virAsprintf() 2019-11-12 16:15:59 +01:00
virsh-host.h tools: use #pragma once in headers 2019-06-19 17:12:34 +02:00
virsh-interface.c Remove virutil.h where possible 2020-02-24 23:15:49 +01:00
virsh-interface.h tools: use #pragma once in headers 2019-06-19 17:12:34 +02:00
virsh-network.c src: replace gmtime_r/localtime_r/strftime with GDateTime 2020-01-17 10:02:01 +00:00
virsh-network.h tools: use #pragma once in headers 2019-06-19 17:12:34 +02:00
virsh-nodedev.c virsh: include virutil.h where used 2020-02-24 23:15:50 +01:00
virsh-nodedev.h tools: s/Nodedev/NodeDevice/ 2019-08-09 09:03:53 +02:00
virsh-nwfilter.c Remove virutil.h where possible 2020-02-24 23:15:49 +01:00
virsh-nwfilter.h tools: use #pragma once in headers 2019-06-19 17:12:34 +02:00
virsh-pool.c Add a space before ending a comment 2020-01-30 12:32:03 +01:00
virsh-pool.h tools: use #pragma once in headers 2019-06-19 17:12:34 +02:00
virsh-secret.c util: add API for reading password from the console 2020-01-29 14:51:39 +00:00
virsh-secret.h tools: use #pragma once in headers 2019-06-19 17:12:34 +02:00
virsh-snapshot.c src: replace gmtime_r/localtime_r/strftime with GDateTime 2020-01-17 10:02:01 +00:00
virsh-snapshot.h tools: use #pragma once in headers 2019-06-19 17:12:34 +02:00
virsh-util.c virsh: Work around virSecretFree quirks 2020-01-28 18:09:57 +01:00
virsh-util.h virsh: Work around virSecretFree quirks 2020-01-28 18:09:57 +01:00
virsh-volume.c tools: Use g_strdup_printf() instead of virAsprintf() 2019-11-12 16:15:59 +01:00
virsh-volume.h tools: use #pragma once in headers 2019-06-19 17:12:34 +02:00
virsh.c rpc: conditionalize signal handling 2020-01-29 14:51:40 +00:00
virsh.h tools: rewrite interactive job monitoring logic 2020-02-07 15:03:53 +00:00
virsh_win_icon.rc Move virsh into tools/ directory 2009-09-21 14:41:45 +01:00
virt-admin-completer.c tools: use g_strdup instead of VIR_STRDUP 2019-10-21 12:51:59 +02:00
virt-admin-completer.h tools: use #pragma once in headers 2019-06-19 17:12:34 +02:00
virt-admin.c tools: mention server-update-tls supports virtproxyd 2020-05-13 16:28:14 +01:00
virt-admin.h tools: use #pragma once in headers 2019-06-19 17:12:34 +02:00
virt-host-validate-bhyve.c virt-host-validate-bhyve.c: Reintroduce @ret to virHostValidateBhyve() 2020-05-05 14:45:58 +02:00
virt-host-validate-bhyve.h tools: use #pragma once in headers 2019-06-19 17:12:34 +02:00
virt-host-validate-common.c tools: Secure guest check for AMD in virt-host-validate 2020-06-16 09:43:44 +02:00
virt-host-validate-common.h tools: Secure guest check for AMD in virt-host-validate 2020-06-16 09:43:44 +02:00
virt-host-validate-lxc.c virt-host-validate: require freezer for LXC 2018-10-05 15:53:29 +02:00
virt-host-validate-lxc.h tools: use #pragma once in headers 2019-06-19 17:12:34 +02:00
virt-host-validate-qemu.c tools: Secure guest check on s390 in virt-host-validate 2020-06-16 09:43:44 +02:00
virt-host-validate-qemu.h tools: use #pragma once in headers 2019-06-19 17:12:34 +02:00
virt-host-validate.c src: More cleanup of some system headers already contained in internal.h 2018-09-20 10:16:39 +02:00
virt-login-shell-helper.c src: switch from fnmatch to g_pattern_match_simple 2020-01-03 15:42:13 +00:00
virt-login-shell.c build: generate configmake.h in root directory 2020-01-29 14:51:39 +00:00
virt-login-shell.conf virt-login-shell: add ability to auto-detect shell from container 2016-06-10 11:03:02 +01:00
virt-pki-validate.in tools: Fix permissions for virt-pki-validate.in 2019-07-01 17:20:32 +02:00
virt-sanlock-cleanup.in build: Extract pod from source files 2016-04-25 15:40:43 +02:00
virt-xml-validate.in tools: fix XML validator detection of network port XML schema 2019-09-12 16:06:57 +01:00
vsh-table.c tools: replace wcwidth() with g_unichar_* APIs 2020-01-29 14:51:39 +00:00
vsh-table.h tools: use #pragma once in headers 2019-06-19 17:12:34 +02:00
vsh.c tools: vsh.c: remove virstrerror.h include 2020-03-13 17:26:55 +01:00
vsh.h src: conditionally exclude cfmakeraw/termios.h on WIN32 2020-01-17 10:02:01 +00:00