From 76107a4371da502953ceaae81211f087dd9de452 Mon Sep 17 00:00:00 2001
From: Matt Borgerson <contact@mborgerson.com>
Date: Sat, 30 May 2020 17:24:23 -0700
Subject: [PATCH] build: Re-enable SLiRP (user networking)
---
build.sh | 1 -
softmmu/vl.c | 2 ++
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/build.sh b/build.sh
index cdc204dd53..ea0e710df3 100755
--- a/build.sh
+++ b/build.sh
@@ -208,7 +208,6 @@ set -x # Print commands from now on
--disable-sheepdog \
--without-default-devices \
--disable-blobs \
- --disable-slirp \
"$@"
time make -j"${job_count}" 2>&1 | tee build.log
diff --git a/softmmu/vl.c b/softmmu/vl.c
index 27e84bf925..0d1eb7d5e0 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -4372,8 +4372,10 @@ void qemu_init(int argc, char **argv, char **envp)
if (default_net) {
QemuOptsList *net = qemu_find_opts("net");
qemu_opts_set(net, NULL, "type", "nic", &error_abort);
+#ifndef XBOX
#ifdef CONFIG_SLIRP
qemu_opts_set(net, NULL, "type", "user", &error_abort);
+#endif
#endif
}