[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 11/31] slirp: update to git master
From: |
Paolo Bonzini |
Subject: |
[PULL 11/31] slirp: update to git master |
Date: |
Sat, 23 Jan 2021 09:31:08 -0500 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
git cherry-diff:
Commits on bacb71f1c3ed5f40e393afd8be81bedfba13a401 branch that is not on
8f43a99191afb47ca3f3c6972f6306209f367ece branch
+ 1021b0dc38d39f1dc95a296fe3e05a24a087cdc6 disable_dns option
+ 0f94ceec752592e4ac632a24e3c64a97dd09bf4c limit vnameserver_addr to port 53
+ b57bafa852ef16b133907a13678ec69e9531f177 libslirp.h: fix SlirpConfig v3
documentation
+ 1abf18b2b5edb462797629ed47ad4515a195686e Update CHANGELOG
+ ff4ecf9b6c6542b24b4ac6ea178be9d44e159f79 Release v4.3.0
+ 21f1d933050a40d62612c6274c32de60b811d9ea changelog: post-release
+ 376187c4b14c795763d472214812826eebe7e9c2 Release v4.3.1
+ 73336e08902a7e826f7d960453df037380266186 changelog: post-release
+ 5c1c9d43be61571608e9b14615045b67b830daf5 udp, udp6, icmp: handle TTL value
+ 73ed49ab71998d4288e71e954ef6214b70f23d79 icmp, icmp6: Add icmp_forward_error
and icmp6_forward_error
+ 7a4840a57ec7dbc37cca1ab96f058a9610b26950 udp, udp6, icmp, icmp6: Enable
forwarding errors on Linux
+ e9b2bc19ae652a2907f247e621b2e4773bdd2aab TCPIPHDR_DELTA: Fix potential
negative value
+ 39f9a363eec082f04513413046321abd04163148 .gitlab-ci: add a Coverity stage
+ 1b0093b973cfa0dc041522e5d4e6f576b2df642e sosendoob: better document what urgc
is used for
+ 5b9ad89ebbb8afa50162c9156fabd5fc56291088 Add G_GNUC_PRINTF to local function
slirp_vsnprintf
+ 8a808aa493980e212b4d5f5465330905c8294e59 meson: remove meson-dist script
+ 0b669b5fbe4d3c25a682a67f1059d8633c963b3d meson: support compiling as
subproject
+ 9f82a47b81f2864422b82c1e40e51a2ed9c6ac32 Add DNS resolving for iOS
+ c0eac03e8ce1b9a743231f2fe21e7cb579fc9339 Remove the QEMU-special make
build-system
+ 1bfd4d9368f9fa2e4f0731e1266bec05bbc83a80 socket: consume empty packets
+ 92413be68914f8cae2f5bad4bf3ab8491dcbc5d7 Release v4.4.0
+ 07e8cfac69766081871ab620d9f16a630543d302 changelog: post-release
+ 4c4e035813313d02b63fdeb920d56fb2fdc0a5b1 Remove some needless (void)casts
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20210114125605.1227742-5-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
.gitmodules | 6 ++---
configure | 2 +-
meson.build | 62 +++-----------------------------------------
slirp | 1 -
subprojects/libslirp | 1 +
5 files changed, 9 insertions(+), 63 deletions(-)
delete mode 160000 slirp
create mode 160000 subprojects/libslirp
diff --git a/.gitmodules b/.gitmodules
index 2bdeeacef8..80fd9c7199 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -49,9 +49,6 @@
[submodule "roms/edk2"]
path = roms/edk2
url = https://git.qemu.org/git/edk2.git
-[submodule "slirp"]
- path = slirp
- url = https://git.qemu.org/git/libslirp.git
[submodule "roms/opensbi"]
path = roms/opensbi
url = https://git.qemu.org/git/opensbi.git
@@ -64,3 +61,6 @@
[submodule "roms/vbootrom"]
path = roms/vbootrom
url = https://git.qemu.org/git/vbootrom.git
+[submodule "subprojects/libslirp"]
+ path = subprojects/libslirp
+ url = https://git.qemu.org/git/libslirp.git
diff --git a/configure b/configure
index ff099cb8ca..753d0dd18e 100755
--- a/configure
+++ b/configure
@@ -5206,7 +5206,7 @@ case "$slirp" in
auto | enabled | internal)
# Simpler to always update submodule, even if not needed.
if test -e "${source_path}/.git" && test $git_update = 'yes' ; then
- git_submodules="${git_submodules} slirp"
+ git_submodules="${git_submodules} subprojects/libslirp"
fi
;;
esac
diff --git a/meson.build b/meson.build
index e813814fb0..deda061c86 100644
--- a/meson.build
+++ b/meson.build
@@ -1460,7 +1460,7 @@ slirp_opt = 'disabled'
if have_system
slirp_opt = get_option('slirp')
if slirp_opt in ['enabled', 'auto', 'system']
- have_internal = fs.exists(meson.current_source_dir() / 'slirp/meson.build')
+ have_internal = fs.exists(meson.current_source_dir() /
'subprojects/libslirp/meson.build')
slirp = dependency('slirp', static: enable_static,
method: 'pkg-config',
required: slirp_opt == 'system' or
@@ -1474,63 +1474,9 @@ if have_system
endif
endif
if slirp_opt == 'internal'
- slirp_deps = []
- if targetos == 'windows'
- slirp_deps = cc.find_library('iphlpapi')
- endif
- slirp_conf = configuration_data()
- slirp_conf.set('SLIRP_MAJOR_VERSION',
meson.project_version().split('.')[0])
- slirp_conf.set('SLIRP_MINOR_VERSION',
meson.project_version().split('.')[1])
- slirp_conf.set('SLIRP_MICRO_VERSION',
meson.project_version().split('.')[2])
- slirp_conf.set_quoted('SLIRP_VERSION_STRING', meson.project_version())
- slirp_cargs = ['-DG_LOG_DOMAIN="Slirp"']
- slirp_files = [
- 'slirp/src/arp_table.c',
- 'slirp/src/bootp.c',
- 'slirp/src/cksum.c',
- 'slirp/src/dhcpv6.c',
- 'slirp/src/dnssearch.c',
- 'slirp/src/if.c',
- 'slirp/src/ip6_icmp.c',
- 'slirp/src/ip6_input.c',
- 'slirp/src/ip6_output.c',
- 'slirp/src/ip_icmp.c',
- 'slirp/src/ip_input.c',
- 'slirp/src/ip_output.c',
- 'slirp/src/mbuf.c',
- 'slirp/src/misc.c',
- 'slirp/src/ncsi.c',
- 'slirp/src/ndp_table.c',
- 'slirp/src/sbuf.c',
- 'slirp/src/slirp.c',
- 'slirp/src/socket.c',
- 'slirp/src/state.c',
- 'slirp/src/stream.c',
- 'slirp/src/tcp_input.c',
- 'slirp/src/tcp_output.c',
- 'slirp/src/tcp_subr.c',
- 'slirp/src/tcp_timer.c',
- 'slirp/src/tftp.c',
- 'slirp/src/udp.c',
- 'slirp/src/udp6.c',
- 'slirp/src/util.c',
- 'slirp/src/version.c',
- 'slirp/src/vmstate.c',
- ]
-
- configure_file(
- input : 'slirp/src/libslirp-version.h.in',
- output : 'libslirp-version.h',
- configuration: slirp_conf)
-
- slirp_inc = include_directories('slirp', 'slirp/src')
- libslirp = static_library('slirp',
- sources: slirp_files,
- c_args: slirp_cargs,
- include_directories: slirp_inc)
- slirp = declare_dependency(link_with: libslirp,
- dependencies: slirp_deps,
- include_directories: slirp_inc)
+ libslirp = subproject('libslirp',
+ default_options: ['default_library=static'])
+ slirp = libslirp.get_variable('libslirp_dep')
endif
endif
diff --git a/slirp b/slirp
deleted file mode 160000
index 8f43a99191..0000000000
--- a/slirp
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8f43a99191afb47ca3f3c6972f6306209f367ece
diff --git a/subprojects/libslirp b/subprojects/libslirp
new file mode 160000
index 0000000000..bacb71f1c3
--- /dev/null
+++ b/subprojects/libslirp
@@ -0,0 +1 @@
+Subproject commit bacb71f1c3ed5f40e393afd8be81bedfba13a401
--
2.26.2
- [PULL 15/31] meson: Summarize information related to directories first, (continued)
- [PULL 15/31] meson: Summarize information related to directories first, Paolo Bonzini, 2021/01/23
- [PULL 16/31] meson: Display host binaries information altogether, Paolo Bonzini, 2021/01/23
- [PULL 17/31] meson: Summarize overall features altogether, Paolo Bonzini, 2021/01/23
- [PULL 19/31] meson: Display accelerators and selected targets altogether, Paolo Bonzini, 2021/01/23
- [PULL 09/31] build-sys: set global arguments for cflags/ldflags, Paolo Bonzini, 2021/01/23
- [PULL 18/31] meson: Summarize compilation-related information altogether, Paolo Bonzini, 2021/01/23
- [PULL 24/31] meson.build: Detect bzip2 program, Paolo Bonzini, 2021/01/23
- [PULL 22/31] meson: Add a section header for library dependencies, Paolo Bonzini, 2021/01/23
- [PULL 25/31] acceptance: switch to QMP change-vnc-password command, Paolo Bonzini, 2021/01/23
- [PULL 26/31] hmp: remove "change vnc TARGET" command, Paolo Bonzini, 2021/01/23
- [PULL 11/31] slirp: update to git master,
Paolo Bonzini <=
- [PULL 20/31] meson: Display block layer information altogether, Paolo Bonzini, 2021/01/23
- [PULL 21/31] meson: Display crypto-related information altogether, Paolo Bonzini, 2021/01/23
- [PULL 23/31] meson.build: Declare global edk2_targets / install_edk2_blobs variables, Paolo Bonzini, 2021/01/23
- [PULL 27/31] qmp: remove deprecated "change" command, Paolo Bonzini, 2021/01/23
- [PULL 29/31] qemu-option: clean up id vs. list->merge_lists, Paolo Bonzini, 2021/01/23
- [PULL 28/31] vnc: support "-vnc help", Paolo Bonzini, 2021/01/23
- [PULL 31/31] qemu-option: warn for short-form boolean options, Paolo Bonzini, 2021/01/23
- [PULL 30/31] qemu-option: move help handling to get_opt_name_value, Paolo Bonzini, 2021/01/23