mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-08-27 19:11:16 +00:00
Drive hot-unplug: reliable parsing of HMP results
Hot-unplugging a disk from a guest that supports hot-unplugging generates an error in the libvirt log when running QEMU with the "-msg timestamp=on" flag. 2015-08-06 10:48:59.945+0000: 11662: error : qemuMonitorTextDriveDel:2594 : operation failed: deleting drive-virtio-disk4 drive failed: 2015-08-06T10:48:59.945058Z Device 'drive-virtio-disk4' not found This error is caused because the HMP results are getting prefixed with a timestamp. Parsing the output is not reliable with STRPREFIX as the results can be prefixed with a timestamp. Using strstr ensures that parsing the output works whether the results are prefixed or not. Cc: Stefan Hajnoczi <stefanha@redhat.com> Cc: Daniel P. Berrange <berrange@redhat.com> Signed-off-by: Frank Schreuder <fschreuder@transip.nl>
This commit is contained in:
parent
d5e6d1cfc7
commit
69a3b0df2d
@ -2586,7 +2586,7 @@ int qemuMonitorTextDriveDel(qemuMonitorPtr mon,
|
||||
|
||||
/* (qemu) drive_del wark
|
||||
* Device 'wark' not found */
|
||||
} else if (STRPREFIX(reply, "Device '") && (strstr(reply, "not found"))) {
|
||||
} else if (strstr(reply, "Device '") && strstr(reply, "not found")) {
|
||||
/* NB: device not found errors mean the drive was auto-deleted and we
|
||||
* ignore the error */
|
||||
} else if (STRNEQ(reply, "")) {
|
||||
|
Loading…
Reference in New Issue
Block a user