diff options
| author | Peter Maydell | 2019-05-02 12:21:02 +0200 |
|---|---|---|
| committer | Peter Maydell | 2019-05-02 12:21:02 +0200 |
| commit | 37560c259d7a0d6aceb96e9d6903ee002f4e5e0c (patch) | |
| tree | ec4a2ca2ebff19f5620c50a147d972562928866e /hmp.c | |
| parent | Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (diff) | |
| parent | hmp: gva2gpa debug command (diff) | |
| download | qemu-37560c259d7a0d6aceb96e9d6903ee002f4e5e0c.tar.gz qemu-37560c259d7a0d6aceb96e9d6903ee002f4e5e0c.tar.xz qemu-37560c259d7a0d6aceb96e9d6903ee002f4e5e0c.zip | |
Merge remote-tracking branch 'remotes/dgilbert/tags/pull-hmp-20190501' into staging
HMP pull
New gva2gpa command
delvm now uses hmp_handle_error so gets Error: prefix in messages
# gpg: Signature made Wed 01 May 2019 11:57:43 BST
# gpg: using RSA key 45F5C71B4A0CB7FB977A9FA90516331EBC5BFDE7
# gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilbert@redhat.com>" [full]
# Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A 9FA9 0516 331E BC5B FDE7
* remotes/dgilbert/tags/pull-hmp-20190501:
hmp: gva2gpa debug command
hmp: delvm: use hmp_handle_error
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hmp.c')
| -rw-r--r-- | hmp.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -1480,10 +1480,11 @@ void hmp_delvm(Monitor *mon, const QDict *qdict) const char *name = qdict_get_str(qdict, "name"); if (bdrv_all_delete_snapshot(name, &bs, &err) < 0) { - error_reportf_err(err, - "Error while deleting snapshot on device '%s': ", - bdrv_get_device_name(bs)); + error_prepend(&err, + "deleting snapshot on device '%s': ", + bdrv_get_device_name(bs)); } + hmp_handle_error(mon, &err); } void hmp_info_snapshots(Monitor *mon, const QDict *qdict) |