OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

util: remove the net/net.h dependency

Browse Source 
Move qemu_ether_ntoa() which is only needed in net/.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
This commit is contained in:
Marc-André Lureau 2022-02-24 15:11:39 +04:00
parent 5933dd9576
commit 8a166615a4
3 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/qemu-common.h
View File

@ -108,7 +108,6 @@ void qemu_hexdump(FILE *fp, const char *prefix,
*/ */
int parse_debug_env(const char *name, int max, int initial); int parse_debug_env(const char *name, int max, int initial);
const char *qemu_ether_ntoa(const MACAddr *mac);
void page_size_init(void); void page_size_init(void);
/* returns non-zero if dump is in progress, otherwise zero is /* returns non-zero if dump is in progress, otherwise zero is

13
net/announce.c
View File

@ -120,6 +120,19 @@ static int announce_self_create(uint8_t *buf,
return 60; /* len (FCS will be added by hardware) */ return 60; /* len (FCS will be added by hardware) */
} }
/*
* Helper to print ethernet mac address
*/
static const char *qemu_ether_ntoa(const MACAddr *mac)
{
static char ret[18];
snprintf(ret, sizeof(ret), "%02x:%02x:%02x:%02x:%02x:%02x",
mac->a[0], mac->a[1], mac->a[2], mac->a[3], mac->a[4], mac->a[5]);
return ret;
}
static void qemu_announce_self_iter(NICState *nic, void *opaque) static void qemu_announce_self_iter(NICState *nic, void *opaque)
{ {
AnnounceTimer *timer = opaque; AnnounceTimer *timer = opaque;

14
util/cutils.c
View File

@ -27,7 +27,6 @@
#include <math.h> #include <math.h>
#include "qemu-common.h" #include "qemu-common.h"
#include "net/net.h"
#include "qemu/ctype.h" #include "qemu/ctype.h"
#include "qemu/cutils.h" #include "qemu/cutils.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
@ -936,19 +935,6 @@ int parse_debug_env(const char *name, int max, int initial)
return debug; return debug;
} }
/*
* Helper to print ethernet mac address
*/
const char *qemu_ether_ntoa(const MACAddr *mac)
{
static char ret[18];
snprintf(ret, sizeof(ret), "%02x:%02x:%02x:%02x:%02x:%02x",
mac->a[0], mac->a[1], mac->a[2], mac->a[3], mac->a[4], mac->a[5]);
return ret;
}
/* /*
* Return human readable string for size @val. * Return human readable string for size @val.
* @val can be anything that uint64_t allows (no more than "16 EiB"). * @val can be anything that uint64_t allows (no more than "16 EiB").