04929fcdcd
Add xen_disk discard support (olh), backport VMDK SCSI change from v1.6.2 maintenance update and update syscall numbers OBS-URL: https://build.opensuse.org/request/show/221154 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=179
50 lines
1.4 KiB
Diff
50 lines
1.4 KiB
Diff
From 94aa4d55aca4798f31f17bc3acc60dfe60473ea9 Mon Sep 17 00:00:00 2001
|
|
From: Alexander Graf <agraf@suse.de>
|
|
Date: Wed, 12 Dec 2012 19:11:31 +0100
|
|
Subject: [PATCH] Legacy Patch kvm-qemu-preXX-report-default-mac-used.patch
|
|
|
|
---
|
|
net/net.c | 22 ++++++++++++++++++++++
|
|
1 file changed, 22 insertions(+)
|
|
|
|
diff --git a/net/net.c b/net/net.c
|
|
index 0a88e68..0716a72 100644
|
|
--- a/net/net.c
|
|
+++ b/net/net.c
|
|
@@ -141,6 +141,27 @@ void qemu_format_nic_info_str(NetClientState *nc, uint8_t macaddr[6])
|
|
macaddr[3], macaddr[4], macaddr[5]);
|
|
}
|
|
|
|
+static void default_mac_check(void)
|
|
+{
|
|
+ static const MACAddr def_mac = { .a = { 0x52,0x54,0x00,0x12,0x34,0x56 } };
|
|
+ static int warned = 0;
|
|
+ int i;
|
|
+
|
|
+ for (i = 0; i < MAX_NICS; i++)
|
|
+ {
|
|
+ if (!nd_table[i].used)
|
|
+ continue;
|
|
+ if (memcmp(nd_table[i].macaddr.a, def_mac.a, 5))
|
|
+ continue;
|
|
+ if (nd_table[i].macaddr.a[5] >= 0x56 &&
|
|
+ nd_table[i].macaddr.a[5] < 0x56 + MAX_NICS && !warned) {
|
|
+ warned = 1;
|
|
+ fprintf(stderr, "Warning: default mac address being used, creating "
|
|
+ "potential for address conflict\n");
|
|
+ }
|
|
+ }
|
|
+}
|
|
+
|
|
void qemu_macaddr_default_if_unset(MACAddr *macaddr)
|
|
{
|
|
static int index = 0;
|
|
@@ -1185,6 +1206,7 @@ int net_init_clients(void)
|
|
if (qemu_opts_foreach(net, net_init_client, NULL, 1) == -1) {
|
|
return -1;
|
|
}
|
|
+ default_mac_check();
|
|
|
|
return 0;
|
|
}
|