[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [COMMIT 9aa24e8] Pci nic: pci_register_device can fail
From: |
Anthony Liguori |
Subject: |
[Qemu-commits] [COMMIT 9aa24e8] Pci nic: pci_register_device can fail |
Date: |
Fri, 01 May 2009 15:05:19 -0000 |
From: Chris Wright <address@hidden>
The pci_register_device() call in PCI nic initialization routines can
fail. Handle this failure and propagate a meaningful error message to
the user instead of generating a SEGV.
Cc: Marcelo Tosatti <address@hidden>
Signed-off-by: Chris Wright <address@hidden>
Signed-off-by: Avi Kivity <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>
diff --git a/hw/e1000.c b/hw/e1000.c
index 1729db2..b0fe917 100644
--- a/hw/e1000.c
+++ b/hw/e1000.c
@@ -1063,6 +1063,9 @@ pci_e1000_init(PCIBus *bus, NICInfo *nd, int devfn)
d = (E1000State *)pci_register_device(bus, "e1000",
sizeof(E1000State), devfn, NULL, NULL);
+ if (!d)
+ return NULL;
+
pci_conf = d->dev.config;
memset(pci_conf, 0, 256);
diff --git a/hw/eepro100.c b/hw/eepro100.c
index 18d8115..235e598 100644
--- a/hw/eepro100.c
+++ b/hw/eepro100.c
@@ -1739,6 +1739,9 @@ static PCIDevice *nic_init(PCIBus * bus, NICInfo * nd,
uint32_t device)
d = (PCIEEPRO100State *) pci_register_device(bus, nd->model,
sizeof(PCIEEPRO100State), -1,
NULL, NULL);
+ if (!d)
+ return NULL;
+
d->dev.unregister = pci_nic_uninit;
s = &d->eepro100;
diff --git a/hw/ne2000.c b/hw/ne2000.c
index 99612e2..613ac41 100644
--- a/hw/ne2000.c
+++ b/hw/ne2000.c
@@ -810,6 +810,9 @@ PCIDevice *pci_ne2000_init(PCIBus *bus, NICInfo *nd, int
devfn)
"NE2000", sizeof(PCINE2000State),
devfn,
NULL, NULL);
+ if (!d)
+ return NULL;
+
pci_conf = d->dev.config;
pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_REALTEK);
pci_config_set_device_id(pci_conf, PCI_DEVICE_ID_REALTEK_8029);
diff --git a/hw/pcnet.c b/hw/pcnet.c
index acbaee6..654340b 100644
--- a/hw/pcnet.c
+++ b/hw/pcnet.c
@@ -2023,7 +2023,11 @@ PCIDevice *pci_pcnet_init(PCIBus *bus, NICInfo *nd, int
devfn)
d = (PCNetState *)pci_register_device(bus, "PCNet", sizeof(PCNetState),
devfn, NULL, NULL);
+ if (!d)
+ return NULL;
+
d->dev.unregister = pci_pcnet_uninit;
+
pci_conf = d->dev.config;
pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_AMD);
diff --git a/hw/rtl8139.c b/hw/rtl8139.c
index 0093ff4..19c7623 100644
--- a/hw/rtl8139.c
+++ b/hw/rtl8139.c
@@ -3451,7 +3451,11 @@ PCIDevice *pci_rtl8139_init(PCIBus *bus, NICInfo *nd,
int devfn)
"RTL8139",
sizeof(PCIRTL8139State),
devfn,
NULL, NULL);
+ if (!d)
+ return NULL;
+
d->dev.unregister = pci_rtl8139_uninit;
+
pci_conf = d->dev.config;
pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_REALTEK);
pci_config_set_device_id(pci_conf, PCI_DEVICE_ID_REALTEK_8139);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-commits] [COMMIT 9aa24e8] Pci nic: pci_register_device can fail,
Anthony Liguori <=