External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-11 15:27:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

WIP: qemu-slirp: update to follow current spec

Browse Source 
The WIP specification is hosted on slirp wiki at this point:
https://gitlab.freedesktop.org/slirp/libslirp/-/wikis/Slirp-Helper

We would need more feedback from various parties (including libvirt,
podman, and other developpers) before declaring a frozen version.

So for now, follow it, and feedback welcome!

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Marc-André Lureau 2020-02-25 10:55:13 +01:00 committed by Michal Privoznik
parent 36906a73da
commit 9bc7700a05
1 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/qemu/qemu_slirp.c
View File

@ -285,35 +285,21 @@ qemuSlirpStart(qemuSlirpPtr slirp,
const virNetDevIPAddr *ip = net->guestIP.ips[i];
g_autofree char *addr = NULL;
const char *opt = "";
unsigned prefix = ip->prefix;
if (!(addr = virSocketAddrFormat(&ip->address)))
return -1;
if (VIR_SOCKET_ADDR_IS_FAMILY(&ip->address, AF_INET))
if (VIR_SOCKET_ADDR_IS_FAMILY(&ip->address, AF_INET)) {
opt = "--net";
if (VIR_SOCKET_ADDR_IS_FAMILY(&ip->address, AF_INET6))
opt = "--prefix-ipv6";
virCommandAddArgFormat(cmd, "%s=%s", opt, addr);
if (ip->prefix) {
if (VIR_SOCKET_ADDR_IS_FAMILY(&ip->address, AF_INET)) {
virSocketAddr netmask;
g_autofree char *netmaskStr = NULL;
if (virSocketAddrPrefixToNetmask(ip->prefix, &netmask, AF_INET) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Failed to translate prefix %d to netmask"),
ip->prefix);
return -1;
}
if (!(netmaskStr = virSocketAddrFormat(&netmask)))
return -1;
virCommandAddArgFormat(cmd, "--mask=%s", netmaskStr);
}
if (VIR_SOCKET_ADDR_IS_FAMILY(&ip->address, AF_INET6))
virCommandAddArgFormat(cmd, "--prefix-length-ipv6=%u", ip->prefix);
prefix = prefix ?: 24;
}
if (VIR_SOCKET_ADDR_IS_FAMILY(&ip->address, AF_INET6)) {
opt = "--net6";
prefix = prefix ?: 64;
}
virCommandAddArgFormat(cmd, "%s=%s/%u", opt, addr, prefix);
}
if (qemuSlirpHasFeature(slirp, QEMU_SLIRP_FEATURE_DBUS_ADDRESS)) {