mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 18:05:37 +00:00
net: add macaddr type.
Add new type for mac addresses. Add function which sets the qemu default mac address if it finds the mac address uninitialized (i.e. all zeros). Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
18995b9808
commit
76d32cba7e
15
net.c
15
net.c
|
@ -280,6 +280,21 @@ void qemu_format_nic_info_str(VLANClientState *vc, uint8_t macaddr[6])
|
||||||
macaddr[3], macaddr[4], macaddr[5]);
|
macaddr[3], macaddr[4], macaddr[5]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void qemu_macaddr_default_if_unset(MACAddr *macaddr)
|
||||||
|
{
|
||||||
|
static int index = 0;
|
||||||
|
static const MACAddr zero = { .a = { 0,0,0,0,0,0 } };
|
||||||
|
|
||||||
|
if (memcmp(macaddr, &zero, sizeof(zero)) != 0)
|
||||||
|
return;
|
||||||
|
macaddr->a[0] = 0x52;
|
||||||
|
macaddr->a[1] = 0x54;
|
||||||
|
macaddr->a[2] = 0x00;
|
||||||
|
macaddr->a[3] = 0x12;
|
||||||
|
macaddr->a[4] = 0x34;
|
||||||
|
macaddr->a[5] = 0x56 + index++;
|
||||||
|
}
|
||||||
|
|
||||||
static char *assign_name(VLANClientState *vc1, const char *model)
|
static char *assign_name(VLANClientState *vc1, const char *model)
|
||||||
{
|
{
|
||||||
VLANState *vlan;
|
VLANState *vlan;
|
||||||
|
|
5
net.h
5
net.h
|
@ -7,6 +7,10 @@
|
||||||
#include "qemu-option.h"
|
#include "qemu-option.h"
|
||||||
#include "net-queue.h"
|
#include "net-queue.h"
|
||||||
|
|
||||||
|
struct MACAddr {
|
||||||
|
uint8_t a[6];
|
||||||
|
};
|
||||||
|
|
||||||
/* VLANs support */
|
/* VLANs support */
|
||||||
|
|
||||||
typedef int (NetCanReceive)(VLANClientState *);
|
typedef int (NetCanReceive)(VLANClientState *);
|
||||||
|
@ -65,6 +69,7 @@ ssize_t qemu_send_packet_async(VLANClientState *vc, const uint8_t *buf,
|
||||||
void qemu_purge_queued_packets(VLANClientState *vc);
|
void qemu_purge_queued_packets(VLANClientState *vc);
|
||||||
void qemu_flush_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_str(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);
|
int qemu_show_nic_models(const char *arg, const char *const *models);
|
||||||
void qemu_check_nic_model(NICInfo *nd, const char *model);
|
void qemu_check_nic_model(NICInfo *nd, const char *model);
|
||||||
int qemu_find_nic_model(NICInfo *nd, const char * const *models,
|
int qemu_find_nic_model(NICInfo *nd, const char * const *models,
|
||||||
|
|
|
@ -185,6 +185,7 @@ typedef struct PixelFormat PixelFormat;
|
||||||
typedef struct TextConsole TextConsole;
|
typedef struct TextConsole TextConsole;
|
||||||
typedef TextConsole QEMUConsole;
|
typedef TextConsole QEMUConsole;
|
||||||
typedef struct CharDriverState CharDriverState;
|
typedef struct CharDriverState CharDriverState;
|
||||||
|
typedef struct MACAddr MACAddr;
|
||||||
typedef struct VLANState VLANState;
|
typedef struct VLANState VLANState;
|
||||||
typedef struct VLANClientState VLANClientState;
|
typedef struct VLANClientState VLANClientState;
|
||||||
typedef struct QEMUFile QEMUFile;
|
typedef struct QEMUFile QEMUFile;
|
||||||
|
|
Loading…
Reference in a new issue