target-ppc: Add ISA 2.06 divwe[o] Instructions

[qemu.git] / qmp.c

diff --git a/qmp.c b/qmp.c
index 84639220d0342d2772a222dcf267ceda4086914f..f556a04d1981f7424d01c48c39168c5f9573a11e 100644 (file)
--- a/qmp.c
+++ b/qmp.c
@@ -14,15 +14,20 @@
  */
 
 #include "qemu-common.h"
  */
 
 #include "qemu-common.h"

-#include "sysemu.h"
+#include "sysemu/sysemu.h"

 #include "qmp-commands.h"
 #include "qmp-commands.h"

+#include "sysemu/char.h"

 #include "ui/qemu-spice.h"
 #include "ui/vnc.h"
 #include "ui/qemu-spice.h"
 #include "ui/vnc.h"

-#include "kvm.h"
-#include "arch_init.h"
+#include "sysemu/kvm.h"
+#include "sysemu/arch_init.h"

 #include "hw/qdev.h"
 #include "hw/qdev.h"

-#include "blockdev.h"
-#include "qemu/qom-qobject.h"
+#include "sysemu/blockdev.h"
+#include "qom/qom-qobject.h"
+#include "qapi/qmp/qobject.h"
+#include "qapi/qmp-input-visitor.h"
+#include "hw/boards.h"
+#include "qom/object_interfaces.h"

 
 NameInfo *qmp_query_name(Error **errp)
 {
 
 NameInfo *qmp_query_name(Error **errp)
 {


@@ -85,7 +90,11 @@ void qmp_quit(Error **err)
 
 void qmp_stop(Error **errp)
 {
 
 void qmp_stop(Error **errp)
 {

-    vm_stop(RUN_STATE_PAUSED);
+    if (runstate_check(RUN_STATE_INMIGRATE)) {
+        autostart = 0;
+    } else {
+        vm_stop(RUN_STATE_PAUSED);
+    }

 }
 
 void qmp_system_reset(Error **errp)
 }
 
 void qmp_system_reset(Error **errp)


@@ -103,6 +112,15 @@ void qmp_cpu(int64_t index, Error **errp)
     /* Just do nothing */
 }
 
     /* Just do nothing */
 }
 

+void qmp_cpu_add(int64_t id, Error **errp)
+{
+    if (current_machine->hot_add_cpu) {
+        current_machine->hot_add_cpu(id, errp);
+    } else {
+        error_setg(errp, "Not supported");
+    }
+}
+

 #ifndef CONFIG_VNC
 /* If VNC support is enabled, the "true" query-vnc command is
    defined in the VNC subsystem */
 #ifndef CONFIG_VNC
 /* If VNC support is enabled, the "true" query-vnc command is
    defined in the VNC subsystem */


@@ -144,11 +162,7 @@ void qmp_cont(Error **errp)
 {
     Error *local_err = NULL;
 
 {
     Error *local_err = NULL;
 

-    if (runstate_check(RUN_STATE_INMIGRATE)) {
-        error_set(errp, QERR_MIGRATION_EXPECTED);
-        return;
-    } else if (runstate_check(RUN_STATE_INTERNAL_ERROR) ||
-               runstate_check(RUN_STATE_SHUTDOWN)) {
+    if (runstate_needs_reset()) {

         error_set(errp, QERR_RESET_REQUIRED);
         return;
     } else if (runstate_check(RUN_STATE_SUSPENDED)) {
         error_set(errp, QERR_RESET_REQUIRED);
         return;
     } else if (runstate_check(RUN_STATE_SUSPENDED)) {


@@ -162,7 +176,11 @@ void qmp_cont(Error **errp)
         return;
     }
 
         return;
     }
 

-    vm_start();
+    if (runstate_check(RUN_STATE_INMIGRATE)) {
+        autostart = 1;
+    } else {
+        vm_start();
+    }

 }
 
 void qmp_system_wakeup(Error **errp)
 }
 
 void qmp_system_wakeup(Error **errp)


@@ -349,11 +367,9 @@ void qmp_change_vnc_password(const char *password, Error **errp)
     }
 }
 
     }
 }
 

-static void qmp_change_vnc_listen(const char *target, Error **err)
+static void qmp_change_vnc_listen(const char *target, Error **errp)

 {
 {

-    if (vnc_display_open(NULL, target) < 0) {
-        error_set(err, QERR_VNC_SERVER_FAILED, target);
-    }
+    vnc_display_open(NULL, target, errp);

 }
 
 static void qmp_change_vnc(const char *target, bool has_arg, const char *arg,
 }
 
 static void qmp_change_vnc(const char *target, bool has_arg, const char *arg,


@@ -387,7 +403,7 @@ void qmp_change(const char *device, const char *target,
     if (strcmp(device, "vnc") == 0) {
         qmp_change_vnc(target, has_arg, arg, err);
     } else {
     if (strcmp(device, "vnc") == 0) {
         qmp_change_vnc(target, has_arg, arg, err);
     } else {

-        qmp_change_blockdev(device, target, has_arg, arg, err);
+        qmp_change_blockdev(device, target, arg, err);

     }
 }
 
     }
 }
 


@@ -468,14 +484,138 @@ DevicePropertyInfoList *qmp_device_list_properties(const char *typename,
     return prop_list;
 }
 
     return prop_list;
 }
 

-CpuDefinitionInfoList GCC_WEAK *arch_query_cpu_definitions(Error **errp)
+CpuDefinitionInfoList *qmp_query_cpu_definitions(Error **errp)

 {
 {

-    error_set(errp, QERR_NOT_SUPPORTED);
-    return NULL;
+    return arch_query_cpu_definitions(errp);

 }
 
 }
 

-CpuDefinitionInfoList *qmp_query_cpu_definitions(Error **errp)
+void qmp_add_client(const char *protocol, const char *fdname,
+                    bool has_skipauth, bool skipauth, bool has_tls, bool tls,
+                    Error **errp)

 {
 {

-    return arch_query_cpu_definitions(errp);
+    CharDriverState *s;
+    int fd;
+
+    fd = monitor_get_fd(cur_mon, fdname, errp);
+    if (fd < 0) {
+        return;
+    }
+
+    if (strcmp(protocol, "spice") == 0) {
+        if (!using_spice) {
+            error_set(errp, QERR_DEVICE_NOT_ACTIVE, "spice");
+            close(fd);
+            return;
+        }
+        skipauth = has_skipauth ? skipauth : false;
+        tls = has_tls ? tls : false;
+        if (qemu_spice_display_add_client(fd, skipauth, tls) < 0) {
+            error_setg(errp, "spice failed to add client");
+            close(fd);
+        }
+        return;
+#ifdef CONFIG_VNC
+    } else if (strcmp(protocol, "vnc") == 0) {
+        skipauth = has_skipauth ? skipauth : false;
+        vnc_display_add_client(NULL, fd, skipauth);
+        return;
+#endif
+    } else if ((s = qemu_chr_find(protocol)) != NULL) {
+        if (qemu_chr_add_client(s, fd) < 0) {
+            error_setg(errp, "failed to add client");
+            close(fd);
+            return;
+        }
+        return;
+    }
+
+    error_setg(errp, "protocol '%s' is invalid", protocol);
+    close(fd);
+}
+
+void object_add(const char *type, const char *id, const QDict *qdict,
+                Visitor *v, Error **errp)
+{
+    Object *obj;
+    const QDictEntry *e;
+    Error *local_err = NULL;
+
+    if (!object_class_by_name(type)) {
+        error_setg(errp, "invalid class name");
+        return;
+    }
+
+    obj = object_new(type);
+    if (qdict) {
+        for (e = qdict_first(qdict); e; e = qdict_next(qdict, e)) {
+            object_property_set(obj, v, e->key, &local_err);
+            if (local_err) {
+                goto out;
+            }
+        }
+    }
+
+    if (!object_dynamic_cast(obj, TYPE_USER_CREATABLE)) {
+        error_setg(&local_err, "object type '%s' isn't supported by object-add",
+                   type);
+        goto out;
+    }
+
+    user_creatable_complete(obj, &local_err);
+    if (local_err) {
+        goto out;
+    }
+
+    object_property_add_child(container_get(object_get_root(), "/objects"),
+                              id, obj, &local_err);
+out:
+    if (local_err) {
+        error_propagate(errp, local_err);
+    }
+    object_unref(obj);

 }
 
 }
 

+int qmp_object_add(Monitor *mon, const QDict *qdict, QObject **ret)
+{
+    const char *type = qdict_get_str(qdict, "qom-type");
+    const char *id = qdict_get_str(qdict, "id");
+    QObject *props = qdict_get(qdict, "props");
+    const QDict *pdict = NULL;
+    Error *local_err = NULL;
+    QmpInputVisitor *qiv;
+
+    if (props) {
+        pdict = qobject_to_qdict(props);
+        if (!pdict) {
+            error_set(&local_err, QERR_INVALID_PARAMETER_TYPE, "props", "dict");
+            goto out;
+        }
+    }
+
+    qiv = qmp_input_visitor_new(props);
+    object_add(type, id, pdict, qmp_input_get_visitor(qiv), &local_err);
+    qmp_input_visitor_cleanup(qiv);
+
+out:
+    if (local_err) {
+        qerror_report_err(local_err);
+        error_free(local_err);
+        return -1;
+    }
+
+    return 0;
+}
+
+void qmp_object_del(const char *id, Error **errp)
+{
+    Object *container;
+    Object *obj;
+
+    container = container_get(object_get_root(), "/objects");
+    obj = object_resolve_path_component(container, id);
+    if (!obj) {
+        error_setg(errp, "object id not found");
+        return;
+    }
+    object_unparent(obj);
+}