Commit 924f6d72 authored by Gerd Hoffmann's avatar Gerd Hoffmann Committed by malc
Browse files

qdev: add isa_create() function 



Like isa_create_simple, but doesn't call qdev_init, so one can set
properties after creating and before initializing the device.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 787aa97a

hw/isa-bus.c

+13 −2
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ void isa_qdev_register(ISADeviceInfo *info) 
    qdev_register(&info->qdev);

}



ISADevice *isa_create_simple(const char *name)

ISADevice *isa_create(const char *name)

{

    DeviceState *dev;
@@ -118,10 +118,21 @@ ISADevice *isa_create_simple(const char *name) 
        return NULL;

    }

    dev = qdev_create(&isabus->qbus, name);

    qdev_init(dev);

    return DO_UPCAST(ISADevice, qdev, dev);

}



ISADevice *isa_create_simple(const char *name)

{

    ISADevice *dev;



    dev = isa_create(name);

    if (qdev_init(&dev->qdev) != 0) {

        qdev_free(&dev->qdev);

        return NULL;

    }

    return dev;

}



static void isabus_dev_print(Monitor *mon, DeviceState *dev, int indent)

{

    ISADevice *d = DO_UPCAST(ISADevice, qdev, dev);

hw/isa.h

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ void isa_bus_irqs(qemu_irq *irqs); 
qemu_irq isa_reserve_irq(int isairq);

void isa_init_irq(ISADevice *dev, qemu_irq *p, int isairq);

void isa_qdev_register(ISADeviceInfo *info);

ISADevice *isa_create(const char *name);

ISADevice *isa_create_simple(const char *name);



extern target_phys_addr_t isa_mem_base;