Commit 844bd70b authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Michael Roth
Browse files

qga: fix assert regression on guest-shutdown 



Since commit 781f2b3d ("qga: process_event() simplification"),
send_response() is called unconditionally, but will assert when "rsp" is
NULL. This may happen with QCO_NO_SUCCESS_RESP commands, such as
"guest-shutdown".

Fixes: 781f2b3d
Cc: Michael Roth <mdroth@linux.vnet.ibm.com>
Reported-by: default avatarChristian Ehrhardt <christian.ehrhardt@canonical.com>
Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: default avatarChristian Ehrhardt <christian.ehrhardt@canonical.com>
Tested-by: default avatarChristian Ehrhardt <christian.ehrhardt@canonical.com>
Cc: qemu-stable@nongnu.org
Signed-off-by: default avatarMichael Roth <mdroth@linux.vnet.ibm.com>
parent 917ebcb1

qga/main.c

+5 −1
Original line number Diff line number Diff line
@@ -531,7 +531,11 @@ static int send_response(GAState *s, const QDict *rsp) 
    QString *payload_qstr, *response_qstr;

    GIOStatus status;



    g_assert(rsp && s->channel);

    g_assert(s->channel);



    if (!rsp) {

        return 0;

    }



    payload_qstr = qobject_to_json(QOBJECT(rsp));

    if (!payload_qstr) {