diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2012-07-30 15:46:55 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2012-08-09 18:34:57 +0000 |
| commit | 427a1a2cb1d35b83b6302886f46289f6d617134d (patch) | |
| tree | ab8840c649141407cdd7fa2ee05041581dbc2bd8 /net | |
| parent | 8954bae3ce1ae5b64218b8731da9a8d7f46db9a7 (diff) | |
| download | qemu-427a1a2cb1d35b83b6302886f46289f6d617134d.tar.gz qemu-427a1a2cb1d35b83b6302886f46289f6d617134d.tar.bz2 qemu-427a1a2cb1d35b83b6302886f46289f6d617134d.zip | |
qapi: avoid reserved keywords
Clang compiler complained about use of reserved word 'restrict' in SLIRP
and QAPI.
Prefix C keywords with "q_", adjust SLIRP accordingly.
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/slirp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/slirp.c b/net/slirp.c index 08adb97da5..8db66ea539 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -718,9 +718,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(peer, "user", name, user->restrict, vnet, user->host, - user->hostname, user->tftp, user->bootfile, - user->dhcpstart, user->dns, user->smb, + ret = net_slirp_init(peer, "user", name, user->q_restrict, vnet, + user->host, user->hostname, user->tftp, + user->bootfile, user->dhcpstart, user->dns, user->smb, user->smbserver); while (slirp_configs) { |