From: Blue Swirl <[email protected]> Clang compiler complained about use of reserved word 'restrict' in SLIRP and QAPI.
Rename 'restrict' to 'restricted' which also matches other SLIRP code. Signed-off-by: Blue Swirl <[email protected]> --- net/slirp.c | 6 +++--- qapi-schema.json | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/net/slirp.c b/net/slirp.c index 5c2e6b2..8c42b53 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -722,9 +722,9 @@ int net_init_slirp(const NetClientOptions *opts, const char *name, net_init_slirp_configs(user->hostfwd, SLIRP_CFG_HOSTFWD); net_init_slirp_configs(user->guestfwd, 0); - ret = net_slirp_init(vlan, "user", name, user->restrict, vnet, user->host, - user->hostname, user->tftp, user->bootfile, - user->dhcpstart, user->dns, user->smb, + ret = net_slirp_init(vlan, "user", name, user->restricted, vnet, + user->host, user->hostname, user->tftp, + user->bootfile, user->dhcpstart, user->dns, user->smb, user->smbserver); while (slirp_configs) { diff --git a/qapi-schema.json b/qapi-schema.json index bc55ed2..3912430 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -1925,7 +1925,7 @@ # # @hostname: #optional client hostname reported by the builtin DHCP server # -# @restrict: #optional isolate the guest from the host +# @restricted: #optional isolate the guest from the host # # @ip: #optional legacy parameter, use net= instead # @@ -1956,7 +1956,7 @@ { 'type': 'NetdevUserOptions', 'data': { '*hostname': 'str', - '*restrict': 'bool', + '*restricted':'bool', '*ip': 'str', '*net': 'str', '*host': 'str', -- 1.7.2.5
