OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

net: Use correct type for bool flag

Browse Source 
is_netdev is only used as a bool, so make it one.

Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1468468228-27827-14-git-send-email-eblake@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Eric Blake 2016-07-13 21:50:24 -06:00 committed by Markus Armbruster
parent f394b2e20d
commit 0e55c381f6
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/usb/dev-network.c
View File

@ -1396,7 +1396,7 @@ static USBDevice *usb_net_init(USBBus *bus, const char *cmdline)
qemu_opt_set(opts, "type", "nic", &error_abort); qemu_opt_set(opts, "type", "nic", &error_abort);
qemu_opt_set(opts, "model", "usb", &error_abort); qemu_opt_set(opts, "model", "usb", &error_abort);
idx = net_client_init(opts, 0, &local_err); idx = net_client_init(opts, false, &local_err);
if (local_err) { if (local_err) {
error_report_err(local_err); error_report_err(local_err);
return NULL; return NULL;

2
include/net/net.h
View File

@ -203,7 +203,7 @@ extern const char *host_net_devices[];
extern const char *legacy_tftp_prefix; extern const char *legacy_tftp_prefix;
extern const char *legacy_bootp_filename; extern const char *legacy_bootp_filename;
int net_client_init(QemuOpts *opts, int is_netdev, Error **errp); int net_client_init(QemuOpts *opts, bool is_netdev, Error **errp);
int net_client_parse(QemuOptsList *opts_list, const char *str); int net_client_parse(QemuOptsList *opts_list, const char *str);
int net_init_clients(void); int net_init_clients(void);
void net_check_clients(void); void net_check_clients(void);

12
net/net.c
View File

@ -960,7 +960,7 @@ static int (* const net_client_init_fun[NET_CLIENT_DRIVER__MAX])(
}; };
static int net_client_init1(const void *object, int is_netdev, Error **errp) static int net_client_init1(const void *object, bool is_netdev, Error **errp)
{ {
Netdev legacy = {0}; Netdev legacy = {0};
const Netdev *netdev; const Netdev *netdev;
@ -1060,7 +1060,7 @@ static int net_client_init1(const void *object, int is_netdev, Error **errp)
} }
int net_client_init(QemuOpts *opts, int is_netdev, Error **errp) int net_client_init(QemuOpts *opts, bool is_netdev, Error **errp)
{ {
void *object = NULL; void *object = NULL;
Error *err = NULL; Error *err = NULL;
@ -1153,7 +1153,7 @@ void hmp_host_net_add(Monitor *mon, const QDict *qdict)
qemu_opt_set(opts, "type", device, &error_abort); qemu_opt_set(opts, "type", device, &error_abort);
net_client_init(opts, 0, &local_err); net_client_init(opts, false, &local_err);
if (local_err) { if (local_err) {
error_report_err(local_err); error_report_err(local_err);
monitor_printf(mon, "adding host network device %s failed\n", device); monitor_printf(mon, "adding host network device %s failed\n", device);
@ -1183,7 +1183,7 @@ void hmp_host_net_remove(Monitor *mon, const QDict *qdict)
void netdev_add(QemuOpts *opts, Error **errp) void netdev_add(QemuOpts *opts, Error **errp)
{ {
net_client_init(opts, 1, errp); net_client_init(opts, true, errp);
} }
void qmp_netdev_add(QDict *qdict, QObject **ret, Error **errp) void qmp_netdev_add(QDict *qdict, QObject **ret, Error **errp)
@ -1481,7 +1481,7 @@ static int net_init_client(void *dummy, QemuOpts *opts, Error **errp)
{ {
Error *local_err = NULL; Error *local_err = NULL;
net_client_init(opts, 0, &local_err); net_client_init(opts, false, &local_err);
if (local_err) { if (local_err) {
error_report_err(local_err); error_report_err(local_err);
return -1; return -1;
@ -1495,7 +1495,7 @@ static int net_init_netdev(void *dummy, QemuOpts *opts, Error **errp)
Error *local_err = NULL; Error *local_err = NULL;
int ret; int ret;
ret = net_client_init(opts, 1, &local_err); ret = net_client_init(opts, true, &local_err);
if (local_err) { if (local_err) {
error_report_err(local_err); error_report_err(local_err);
return -1; return -1;