Commit 7795b166 authored by Luiz Capitulino's avatar Luiz Capitulino
Browse files

error: drop error_get_qobject()/error_set_qobject() 



error_get_qobject() is unused since last commit, error_set_qobject()
has never been used. Also drops error_int.h.

Signed-off-by: default avatarLuiz Capitulino <lcapitulino@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent 93b91c59

error.c

+0 −20
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include "qjson.h"

#include "qdict.h"

#include "qapi-types.h"

#include "error_int.h"

#include "qerror.h"



struct Error
@@ -91,22 +90,3 @@ void error_propagate(Error **dst_err, Error *local_err) 
        error_free(local_err);

    }

}
 


QObject *error_get_qobject(Error *err)

{

    QINCREF(err->obj);

    return QOBJECT(err->obj);

}



void error_set_qobject(Error **errp, QObject *obj)

{

    Error *err;

    if (errp == NULL) {

        return;

    }

    err = g_malloc0(sizeof(*err));

    err->obj = qobject_to_qdict(obj);

    qobject_incref(obj);



    *errp = err;

}

error_int.h

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
/*

 * QEMU Error Objects

 *

 * Copyright IBM, Corp. 2011

 *

 * Authors:

 *  Anthony Liguori   <aliguori@us.ibm.com>

 *

 * This work is licensed under the terms of the GNU LGPL, version 2.  See

 * the COPYING.LIB file in the top-level directory.

 */

#ifndef QEMU_ERROR_INT_H

#define QEMU_ERROR_INT_H



#include "qemu-common.h"

#include "qobject.h"

#include "qdict.h"

#include "error.h"



/**

 * Internal QEMU functions for working with Error.

 *

 * These are used to convert QErrors to Errors

 */

QObject *error_get_qobject(Error *err);

void error_set_qobject(Error **errp, QObject *obj);

  

#endif

qapi/qmp-dispatch.c

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
#include "json-parser.h"

#include "qapi-types.h"

#include "error.h"

#include "error_int.h"

#include "qerror.h"



static QDict *qmp_dispatch_check_obj(const QObject *request, Error **errp)

qemu-ga.c

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
#include "module.h"

#include "signal.h"

#include "qerror.h"

#include "error_int.h"

#include "qapi/qmp-core.h"

#include "qga/channel.h"

#ifdef _WIN32