aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2020-06-10 07:32:09 +0200
committerMarkus Armbruster <armbru@redhat.com>2020-06-15 22:05:28 +0200
commitc23e05614e54e11f54961fbf086193ccb4cf8aa5 (patch)
tree7f37c45d17c92b79fc0cf17746cf4a8114d816de /include
parent96927c744f9cd5205f95ef897c35695038dc2896 (diff)
downloadqemu-c23e05614e54e11f54961fbf086193ccb4cf8aa5.zip
qemu-c23e05614e54e11f54961fbf086193ccb4cf8aa5.tar.gz
qemu-c23e05614e54e11f54961fbf086193ccb4cf8aa5.tar.bz2
isa: Convert uses of isa_create(), isa_try_create() manually
Same transformation as in the previous commit. Manual, because convincing Coccinelle to transform these cases is not worthwhile. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Message-Id: <20200610053247.1583243-21-armbru@redhat.com>
Diffstat (limited to 'include')
-rw-r--r--include/hw/net/ne2000-isa.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/hw/net/ne2000-isa.h b/include/hw/net/ne2000-isa.h
index eef17a6..af59ee0 100644
--- a/include/hw/net/ne2000-isa.h
+++ b/include/hw/net/ne2000-isa.h
@@ -13,6 +13,7 @@
#include "hw/isa/isa.h"
#include "hw/qdev-properties.h"
#include "net/net.h"
+#include "qapi/error.h"
#define TYPE_ISA_NE2000 "ne2k_isa"
@@ -23,14 +24,14 @@ static inline ISADevice *isa_ne2000_init(ISABus *bus, int base, int irq,
qemu_check_nic_model(nd, "ne2k_isa");
- d = isa_try_create(bus, TYPE_ISA_NE2000);
+ d = isa_try_new(TYPE_ISA_NE2000);
if (d) {
DeviceState *dev = DEVICE(d);
qdev_prop_set_uint32(dev, "iobase", base);
qdev_prop_set_uint32(dev, "irq", irq);
qdev_set_nic_properties(dev, nd);
- qdev_init_nofail(dev);
+ isa_realize_and_unref(d, bus, &error_fatal);
}
return d;
}