[Qemu-devel] [PATCH 0/9]: Simple QObject conversions

[Qemu-devel] [PATCH 0/9]: Simple QObject conversions

[Luiz Capitulino]

 Hi,

 I've cherry picked the patches which don't depend on qobejct_from_fmt(),
added some more, and here goes another round of conversions.

 All of them are very simple. As the handlers being converted don't output
'regular' data (only errors) we only need to change their prototypes.

 I've added a note on the changelog to make it clear that errors are not
being converted yet.

 Thanks.

[Qemu-devel] [PATCH 1/9] monitor: Convert do_memory_save() to QObject

[Luiz Capitulino]

Note that errors are not being converted yet.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 monitor.c       |    2 +-
 qemu-monitor.hx |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/monitor.c b/monitor.c
index 3424e60..44ff994 100644
--- a/monitor.c
+++ b/monitor.c
@@ -977,7 +977,7 @@ static void do_print(Monitor *mon, const QDict *qdict)
     monitor_printf(mon, "\n");
 }
 
-static void do_memory_save(Monitor *mon, const QDict *qdict)
+static void do_memory_save(Monitor *mon, const QDict *qdict, QObject **ret_data)
 {
     FILE *f;
     uint32_t size = qdict_get_int(qdict, "size");
diff --git a/qemu-monitor.hx b/qemu-monitor.hx
index 29999c6..70b9125 100644
--- a/qemu-monitor.hx
+++ b/qemu-monitor.hx
@@ -666,7 +666,8 @@ ETEXI
         .args_type  = "val:l,size:i,filename:s",
         .params     = "addr size file",
         .help       = "save to disk virtual memory dump starting at 'addr' of size 'size'",
-        .mhandler.cmd = do_memory_save,
+        .user_print = monitor_user_noop,
+        .mhandler.cmd_new = do_memory_save,
     },
 
 STEXI
-- 
1.6.5.rc3.8.g8ba5e

[Qemu-devel] [PATCH 2/9] monitor: Convert do_physical_memory_save() to QObject

[Luiz Capitulino]

Note that errors are not being converted yet.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 monitor.c       |    3 ++-
 qemu-monitor.hx |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/monitor.c b/monitor.c
index 44ff994..a095971 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1008,7 +1008,8 @@ static void do_memory_save(Monitor *mon, const QDict *qdict, QObject **ret_data)
     fclose(f);
 }
 
-static void do_physical_memory_save(Monitor *mon, const QDict *qdict)
+static void do_physical_memory_save(Monitor *mon, const QDict *qdict,
+                                    QObject **ret_data)
 {
     FILE *f;
     uint32_t l;
diff --git a/qemu-monitor.hx b/qemu-monitor.hx
index 70b9125..1c605bd 100644
--- a/qemu-monitor.hx
+++ b/qemu-monitor.hx
@@ -680,7 +680,8 @@ ETEXI
         .args_type  = "val:l,size:i,filename:s",
         .params     = "addr size file",
         .help       = "save to disk physical memory dump starting at 'addr' of size 'size'",
-        .mhandler.cmd = do_physical_memory_save,
+        .user_print = monitor_user_noop,
+        .mhandler.cmd_new = do_physical_memory_save,
     },
 
 STEXI
-- 
1.6.5.rc3.8.g8ba5e

[Qemu-devel] [PATCH 3/9] monitor: Convert do_migrate() to QObject

[Luiz Capitulino]

Error is still directly printed, as we are only converting
regular output.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 migration.c     |    2 +-
 migration.h     |    2 +-
 qemu-monitor.hx |    3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/migration.c b/migration.c
index 7f93e3f..fb37d1b 100644
--- a/migration.c
+++ b/migration.c
@@ -52,7 +52,7 @@ void qemu_start_incoming_migration(const char *uri)
         fprintf(stderr, "unknown migration protocol: %s\n", uri);
 }
 
-void do_migrate(Monitor *mon, const QDict *qdict)
+void do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data)
 {
     MigrationState *s = NULL;
     const char *p;
diff --git a/migration.h b/migration.h
index 53b923d..17ca9ff 100644
--- a/migration.h
+++ b/migration.h
@@ -50,7 +50,7 @@ struct FdMigrationState
 
 void qemu_start_incoming_migration(const char *uri);
 
-void do_migrate(Monitor *mon, const QDict *qdict);
+void do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data);
 
 void do_migrate_cancel(Monitor *mon, const QDict *qdict);
 
diff --git a/qemu-monitor.hx b/qemu-monitor.hx
index 1c605bd..8e7bfd4 100644
--- a/qemu-monitor.hx
+++ b/qemu-monitor.hx
@@ -726,7 +726,8 @@ ETEXI
         .args_type  = "detach:-d,uri:s",
         .params     = "[-d] uri",
         .help       = "migrate to URI (using -d to not wait for completion)",
-        .mhandler.cmd = do_migrate,
+        .user_print = monitor_user_noop,
+        .mhandler.cmd_new = do_migrate,
     },
 
 STEXI
-- 
1.6.5.rc3.8.g8ba5e

[Qemu-devel] [PATCH 4/9] monitor: Convert do_migrate_set_speed() to QObject

[Luiz Capitulino]

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 migration.c     |    2 +-
 migration.h     |    2 +-
 qemu-monitor.hx |    3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/migration.c b/migration.c
index fb37d1b..9a40b37 100644
--- a/migration.c
+++ b/migration.c
@@ -90,7 +90,7 @@ void do_migrate_cancel(Monitor *mon, const QDict *qdict)
         s->cancel(s);
 }
 
-void do_migrate_set_speed(Monitor *mon, const QDict *qdict)
+void do_migrate_set_speed(Monitor *mon, const QDict *qdict, QObject **ret_data)
 {
     double d;
     char *ptr;
diff --git a/migration.h b/migration.h
index 17ca9ff..40bd610 100644
--- a/migration.h
+++ b/migration.h
@@ -54,7 +54,7 @@ void do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data);
 
 void do_migrate_cancel(Monitor *mon, const QDict *qdict);
 
-void do_migrate_set_speed(Monitor *mon, const QDict *qdict);
+void do_migrate_set_speed(Monitor *mon, const QDict *qdict, QObject **ret_data);
 
 uint64_t migrate_max_downtime(void);
 
diff --git a/qemu-monitor.hx b/qemu-monitor.hx
index 8e7bfd4..af1bae5 100644
--- a/qemu-monitor.hx
+++ b/qemu-monitor.hx
@@ -753,7 +753,8 @@ ETEXI
         .args_type  = "value:s",
         .params     = "value",
         .help       = "set maximum speed (in bytes) for migrations",
-        .mhandler.cmd = do_migrate_set_speed,
+        .user_print = monitor_user_noop,
+        .mhandler.cmd_new = do_migrate_set_speed,
     },
 
 STEXI
-- 
1.6.5.rc3.8.g8ba5e

[Qemu-devel] [PATCH 5/9] monitor: Convert do_migrate_cancel() to QObject

[Luiz Capitulino]

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 migration.c     |    2 +-
 migration.h     |    2 +-
 qemu-monitor.hx |    3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/migration.c b/migration.c
index 9a40b37..b20beb7 100644
--- a/migration.c
+++ b/migration.c
@@ -82,7 +82,7 @@ void do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data)
     }
 }
 
-void do_migrate_cancel(Monitor *mon, const QDict *qdict)
+void do_migrate_cancel(Monitor *mon, const QDict *qdict, QObject **ret_data)
 {
     MigrationState *s = current_migration;
 
diff --git a/migration.h b/migration.h
index 40bd610..2d28b8f 100644
--- a/migration.h
+++ b/migration.h
@@ -52,7 +52,7 @@ void qemu_start_incoming_migration(const char *uri);
 
 void do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data);
 
-void do_migrate_cancel(Monitor *mon, const QDict *qdict);
+void do_migrate_cancel(Monitor *mon, const QDict *qdict, QObject **ret_data);
 
 void do_migrate_set_speed(Monitor *mon, const QDict *qdict, QObject **ret_data);
 
diff --git a/qemu-monitor.hx b/qemu-monitor.hx
index af1bae5..41fbfd3 100644
--- a/qemu-monitor.hx
+++ b/qemu-monitor.hx
@@ -740,7 +740,8 @@ ETEXI
         .args_type  = "",
         .params     = "",
         .help       = "cancel the current VM migration",
-        .mhandler.cmd = do_migrate_cancel,
+        .user_print = monitor_user_noop,
+        .mhandler.cmd_new = do_migrate_cancel,
     },
 
 STEXI
-- 
1.6.5.rc3.8.g8ba5e

[Qemu-devel] [PATCH 6/9] monitor: Convert do_pci_device_hot_remove() to QObject

[Luiz Capitulino]

Errors are still directly printed, as we are only converting
regular output.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 hw/pci-hotplug.c |    3 ++-
 qemu-monitor.hx  |    3 ++-
 sysemu.h         |    3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/hw/pci-hotplug.c b/hw/pci-hotplug.c
index 35fa290..ad9893a 100644
--- a/hw/pci-hotplug.c
+++ b/hw/pci-hotplug.c
@@ -230,7 +230,8 @@ void pci_device_hot_remove(Monitor *mon, const char *pci_addr)
     qdev_unplug(&d->qdev);
 }
 
-void do_pci_device_hot_remove(Monitor *mon, const QDict *qdict)
+void do_pci_device_hot_remove(Monitor *mon, const QDict *qdict,
+                              QObject **ret_data)
 {
     pci_device_hot_remove(mon, qdict_get_str(qdict, "pci_addr"));
 }
diff --git a/qemu-monitor.hx b/qemu-monitor.hx
index 41fbfd3..4610ad4 100644
--- a/qemu-monitor.hx
+++ b/qemu-monitor.hx
@@ -816,7 +816,8 @@ ETEXI
         .args_type  = "pci_addr:s",
         .params     = "[[<domain>:]<bus>:]<slot>",
         .help       = "hot remove PCI device",
-        .mhandler.cmd = do_pci_device_hot_remove,
+        .user_print = monitor_user_noop,
+        .mhandler.cmd_new = do_pci_device_hot_remove,
     },
 #endif
 
diff --git a/sysemu.h b/sysemu.h
index 763861d..d91ef67 100644
--- a/sysemu.h
+++ b/sysemu.h
@@ -211,7 +211,8 @@ void destroy_nic(dev_match_fn *match_fn, void *arg);
 void pci_device_hot_add(Monitor *mon, const QDict *qdict);
 void drive_hot_add(Monitor *mon, const QDict *qdict);
 void pci_device_hot_remove(Monitor *mon, const char *pci_addr);
-void do_pci_device_hot_remove(Monitor *mon, const QDict *qdict);
+void do_pci_device_hot_remove(Monitor *mon, const QDict *qdict,
+                              QObject **ret_data);
 void pci_device_hot_remove_success(PCIDevice *dev);
 
 /* serial ports */
-- 
1.6.5.rc3.8.g8ba5e

[Qemu-devel] [PATCH 7/9] monitor: Convert do_eject() to QObject

[Luiz Capitulino]

Note that errors are not being converted yet.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 monitor.c       |    2 +-
 qemu-monitor.hx |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/monitor.c b/monitor.c
index a095971..a0d371d 100644
--- a/monitor.c
+++ b/monitor.c
@@ -570,7 +570,7 @@ static int eject_device(Monitor *mon, BlockDriverState *bs, int force)
     return 0;
 }
 
-static void do_eject(Monitor *mon, const QDict *qdict)
+static void do_eject(Monitor *mon, const QDict *qdict, QObject **ret_data)
 {
     BlockDriverState *bs;
     int force = qdict_get_int(qdict, "force");
diff --git a/qemu-monitor.hx b/qemu-monitor.hx
index 4610ad4..05b4534 100644
--- a/qemu-monitor.hx
+++ b/qemu-monitor.hx
@@ -133,7 +133,8 @@ ETEXI
         .args_type  = "force:-f,filename:B",
         .params     = "[-f] device",
         .help       = "eject a removable medium (use -f to force it)",
-        .mhandler.cmd = do_eject,
+        .user_print = monitor_user_noop,
+        .mhandler.cmd_new = do_eject,
     },
 
 STEXI
-- 
1.6.5.rc3.8.g8ba5e

[Qemu-devel] [PATCH 8/9] monitor: Convert do_getfd() to QObject

[Luiz Capitulino]

Note that errors are not being converted yet.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 monitor.c       |    2 +-
 qemu-monitor.hx |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/monitor.c b/monitor.c
index a0d371d..f35b55f 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1848,7 +1848,7 @@ static void do_inject_mce(Monitor *mon, const QDict *qdict)
 }
 #endif
 
-static void do_getfd(Monitor *mon, const QDict *qdict)
+static void do_getfd(Monitor *mon, const QDict *qdict, QObject **ret_data)
 {
     const char *fdname = qdict_get_str(qdict, "fdname");
     mon_fd_t *monfd;
diff --git a/qemu-monitor.hx b/qemu-monitor.hx
index 05b4534..cc4487e 100644
--- a/qemu-monitor.hx
+++ b/qemu-monitor.hx
@@ -1013,7 +1013,8 @@ ETEXI
         .args_type  = "fdname:s",
         .params     = "getfd name",
         .help       = "receive a file descriptor via SCM rights and assign it a name",
-        .mhandler.cmd = do_getfd,
+        .user_print = monitor_user_noop,
+        .mhandler.cmd_new = do_getfd,
     },
 
 STEXI
-- 
1.6.5.rc3.8.g8ba5e

[Qemu-devel] [PATCH 9/9] monitor: Convert do_closefd() to QObject

[Luiz Capitulino]

Note that errors are not being converted yet.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 monitor.c       |    2 +-
 qemu-monitor.hx |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/monitor.c b/monitor.c
index f35b55f..3d82ab8 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1889,7 +1889,7 @@ static void do_getfd(Monitor *mon, const QDict *qdict, QObject **ret_data)
     QLIST_INSERT_HEAD(&mon->fds, monfd, next);
 }
 
-static void do_closefd(Monitor *mon, const QDict *qdict)
+static void do_closefd(Monitor *mon, const QDict *qdict, QObject **ret_data)
 {
     const char *fdname = qdict_get_str(qdict, "fdname");
     mon_fd_t *monfd;
diff --git a/qemu-monitor.hx b/qemu-monitor.hx
index cc4487e..bb01c14 100644
--- a/qemu-monitor.hx
+++ b/qemu-monitor.hx
@@ -1029,7 +1029,8 @@ ETEXI
         .args_type  = "fdname:s",
         .params     = "closefd name",
         .help       = "close a file descriptor previously passed via SCM rights",
-        .mhandler.cmd = do_closefd,
+        .user_print = monitor_user_noop,
+        .mhandler.cmd_new = do_closefd,
     },
 
 STEXI
-- 
1.6.5.rc3.8.g8ba5e