[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 02/12] net: add qemu_nic_format_info_dict and VLA
From: |
Miguel Di Ciurcio Filho |
Subject: |
[Qemu-devel] [PATCH v3 02/12] net: add qemu_nic_format_info_dict and VLANClientState->info_dict |
Date: |
Thu, 15 Apr 2010 11:06:57 -0300 |
There is no standard format when formatting VLANClientState.info_str,
so it is difficult to extract information and transmit it over QMP.
This patch adds info_dict, a QDict to better handle the information
of a NIC.
Patches that convert the devices to use this new function will follow.
Signed-off-by: Miguel Di Ciurcio Filho <address@hidden>
---
net.c | 16 ++++++++++++++++
net.h | 2 ++
2 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/net.c b/net.c
index d7d76eb..8c02f28 100644
--- a/net.c
+++ b/net.c
@@ -35,6 +35,8 @@
#include "sysemu.h"
#include "qemu-common.h"
#include "qemu_socket.h"
+#include "qdict.h"
+#include "qstring.h"
#include "hw/qdev.h"
static QTAILQ_HEAD(, VLANState) vlans;
@@ -173,6 +175,19 @@ void qemu_format_nic_info_str(VLANClientState *vc, uint8_t
macaddr[6])
macaddr[3], macaddr[4], macaddr[5]);
}
+void qemu_format_nic_info_dict(VLANClientState *vc, uint8_t macaddr[6])
+{
+ vc->info_dict = qdict_new();
+ char mac[18];
+
+ snprintf(mac, sizeof(mac), "%02x:%02x:%02x:%02x:%02x:%02x",
+ macaddr[0], macaddr[1], macaddr[2],
+ macaddr[3], macaddr[4], macaddr[5]);
+
+ qdict_put(vc->info_dict, "macaddr", qstring_from_str(mac));
+ qdict_put(vc->info_dict, "model", qstring_from_str(vc->model));
+}
+
void qemu_macaddr_default_if_unset(MACAddr *macaddr)
{
static int index = 0;
@@ -301,6 +316,7 @@ void qemu_del_vlan_client(VLANClientState *vc)
qemu_free(vc->name);
qemu_free(vc->model);
+ QDECREF(vc->info_dict);
qemu_free(vc);
}
diff --git a/net.h b/net.h
index c7a3a1b..d12276a 100644
--- a/net.h
+++ b/net.h
@@ -66,6 +66,7 @@ struct VLANClientState {
char *model;
char *name;
char info_str[256];
+ QDict *info_dict;
unsigned receive_disabled : 1;
};
@@ -111,6 +112,7 @@ ssize_t qemu_send_packet_async(VLANClientState *vc, const
uint8_t *buf,
void qemu_purge_queued_packets(VLANClientState *vc);
void qemu_flush_queued_packets(VLANClientState *vc);
void qemu_format_nic_info_str(VLANClientState *vc, uint8_t macaddr[6]);
+void qemu_format_nic_info_dict(VLANClientState *vc, uint8_t macaddr[6]);
void qemu_macaddr_default_if_unset(MACAddr *macaddr);
int qemu_show_nic_models(const char *arg, const char *const *models);
void qemu_check_nic_model(NICInfo *nd, const char *model);
--
1.7.0.4
- [Qemu-devel] [PATCH v3 08/12] net: dump: use info_dict instead of info_str, (continued)
- [Qemu-devel] [PATCH v3 08/12] net: dump: use info_dict instead of info_str, Miguel Di Ciurcio Filho, 2010/04/15
- [Qemu-devel] [PATCH v3 04/12] net: various devices: replace qemu_format_nic_info_str by qemu_format_nic_info_dict, Miguel Di Ciurcio Filho, 2010/04/15
- [Qemu-devel] [PATCH v3 06/12] net: tap/tap-win32: use info_dict instead of info_str, Miguel Di Ciurcio Filho, 2010/04/15
- [Qemu-devel] [PATCH v3 03/12] net: eepro100: replace qemu_format_nic_info_str by qemu_format_nic_info_dict, Miguel Di Ciurcio Filho, 2010/04/15
- [Qemu-devel] [PATCH v3 05/12] net: slirp: use info_dict instead of info_str, Miguel Di Ciurcio Filho, 2010/04/15
- [Qemu-devel] [PATCH v3 01/12] QObject API: add qdict_to_qstring() function, Miguel Di Ciurcio Filho, 2010/04/15
- [Qemu-devel] [PATCH v3 02/12] net: add qemu_nic_format_info_dict and VLANClientState->info_dict,
Miguel Di Ciurcio Filho <=