[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 4/4] monitor: Convert do_set_link() to QObject, Q
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v2 4/4] monitor: Convert do_set_link() to QObject, QError |
Date: |
Fri, 26 Mar 2010 09:07:11 +0100 |
Signed-off-by: Markus Armbruster <address@hidden>
---
net.c | 7 ++++---
net.h | 2 +-
qemu-monitor.hx | 3 ++-
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/net.c b/net.c
index 830021d..2559c07 100644
--- a/net.c
+++ b/net.c
@@ -1283,7 +1283,7 @@ void do_info_network(Monitor *mon)
}
}
-void do_set_link(Monitor *mon, const QDict *qdict)
+int do_set_link(Monitor *mon, const QDict *qdict, QObject **ret_data)
{
VLANState *vlan;
VLANClientState *vc = NULL;
@@ -1301,8 +1301,8 @@ void do_set_link(Monitor *mon, const QDict *qdict)
done:
if (!vc) {
- monitor_printf(mon, "could not find network device '%s'\n", name);
- return;
+ qerror_report(QERR_DEVICE_NOT_FOUND, name);
+ return -1;
}
vc->link_down = !up;
@@ -1310,6 +1310,7 @@ done:
if (vc->info->link_status_changed) {
vc->info->link_status_changed(vc);
}
+ return 0;
}
void net_cleanup(void)
diff --git a/net.h b/net.h
index ce9e2c6..c7a3a1b 100644
--- a/net.h
+++ b/net.h
@@ -118,7 +118,7 @@ int qemu_find_nic_model(NICInfo *nd, const char * const
*models,
const char *default_model);
void do_info_network(Monitor *mon);
-void do_set_link(Monitor *mon, const QDict *qdict);
+int do_set_link(Monitor *mon, const QDict *qdict, QObject **ret_data);
/* NIC info */
diff --git a/qemu-monitor.hx b/qemu-monitor.hx
index 7b7dcf5..62fa346 100644
--- a/qemu-monitor.hx
+++ b/qemu-monitor.hx
@@ -989,7 +989,8 @@ ETEXI
.args_type = "name:s,up:b",
.params = "name on|off",
.help = "change the link status of a network adapter",
- .mhandler.cmd = do_set_link,
+ .user_print = monitor_user_noop,
+ .mhandler.cmd_new = do_set_link,
},
STEXI
--
1.6.6.1
- [Qemu-devel] [PATCH v2 0/4] monitor: Convert do_set_link() to QObject, QError, Markus Armbruster, 2010/03/26
- [Qemu-devel] [PATCH v2 4/4] monitor: Convert do_set_link() to QObject, QError,
Markus Armbruster <=
- [Qemu-devel] [PATCH v2 1/4] monitor: Rename argument type 'b' to 'f', Markus Armbruster, 2010/03/26
- [Qemu-devel] [PATCH v2 2/4] monitor: New argument type 'b', Markus Armbruster, 2010/03/26
- [Qemu-devel] [PATCH v2 3/4] monitor: Use argument type 'b' for set_link, Markus Armbruster, 2010/03/26
- [Qemu-devel] Re: [PATCH v2 0/4] monitor: Convert do_set_link() to QObject, QError, Luiz Capitulino, 2010/03/29