vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make it obvious that pci_nic_init() can't fail 

Before this patch, pci_nic_init() returns NULL when it can't find the
model in pci_nic_models[].  Except this can't happen, because
qemu_check_nic_model_list() just searched for model in
pci_nic_models[], and terminated the program on failure.

Repeating the search here is pointless.  Instead, change
qemu_check_nic_model_list() to return the model's array index.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
master
Markus Armbruster 2009-09-25 03:53:50 +02:00 committed by Anthony Liguori
parent 49bd1458da
commit 9ee05825d9
3 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
hw/pci.c
View File

@ -871,22 +871,15 @@ PCIDevice *pci_nic_init(NICInfo *nd, const char *default_model,
DeviceState *dev; DeviceState *dev;
int i; int i;
qemu_check_nic_model_list(nd, pci_nic_models, default_model); i = qemu_check_nic_model_list(nd, pci_nic_models, default_model);
pci_dev = pci_create(pci_nic_names[i], devaddr);
for (i = 0; pci_nic_models[i]; i++) { dev = &pci_dev->qdev;
if (strcmp(nd->model, pci_nic_models[i]) == 0) { if (nd->id)
pci_dev = pci_create(pci_nic_names[i], devaddr); dev->id = qemu_strdup(nd->id);
dev = &pci_dev->qdev; dev->nd = nd;
if (nd->id) qdev_init(dev);
dev->id = qemu_strdup(nd->id); nd->private = dev;
dev->nd = nd; return pci_dev;
qdev_init(dev);
nd->private = dev;
return pci_dev;
}
}
return NULL;
} }
typedef struct { typedef struct {

6
net.c
View File

@ -2358,8 +2358,8 @@ void qemu_check_nic_model(NICInfo *nd, const char *model)
qemu_check_nic_model_list(nd, models, model); qemu_check_nic_model_list(nd, models, model);
} }
void qemu_check_nic_model_list(NICInfo *nd, const char * const *models, int qemu_check_nic_model_list(NICInfo *nd, const char * const *models,
const char *default_model) const char *default_model)
{ {
int i, exit_status = 0; int i, exit_status = 0;
@ -2369,7 +2369,7 @@ void qemu_check_nic_model_list(NICInfo *nd, const char * const *models,
if (strcmp(nd->model, "?") != 0) { if (strcmp(nd->model, "?") != 0) {
for (i = 0 ; models[i]; i++) for (i = 0 ; models[i]; i++)
if (strcmp(nd->model, models[i]) == 0) if (strcmp(nd->model, models[i]) == 0)
return; return i;
fprintf(stderr, "qemu: Unsupported NIC model: %s\n", nd->model); fprintf(stderr, "qemu: Unsupported NIC model: %s\n", nd->model);
exit_status = 1; exit_status = 1;

4
net.h
View File

@ -76,8 +76,8 @@ void qemu_purge_queued_packets(VLANClientState *vc);
void qemu_flush_queued_packets(VLANClientState *vc); void qemu_flush_queued_packets(VLANClientState *vc);
void qemu_format_nic_info_str(VLANClientState *vc, uint8_t macaddr[6]); void qemu_format_nic_info_str(VLANClientState *vc, uint8_t macaddr[6]);
void qemu_check_nic_model(NICInfo *nd, const char *model); void qemu_check_nic_model(NICInfo *nd, const char *model);
void qemu_check_nic_model_list(NICInfo *nd, const char * const *models, int qemu_check_nic_model_list(NICInfo *nd, const char * const *models,
const char *default_model); const char *default_model);
void qemu_handler_true(void *opaque); void qemu_handler_true(void *opaque);
void do_info_network(Monitor *mon); void do_info_network(Monitor *mon);