diff options
| author | Peter Maydell | 2019-04-08 18:53:18 +0200 |
|---|---|---|
| committer | Peter Maydell | 2019-04-08 18:53:18 +0200 |
| commit | 5263724b78f89cdea2354c8e92c53bac1b4641a3 (patch) | |
| tree | 3a422bbb0f4646b29cf7b8b847408c5a74c4a408 /device-hotplug.c | |
| parent | Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2019-04-0... (diff) | |
| parent | hmp: Fix drive_add ... format=help crash (diff) | |
| download | qemu-5263724b78f89cdea2354c8e92c53bac1b4641a3.tar.gz qemu-5263724b78f89cdea2354c8e92c53bac1b4641a3.tar.xz qemu-5263724b78f89cdea2354c8e92c53bac1b4641a3.zip | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches:
- hmp: Fix drive_add ... format=help crash
- block: Forward 'discard' to temporary overlay
# gpg: Signature made Mon 08 Apr 2019 16:43:20 BST
# gpg: using RSA key 7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" [full]
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74 56FE 7F09 B272 C88F 2FD6
* remotes/kevin/tags/for-upstream:
hmp: Fix drive_add ... format=help crash
block: Forward 'discard' to temporary overlay
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'device-hotplug.c')
| -rw-r--r-- | device-hotplug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/device-hotplug.c b/device-hotplug.c index 6090d5f1e9..6153259d71 100644 --- a/device-hotplug.c +++ b/device-hotplug.c @@ -48,7 +48,7 @@ static DriveInfo *add_init_drive(const char *optstr) mc = MACHINE_GET_CLASS(current_machine); dinfo = drive_new(opts, mc->block_default_type, &err); - if (!dinfo) { + if (err) { error_report_err(err); qemu_opts_del(opts); return NULL; |