[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/25] monitor: Port handler_2 to use the dictionary
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 11/25] monitor: Port handler_2 to use the dictionary |
Date: |
Mon, 3 Aug 2009 13:57:08 -0300 |
This commit ports command handlers that receive two arguments to use
the new monitor's dictionary.
Signed-off-by: Luiz Capitulino <address@hidden>
---
hw/pci-hotplug.c | 4 +++-
migration.c | 4 +++-
migration.h | 2 +-
monitor.c | 23 +++++++++++++----------
net.c | 13 ++++++++++---
net.h | 7 ++++---
sysemu.h | 2 +-
7 files changed, 35 insertions(+), 20 deletions(-)
diff --git a/hw/pci-hotplug.c b/hw/pci-hotplug.c
index 892be36..0a4fc05 100644
--- a/hw/pci-hotplug.c
+++ b/hw/pci-hotplug.c
@@ -48,7 +48,7 @@ static PCIDevice *qemu_pci_hot_add_nic(Monitor *mon,
return pci_nic_init(&nd_table[ret], "rtl8139", devaddr);
}
-void drive_hot_add(Monitor *mon, const char *pci_addr, const char *opts)
+void drive_hot_add(Monitor *mon, const QDict *qdict)
{
int dom, pci_bus;
unsigned slot;
@@ -56,6 +56,8 @@ void drive_hot_add(Monitor *mon, const char *pci_addr, const
char *opts)
int success = 0;
PCIDevice *dev;
DriveInfo *dinfo;
+ const char *pci_addr = qdict_get(qdict, "pci_addr");
+ const char *opts = qdict_get(qdict, "opts");
if (pci_read_devaddr(mon, pci_addr, &dom, &pci_bus, &slot)) {
return;
diff --git a/migration.c b/migration.c
index cc5caf2..db12ddf 100644
--- a/migration.c
+++ b/migration.c
@@ -48,10 +48,12 @@ void qemu_start_incoming_migration(const char *uri)
fprintf(stderr, "unknown migration protocol: %s\n", uri);
}
-void do_migrate(Monitor *mon, int detach, const char *uri)
+void do_migrate(Monitor *mon, const QDict *qdict)
{
MigrationState *s = NULL;
const char *p;
+ int detach = (long) qdict_get(qdict, "detach");
+ const char *uri = qdict_get(qdict, "uri");
if (strstart(uri, "tcp:", &p))
s = tcp_start_outgoing_migration(p, max_throttle, detach);
diff --git a/migration.h b/migration.h
index 842ff50..ffcaec9 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, int detach, const char *uri);
+void do_migrate(Monitor *mon, const QDict *qdict);
void do_migrate_cancel(Monitor *mon, const QDict *qdict);
diff --git a/monitor.c b/monitor.c
index fa5f1ea..142c308 100644
--- a/monitor.c
+++ b/monitor.c
@@ -452,9 +452,11 @@ static int eject_device(Monitor *mon, BlockDriverState
*bs, int force)
return 0;
}
-static void do_eject(Monitor *mon, int force, const char *filename)
+static void do_eject(Monitor *mon, const QDict *qdict)
{
BlockDriverState *bs;
+ int force = (long) qdict_get(qdict, "force");
+ const char *filename = qdict_get(qdict, "filename");
bs = bdrv_find(filename);
if (!bs) {
@@ -920,11 +922,13 @@ static void do_physical_memory_save(Monitor *mon,
unsigned int valh,
fclose(f);
}
-static void do_sum(Monitor *mon, uint32_t start, uint32_t size)
+static void do_sum(Monitor *mon, const QDict *qdict)
{
uint32_t addr;
uint8_t buf[1];
uint16_t sum;
+ uint32_t start = (long) qdict_get(qdict, "start");
+ uint32_t size = (long) qdict_get(qdict, "size");
sum = 0;
for(addr = start; addr < (start + size); addr++) {
@@ -1663,9 +1667,10 @@ static void do_acl_reset(Monitor *mon, const QDict
*qdict)
}
}
-static void do_acl_policy(Monitor *mon, const char *aclname,
- const char *policy)
+static void do_acl_policy(Monitor *mon, const QDict *qdict)
{
+ const char *aclname = qdict_get(qdict, "aclname");
+ const char *policy = qdict_get(qdict, "policy");
qemu_acl *acl = find_acl(mon, aclname);
if (acl) {
@@ -1710,8 +1715,10 @@ static void do_acl_add(Monitor *mon, const char *aclname,
}
}
-static void do_acl_remove(Monitor *mon, const char *aclname, const char *match)
+static void do_acl_remove(Monitor *mon, const QDict *qdict)
{
+ const char *aclname = qdict_get(qdict, "aclname");
+ const char *match = qdict_get(qdict, "match");
qemu_acl *acl = find_acl(mon, aclname);
int ret;
@@ -2657,7 +2664,6 @@ static void monitor_handle_command(Monitor *mon, const
char *cmdline)
void *args[MAX_ARGS];
QDict *qdict;
void (*handler_d)(Monitor *mon, const QDict *qdict);
- void (*handler_2)(Monitor *mon, void *arg0, void *arg1);
void (*handler_3)(Monitor *mon, void *arg0, void *arg1, void *arg2);
void (*handler_4)(Monitor *mon, void *arg0, void *arg1, void *arg2,
void *arg3);
@@ -2958,13 +2964,10 @@ static void monitor_handle_command(Monitor *mon, const
char *cmdline)
switch(nb_args) {
case 0:
case 1:
+ case 2:
handler_d = cmd->handler;
handler_d(mon, qdict);
break;
- case 2:
- handler_2 = cmd->handler;
- handler_2(mon, args[0], args[1]);
- break;
case 3:
handler_3 = cmd->handler;
handler_3(mon, args[0], args[1], args[2]);
diff --git a/net.c b/net.c
index 1b531e7..9100697 100644
--- a/net.c
+++ b/net.c
@@ -2827,8 +2827,11 @@ static int net_host_check_device(const char *device)
return 0;
}
-void net_host_device_add(Monitor *mon, const char *device, const char *opts)
+void net_host_device_add(Monitor *mon, const QDict *qdict)
{
+ const char *device = qdict_get(qdict, "device");
+ const char *opts = qdict_get(qdict, "opts");
+
if (!net_host_check_device(device)) {
monitor_printf(mon, "invalid host network device %s\n", device);
return;
@@ -2838,9 +2841,11 @@ void net_host_device_add(Monitor *mon, const char
*device, const char *opts)
}
}
-void net_host_device_remove(Monitor *mon, int vlan_id, const char *device)
+void net_host_device_remove(Monitor *mon, const QDict *qdict)
{
VLANClientState *vc;
+ int vlan_id = (long) qdict_get(qdict, "vlan_id");
+ const char *device = qdict_get(qdict, "device");
vc = qemu_find_vlan_client_by_name(mon, vlan_id, device);
if (!vc) {
@@ -2905,10 +2910,12 @@ void do_info_network(Monitor *mon)
}
}
-void do_set_link(Monitor *mon, const char *name, const char *up_or_down)
+void do_set_link(Monitor *mon, const QDict *qdict)
{
VLANState *vlan;
VLANClientState *vc = NULL;
+ const char *name = qdict_get(qdict, "name");
+ const char *up_or_down = qdict_get(qdict, "up_or_down");
for (vlan = first_vlan; vlan != NULL; vlan = vlan->next)
for (vc = vlan->first_client; vc != NULL; vc = vc->next)
diff --git a/net.h b/net.h
index 3ac9e8c..e6fd3f8 100644
--- a/net.h
+++ b/net.h
@@ -2,6 +2,7 @@
#define QEMU_NET_H
#include "qemu-common.h"
+#include "qdict.h"
/* VLANs support */
@@ -79,7 +80,7 @@ void qemu_check_nic_model_list(NICInfo *nd, const char *
const *models,
void qemu_handler_true(void *opaque);
void do_info_network(Monitor *mon);
-void do_set_link(Monitor *mon, const char *name, const char *up_or_down);
+void do_set_link(Monitor *mon, const QDict *qdict);
void do_info_usernet(Monitor *mon);
@@ -144,8 +145,8 @@ void net_slirp_redir(const char *redir_str);
void net_cleanup(void);
void net_client_check(void);
void net_set_boot_mask(int boot_mask);
-void net_host_device_add(Monitor *mon, const char *device, const char *opts);
-void net_host_device_remove(Monitor *mon, int vlan_id, const char *device);
+void net_host_device_add(Monitor *mon, const QDict *qdict);
+void net_host_device_remove(Monitor *mon, const QDict *qdict);
#define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup"
#define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown"
diff --git a/sysemu.h b/sysemu.h
index b006813..b9f7199 100644
--- a/sysemu.h
+++ b/sysemu.h
@@ -212,7 +212,7 @@ 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 drive_hot_add(Monitor *mon, const char *pci_addr, const char *opts);
+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 pci_device_hot_remove_success(int pcibus, int slot);
--
1.6.4.rc3.12.gdf73a
- [Qemu-devel] [PATCH 03/25] Add wrappers to functions used by the Monitor, (continued)
- [Qemu-devel] [PATCH 03/25] Add wrappers to functions used by the Monitor, Luiz Capitulino, 2009/08/03
- [Qemu-devel] [PATCH 04/25] monitor: Document missing supported argument types, Luiz Capitulino, 2009/08/03
- [Qemu-devel] [PATCH 05/25] monitor: New format for handlers argument types, Luiz Capitulino, 2009/08/03
- [Qemu-devel] [PATCH 06/25] monitor: Setup a dictionary with handler arguments, Luiz Capitulino, 2009/08/03
- [Qemu-devel] [PATCH 07/25] monitor: Export qdict.h header, Luiz Capitulino, 2009/08/03
- [Qemu-devel] [PATCH 08/25] monitor: New GET_TLONG and GET_TPHYSADDR macros, Luiz Capitulino, 2009/08/03
- [Qemu-devel] [PATCH 09/25] monitor: Port handler_0 to use the dictionary, Luiz Capitulino, 2009/08/03
- [Qemu-devel] [PATCH 10/25] monitor: Port handler_1 to use the dictionary, Luiz Capitulino, 2009/08/03
- [Qemu-devel] [PATCH 11/25] monitor: Port handler_2 to use the dictionary,
Luiz Capitulino <=
- [Qemu-devel] [PATCH 12/25] monitor: Port handler_3 to use the dictionary, Luiz Capitulino, 2009/08/03
- [Qemu-devel] [PATCH 13/25] monitor: Port handler_4 to use the dictionary, Luiz Capitulino, 2009/08/03
- [Qemu-devel] [PATCH 14/25] monitor: Port handler_5 to use the dictionary, Luiz Capitulino, 2009/08/03
- [Qemu-devel] [PATCH 15/25] monitor: Port handler_6 to use the dictionary, Luiz Capitulino, 2009/08/03
- [Qemu-devel] [PATCH 17/25] monitor: Drop handler_8 and handler_9 handling, Luiz Capitulino, 2009/08/03
- [Qemu-devel] [PATCH 16/25] monitor: Port handler_7 to use the dictionary, Luiz Capitulino, 2009/08/03
- [Qemu-devel] [PATCH 18/25] monitor: Port handler_10 to use the dictionary, Luiz Capitulino, 2009/08/03
- [Qemu-devel] [PATCH 19/25] monitor: Split monitor_handle_command(), Luiz Capitulino, 2009/08/03
- [Qemu-devel] [PATCH 20/25] monitor: Add a new index for str_allocated[], Luiz Capitulino, 2009/08/03
- [Qemu-devel] [PATCH 21/25] monitor: Drop args[] from monitor_parse_command(), Luiz Capitulino, 2009/08/03