| Message ID | 1519031728-9850-5-git-send-email-thuth@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Improvements and clean-ups related to -net | expand |
On 19/02/2018 10:15, Thomas Huth wrote: > The function is only used within net.c, so there's no need that > this is a global function. > > While we're at it, also remove the unused prototype compute_mcast_idx() > (the function has been removed in commit d9caeb09b107e91122d10ba4a08a). > > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > include/net/net.h | 2 -- > net/net.c | 2 +- > 2 files changed, 1 insertion(+), 3 deletions(-) > > diff --git a/include/net/net.h b/include/net/net.h > index bdd4d9f..cd1708c 100644 > --- a/include/net/net.h > +++ b/include/net/net.h > @@ -204,7 +204,6 @@ extern const char *host_net_devices[]; > extern const char *legacy_tftp_prefix; > extern const char *legacy_bootp_filename; > > -int net_client_init(QemuOpts *opts, bool is_netdev, Error **errp); > int net_client_parse(QemuOptsList *opts_list, const char *str); > int net_init_clients(Error **errp); > void net_check_clients(void); > @@ -228,7 +227,6 @@ void qdev_set_nic_properties(DeviceState *dev, NICInfo *nd); > #define POLYNOMIAL_LE 0xedb88320 > uint32_t net_crc32(const uint8_t *p, int len); > uint32_t net_crc32_le(const uint8_t *p, int len); > -unsigned compute_mcast_idx(const uint8_t *ep); > > #define vmstate_offset_macaddr(_state, _field) \ > vmstate_offset_array(_state, _field.a, uint8_t, \ > diff --git a/net/net.c b/net/net.c > index 08049d9..bb63d82 100644 > --- a/net/net.c > +++ b/net/net.c > @@ -1119,7 +1119,7 @@ static void show_netdevs(void) > } > } > > -int net_client_init(QemuOpts *opts, bool is_netdev, Error **errp) > +static int net_client_init(QemuOpts *opts, bool is_netdev, Error **errp) > { > void *object = NULL; > Error *err = NULL; > Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
diff --git a/include/net/net.h b/include/net/net.h index bdd4d9f..cd1708c 100644 --- a/include/net/net.h +++ b/include/net/net.h @@ -204,7 +204,6 @@ extern const char *host_net_devices[]; extern const char *legacy_tftp_prefix; extern const char *legacy_bootp_filename; -int net_client_init(QemuOpts *opts, bool is_netdev, Error **errp); int net_client_parse(QemuOptsList *opts_list, const char *str); int net_init_clients(Error **errp); void net_check_clients(void); @@ -228,7 +227,6 @@ void qdev_set_nic_properties(DeviceState *dev, NICInfo *nd); #define POLYNOMIAL_LE 0xedb88320 uint32_t net_crc32(const uint8_t *p, int len); uint32_t net_crc32_le(const uint8_t *p, int len); -unsigned compute_mcast_idx(const uint8_t *ep); #define vmstate_offset_macaddr(_state, _field) \ vmstate_offset_array(_state, _field.a, uint8_t, \ diff --git a/net/net.c b/net/net.c index 08049d9..bb63d82 100644 --- a/net/net.c +++ b/net/net.c @@ -1119,7 +1119,7 @@ static void show_netdevs(void) } } -int net_client_init(QemuOpts *opts, bool is_netdev, Error **errp) +static int net_client_init(QemuOpts *opts, bool is_netdev, Error **errp) { void *object = NULL; Error *err = NULL;
The function is only used within net.c, so there's no need that this is a global function. While we're at it, also remove the unused prototype compute_mcast_idx() (the function has been removed in commit d9caeb09b107e91122d10ba4a08a). Signed-off-by: Thomas Huth <thuth@redhat.com> --- include/net/net.h | 2 -- net/net.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-)