[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 7/8] net: slirp: introduce info_dict
From: |
Miguel Di Ciurcio Filho |
Subject: |
[Qemu-devel] [PATCH 7/8] net: slirp: introduce info_dict |
Date: |
Thu, 10 Jun 2010 18:37:04 -0300 |
Signed-off-by: Miguel Di Ciurcio Filho <address@hidden>
---
net/slirp.c | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/net/slirp.c b/net/slirp.c
index b41c60a..5735009 100644
--- a/net/slirp.c
+++ b/net/slirp.c
@@ -32,6 +32,10 @@
#include "monitor.h"
#include "sysemu.h"
#include "qemu_socket.h"
+#include "qdict.h"
+#include "qbool.h"
+#include "qstring.h"
+#include "qjson.h"
#include "slirp/libslirp.h"
static int get_str_sep(char *buf, int buf_size, const char **pp, int sep)
@@ -243,6 +247,12 @@ static int net_slirp_init(VLANState *vlan, const char
*model,
snprintf(nc->info_str, sizeof(nc->info_str),
"net=%s, restricted=%c", inet_ntoa(net), restricted ? 'y' : 'n');
+ assert(nc->info_dict == NULL);
+ nc->info_dict = qobject_to_qdict(qobject_from_jsonf("{'net': %s,\
+ 'host': %s, 'dhcp': %s, 'dns': %s }", inet_ntoa(net), inet_ntoa(host),
+ inet_ntoa(dhcp), inet_ntoa(dns)));
+ qdict_put(nc->info_dict, "restricted", qbool_from_int(restricted));
+
s = DO_UPCAST(SlirpState, nc, nc);
s->slirp = slirp_init(restricted, net, mask, host, vhostname,
@@ -265,8 +275,13 @@ static int net_slirp_init(VLANState *vlan, const char
*model,
smb_export = legacy_smb_export;
}
if (smb_export) {
- if (slirp_smb(s, smb_export, smbsrv) < 0)
+ if (slirp_smb(s, smb_export, smbsrv) < 0) {
goto error;
+ } else {
+ qdict_put(nc->info_dict, "smb", qstring_from_str(smb_export));
+ qdict_put(nc->info_dict, "smbserver",
+ qstring_from_str(inet_ntoa(smbsrv)));
+ }
}
#endif
--
1.7.1
- Re: [Qemu-devel] [PATCH 2/8] QMP: Introduce the documentation for query-netdev and info netdev, (continued)
- [Qemu-devel] [PATCH 3/8] net: Introduce VLANClientState->info_dict, Miguel Di Ciurcio Filho, 2010/06/10
- [Qemu-devel] [PATCH 4/8] net: tap/tap-win32: introduce info_dict, Miguel Di Ciurcio Filho, 2010/06/10
- [Qemu-devel] [PATCH 5/8] net: vde: introduce info_dict, Miguel Di Ciurcio Filho, 2010/06/10
- [Qemu-devel] [PATCH 6/8] net: socket: introduce info_dict, Miguel Di Ciurcio Filho, 2010/06/10
- [Qemu-devel] [PATCH 7/8] net: slirp: introduce info_dict,
Miguel Di Ciurcio Filho <=
- [Qemu-devel] [PATCH 8/8] monitor/net: introduce 'info netdev' with QMP support, Miguel Di Ciurcio Filho, 2010/06/10
- [Qemu-devel] Re: [PATCH 0/8] QMP: Introduce query-netdev, Luiz Capitulino, 2010/06/16