X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=qmp.c;h=fa82b598c6d0c58c4919cc2a2d5451f7c70a67e2;hb=b8a68728b6a3fad86f15aa5efdc31ea0b3cb8a62;hp=564bee0b35ed49c6078e5170743186f5cdd1733f;hpb=b3db211f3c80bb996a704d665fe275619f728bd4;p=mirror_qemu.git diff --git a/qmp.c b/qmp.c index 564bee0b35..fa82b598c6 100644 --- a/qmp.c +++ b/qmp.c @@ -18,6 +18,7 @@ #include "qemu/cutils.h" #include "monitor/monitor.h" #include "sysemu/sysemu.h" +#include "qemu/config-file.h" #include "qemu/uuid.h" #include "qmp-commands.h" #include "sysemu/char.h" @@ -36,7 +37,6 @@ #include "qom/object_interfaces.h" #include "hw/mem/pc-dimm.h" #include "hw/acpi/acpi_dev_interface.h" -#include "qemu/uuid.h" NameInfo *qmp_query_name(Error **errp) { @@ -532,12 +532,12 @@ DevicePropertyInfoList *qmp_device_list_properties(const char *typename, klass = object_class_dynamic_cast(klass, TYPE_DEVICE); if (klass == NULL) { - error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "name", TYPE_DEVICE); + error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "typename", TYPE_DEVICE); return NULL; } if (object_class_is_abstract(klass)) { - error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "name", + error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "typename", "non-abstract device type"); return NULL; } @@ -617,7 +617,7 @@ void qmp_add_client(const char *protocol, const char *fdname, bool has_skipauth, bool skipauth, bool has_tls, bool tls, Error **errp) { - CharDriverState *s; + Chardev *s; int fd; fd = monitor_get_fd(cur_mon, fdname, errp); @@ -675,7 +675,7 @@ void qmp_object_add(const char *type, const char *id, pdict = qdict_new(); } - v = qmp_input_visitor_new(QOBJECT(pdict), true); + v = qobject_input_visitor_new(QOBJECT(pdict)); obj = user_creatable_add_type(type, id, pdict, v, errp); visit_free(v); if (obj) {