Commit ab638171 authored by Markus Armbruster's avatar Markus Armbruster Committed by Kevin Wolf
Browse files

hmp: Fix drive_add ... format=help crash 



drive_new() returns null without setting an error when it provided
help.  add_init_drive() assumes null means failure, and crashes trying
to report a null error.

Fixes: c4f26c9f
Cc: qemu-stable@nongnu.org
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 3f48686f

device-hotplug.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

tests/test-hmp.c

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ static const char *hmp_cmds[] = { 
    "cpu 0",

    "device_add ?",

    "device_add usb-mouse,id=mouse1",

    "drive_add ignored format=help",

    "mouse_button 7",

    "mouse_move 10 10",

    "mouse_button 0",