Commit 0fe9d901 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

isa: New isa_new(), isa_realize_and_unref() etc. 



I'm converting from qdev_create()/qdev_init_nofail() to
qdev_new()/qdev_realize_and_unref(); recent commit "qdev: New
qdev_new(), qdev_realize(), etc." explains why.

ISA devices use qdev_create() through isa_create() and
isa_try_create().

Provide isa_new(), isa_try_new(), and isa_realize_and_unref() for
converting ISA devices.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-19-armbru@redhat.com>
parent a9cf5c46

hw/isa/isa-bus.c

+15 −0
Original line number Diff line number Diff line
@@ -176,6 +176,16 @@ ISADevice *isa_try_create(ISABus *bus, const char *name) 
    return ISA_DEVICE(dev);

}



ISADevice *isa_new(const char *name)

{

    return ISA_DEVICE(qdev_new(name));

}



ISADevice *isa_try_new(const char *name)

{

    return ISA_DEVICE(qdev_try_new(name));

}



ISADevice *isa_create_simple(ISABus *bus, const char *name)

{

    ISADevice *dev;
@@ -185,6 +195,11 @@ ISADevice *isa_create_simple(ISABus *bus, const char *name) 
    return dev;

}



bool isa_realize_and_unref(ISADevice *dev, ISABus *bus, Error **errp)

{

    return qdev_realize_and_unref(&dev->parent_obj, &bus->parent_obj, errp);

}



ISADevice *isa_vga_init(ISABus *bus)

{

    switch (vga_interface_type) {

include/hw/isa/isa.h

+3 −0
Original line number Diff line number Diff line
@@ -105,6 +105,9 @@ MemoryRegion *isa_address_space(ISADevice *dev); 
MemoryRegion *isa_address_space_io(ISADevice *dev);

ISADevice *isa_create(ISABus *bus, const char *name);

ISADevice *isa_try_create(ISABus *bus, const char *name);

ISADevice *isa_new(const char *name);

ISADevice *isa_try_new(const char *name);

bool isa_realize_and_unref(ISADevice *dev, ISABus *bus, Error **errp);

ISADevice *isa_create_simple(ISABus *bus, const char *name);



ISADevice *isa_vga_init(ISABus *bus);