aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-09-06 14:47:20 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2022-09-06 14:47:20 +0000
commit1b9a7ded5e7dd46a3587a4d012847db3a5d7e9bb (patch)
treed1a40e2136554c8bf86d3dcf8b88d5d41179122b
parent9706f0dca120920d50e3eb4282fe32996c51108d (diff)
parent032004cac7a6ad7a484d9756d24f13267b3422e0 (diff)
downloadqemu-snap-temp-L77800000956347290.tar.gz
Merge "Merge cherrypicks of [2203856] into emu-31-release." into emu-31-releasesnap-temp-L77800000956347290
-rw-r--r--net/slirp.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/net/slirp.c b/net/slirp.c
index d9ee10698f..4ce02ac3a6 100644
--- a/net/slirp.c
+++ b/net/slirp.c
@@ -332,13 +332,11 @@ static int net_slirp_init(NetClientState *peer, const char *model,
return -1;
}
memset(&ip6_prefix, 0, sizeof(ip6_prefix));
- ip6_prefix.s6_addr[0] = 0x20;
- ip6_prefix.s6_addr[1] = 0x01;
- ip6_prefix.s6_addr[2] = 0x00;
- ip6_prefix.s6_addr[3] = 0x02;
+ ip6_prefix.s6_addr[0] = 0xfe;
+ ip6_prefix.s6_addr[1] = 0xc0;
#else
if (!vprefix6) {
- vprefix6 = "2001:02::";
+ vprefix6 = "fec0::";
}
if (!inet_pton(AF_INET6, vprefix6, &ip6_prefix)) {
error_setg(errp, "Failed to parse IPv6 prefix");