Commit 72d9196f authored by Ben Warren's avatar Ben Warren Committed by Michael S. Tsirkin
Browse files

Bugfix: Handle error if VM Generation ID device not present 



This was crashing due to NULL-pointer dereference

QMP Test case:
==============

(QEMU) query-vm-generation-id
{"error": {"class": "GenericError", "desc": "VM Generation ID device not
found"}}

HMP Test case:
==============
virsh # qemu-monitor-command --hmp 3 info vm-generation-id
VM Generation ID device not found

Signed-off-by: default avatarBen Warren <ben@skyportsystems.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
parent d84f714e

hmp.c

+3 −1
Original line number Diff line number Diff line
@@ -2608,9 +2608,11 @@ void hmp_hotpluggable_cpus(Monitor *mon, const QDict *qdict) 


void hmp_info_vm_generation_id(Monitor *mon, const QDict *qdict)

{

    GuidInfo *info = qmp_query_vm_generation_id(NULL);

    Error *err = NULL;

    GuidInfo *info = qmp_query_vm_generation_id(&err);

    if (info) {

        monitor_printf(mon, "%s\n", info->guid);

    }

    hmp_handle_error(mon, &err);

    qapi_free_GuidInfo(info);

}

hw/acpi/vmgenid.c

+1 −0
Original line number Diff line number Diff line
@@ -248,6 +248,7 @@ GuidInfo *qmp_query_vm_generation_id(Error **errp) 
    Object *obj = find_vmgenid_dev();



    if (!obj) {

        error_setg(errp, "VM Generation ID device not found");

        return NULL;

    }

    vms = VMGENID(obj);