Commit cff8b2c6 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Luiz Capitulino
Browse files

monitor: add object-add (QMP) and object_add (HMP) command 



Add two commands that are the monitor counterparts of -object.  The commands
have the same Visitor-based implementation, but use different kinds of
visitors so that the HMP command has a DWIM string-based syntax, while
the QMP variant accepts a stricter JSON-based properties dictionary.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
Tested-by: default avatarIgor Mammedov <imammedo@redhat.com>
Signed-off-by: default avatarLuiz Capitulino <lcapitulino@redhat.com>
parent ab2d0531

hmp-commands.hx

+14 −0
Original line number Diff line number Diff line
@@ -1241,6 +1241,20 @@ STEXI 
@item netdev_del

@findex netdev_del

Remove host network device.

ETEXI



    {

        .name       = "object_add",

        .args_type  = "object:O",

        .params     = "[qom-type=]type,id=str[,prop=value][,...]",

        .help       = "create QOM object",

        .mhandler.cmd = hmp_object_add,

    },



STEXI

@item object_add

@findex object_add

Create QOM object.

ETEXI



    {

hmp.c

+58 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include "qmp-commands.h"

#include "qemu/sockets.h"

#include "monitor/monitor.h"

#include "qapi/opts-visitor.h"

#include "ui/console.h"

#include "block/qapi.h"

#include "qemu-io.h"
@@ -1354,6 +1355,63 @@ void hmp_netdev_del(Monitor *mon, const QDict *qdict) 
    hmp_handle_error(mon, &err);

}



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

{

    Error *err = NULL;

    QemuOpts *opts;

    char *type = NULL;

    char *id = NULL;

    void *dummy = NULL;

    OptsVisitor *ov;

    QDict *pdict;



    opts = qemu_opts_from_qdict(qemu_find_opts("object"), qdict, &err);

    if (err) {

        goto out;

    }



    ov = opts_visitor_new(opts);

    pdict = qdict_clone_shallow(qdict);



    visit_start_struct(opts_get_visitor(ov), &dummy, NULL, NULL, 0, &err);

    if (err) {

        goto out_clean;

    }



    qdict_del(pdict, "qom-type");

    visit_type_str(opts_get_visitor(ov), &type, "qom-type", &err);

    if (err) {

        goto out_clean;

    }



    qdict_del(pdict, "id");

    visit_type_str(opts_get_visitor(ov), &id, "id", &err);

    if (err) {

        goto out_clean;

    }



    object_add(type, id, pdict, opts_get_visitor(ov), &err);

    if (err) {

        goto out_clean;

    }

    visit_end_struct(opts_get_visitor(ov), &err);

    if (err) {

        qmp_object_del(id, NULL);

    }



out_clean:

    opts_visitor_cleanup(ov);



    QDECREF(pdict);

    qemu_opts_del(opts);

    g_free(id);

    g_free(type);

    g_free(dummy);



out:

    hmp_handle_error(mon, &err);

}



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

{

    const char *fdname = qdict_get_str(qdict, "fdname");

hmp.h

+1 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ void hmp_chardev_add(Monitor *mon, const QDict *qdict); 
void hmp_chardev_remove(Monitor *mon, const QDict *qdict);

void hmp_qemu_io(Monitor *mon, const QDict *qdict);

void hmp_cpu_add(Monitor *mon, const QDict *qdict);

void hmp_object_add(Monitor *mon, const QDict *qdict);

void hmp_object_del(Monitor *mon, const QDict *qdict);



#endif

include/monitor/monitor.h

+3 −0
Original line number Diff line number Diff line
@@ -93,6 +93,9 @@ int monitor_read_password(Monitor *mon, ReadLineFunc *readline_func, 
int qmp_qom_set(Monitor *mon, const QDict *qdict, QObject **ret);



int qmp_qom_get(Monitor *mon, const QDict *qdict, QObject **ret);

int qmp_object_add(Monitor *mon, const QDict *qdict, QObject **ret);

void object_add(const char *type, const char *id, const QDict *qdict,

                Visitor *v, Error **errp);



AddfdInfo *monitor_fdset_add_fd(int fd, bool has_fdset_id, int64_t fdset_id,

                                bool has_opaque, const char *opaque,

include/qapi/visitor.h

+1 −2
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#ifndef QAPI_VISITOR_CORE_H

#define QAPI_VISITOR_CORE_H



#include "qemu/typedefs.h"

#include "qapi/qmp/qobject.h"

#include "qapi/error.h"

#include <stdlib.h>
@@ -26,8 +27,6 @@ typedef struct GenericList 
    struct GenericList *next;

} GenericList;



typedef struct Visitor Visitor;



void visit_start_handle(Visitor *v, void **obj, const char *kind,

                        const char *name, Error **errp);

void visit_end_handle(Visitor *v, Error **errp);