From 1d4daa91ff0b77e86b3944faf8fc7f978cf51c84 Mon Sep 17 00:00:00 2001 From: Luiz Capitulino Date: Fri, 28 Aug 2009 15:27:15 -0300 Subject: [PATCH] monitor: Port handler_3 to use QDict This commit ports command handlers that receive three arguments to use the new monitor's dictionary. Signed-off-by: Luiz Capitulino Signed-off-by: Anthony Liguori --- hw/pci-hotplug.c | 6 ++++-- monitor.c | 24 +++++++++++++----------- net.c | 12 ++++++++---- net.h | 6 ++---- sysemu.h | 3 +-- 5 files changed, 28 insertions(+), 23 deletions(-) diff --git a/hw/pci-hotplug.c b/hw/pci-hotplug.c index ba25be4a29..6bd837a401 100644 --- a/hw/pci-hotplug.c +++ b/hw/pci-hotplug.c @@ -151,10 +151,12 @@ static PCIDevice *qemu_pci_hot_add_storage(Monitor *mon, return dev; } -void pci_device_hot_add(Monitor *mon, const char *pci_addr, const char *type, - const char *opts) +void pci_device_hot_add(Monitor *mon, const QDict *qdict) { PCIDevice *dev = NULL; + const char *pci_addr = qdict_get_str(qdict, "pci_addr"); + const char *type = qdict_get_str(qdict, "type"); + const char *opts = qdict_get_try_str(qdict, "opts"); /* strip legacy tag */ if (!strncmp(pci_addr, "pci_addr=", 9)) { diff --git a/monitor.c b/monitor.c index d6b1d6463e..8607d6c2f4 100644 --- a/monitor.c +++ b/monitor.c @@ -517,9 +517,11 @@ static void do_change_vnc(Monitor *mon, const char *target, const char *arg) } } -static void do_change(Monitor *mon, const char *device, const char *target, - const char *arg) +static void do_change(Monitor *mon, const QDict *qdict) { + const char *device = qdict_get_str(qdict, "device"); + const char *target = qdict_get_str(qdict, "target"); + const char *arg = qdict_get_try_str(qdict, "arg"); if (strcmp(device, "vnc") == 0) { do_change_vnc(mon, target, arg); } else { @@ -1112,12 +1114,14 @@ static void release_keys(void *opaque) } } -static void do_sendkey(Monitor *mon, const char *string, int has_hold_time, - int hold_time) +static void do_sendkey(Monitor *mon, const QDict *qdict) { char keyname_buf[16]; char *separator; int keyname_len, keycode, i; + const char *string = qdict_get_str(qdict, "string"); + int has_hold_time = qdict_haskey(qdict, "hold_time"); + int hold_time = qdict_get_try_int(qdict, "hold_time", -1); if (nb_pending_keycodes > 0) { qemu_del_timer(key_timer); @@ -1166,10 +1170,12 @@ static void do_sendkey(Monitor *mon, const char *string, int has_hold_time, static int mouse_button_state; -static void do_mouse_move(Monitor *mon, const char *dx_str, const char *dy_str, - const char *dz_str) +static void do_mouse_move(Monitor *mon, const QDict *qdict) { int dx, dy, dz; + const char *dx_str = qdict_get_str(qdict, "dx_str"); + const char *dy_str = qdict_get_str(qdict, "dy_str"); + const char *dz_str = qdict_get_try_str(qdict, "dz_str"); dx = strtol(dx_str, NULL, 0); dy = strtol(dy_str, NULL, 0); dz = 0; @@ -2579,7 +2585,6 @@ static void monitor_handle_command(Monitor *mon, const char *cmdline) void *str_allocated[MAX_ARGS]; void *args[MAX_ARGS]; void (*handler_d)(Monitor *mon, const QDict *qdict); - void (*handler_3)(Monitor *mon, void *arg0, void *arg1, void *arg2); void (*handler_4)(Monitor *mon, void *arg0, void *arg1, void *arg2, void *arg3); void (*handler_5)(Monitor *mon, void *arg0, void *arg1, void *arg2, @@ -2872,13 +2877,10 @@ static void monitor_handle_command(Monitor *mon, const char *cmdline) case 0: case 1: case 2: + case 3: handler_d = cmd->handler; handler_d(mon, qdict); break; - case 3: - handler_3 = cmd->handler; - handler_3(mon, args[0], args[1], args[2]); - break; case 4: handler_4 = cmd->handler; handler_4(mon, args[0], args[1], args[2], args[3]); diff --git a/net.c b/net.c index e2513c2223..ea9765a6d5 100644 --- a/net.c +++ b/net.c @@ -897,8 +897,7 @@ static SlirpState *slirp_lookup(Monitor *mon, const char *vlan, } } -void net_slirp_hostfwd_remove(Monitor *mon, const char *arg1, - const char *arg2, const char *arg3) +void net_slirp_hostfwd_remove(Monitor *mon, const QDict *qdict) { struct in_addr host_addr = { .s_addr = INADDR_ANY }; int host_port; @@ -907,6 +906,9 @@ void net_slirp_hostfwd_remove(Monitor *mon, const char *arg1, SlirpState *s; int is_udp = 0; int err; + const char *arg1 = qdict_get_str(qdict, "arg1"); + const char *arg2 = qdict_get_try_str(qdict, "arg2"); + const char *arg3 = qdict_get_try_str(qdict, "arg3"); if (arg2) { s = slirp_lookup(mon, arg1, arg2); @@ -1016,11 +1018,13 @@ static void slirp_hostfwd(SlirpState *s, Monitor *mon, const char *redir_str, config_error(mon, "invalid host forwarding rule '%s'\n", redir_str); } -void net_slirp_hostfwd_add(Monitor *mon, const char *arg1, - const char *arg2, const char *arg3) +void net_slirp_hostfwd_add(Monitor *mon, const QDict *qdict) { const char *redir_str; SlirpState *s; + const char *arg1 = qdict_get_str(qdict, "arg1"); + const char *arg2 = qdict_get_try_str(qdict, "arg2"); + const char *arg3 = qdict_get_try_str(qdict, "arg3"); if (arg2) { s = slirp_lookup(mon, arg1, arg2); diff --git a/net.h b/net.h index 7fadc350e0..f46e6c6756 100644 --- a/net.h +++ b/net.h @@ -138,10 +138,8 @@ int net_client_init(Monitor *mon, const char *device, const char *p); void net_client_uninit(NICInfo *nd); int net_client_parse(const char *str); void net_slirp_smb(const char *exported_dir); -void net_slirp_hostfwd_add(Monitor *mon, const char *arg1, - const char *arg2, const char *arg3); -void net_slirp_hostfwd_remove(Monitor *mon, const char *arg1, - const char *arg2, const char *arg3); +void net_slirp_hostfwd_add(Monitor *mon, const QDict *qdict); +void net_slirp_hostfwd_remove(Monitor *mon, const QDict *qdict); void net_slirp_redir(const char *redir_str); void net_cleanup(void); void net_client_check(void); diff --git a/sysemu.h b/sysemu.h index 586d9d074f..ac16c2105a 100644 --- a/sysemu.h +++ b/sysemu.h @@ -210,8 +210,7 @@ void destroy_nic(dev_match_fn *match_fn, void *arg); void destroy_bdrvs(dev_match_fn *match_fn, void *arg); /* pci-hotplug */ -void pci_device_hot_add(Monitor *mon, const char *pci_addr, const char *type, - const char *opts); +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);