[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH RFC 08/10] cirrus-vga: Convert to realize
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH RFC 08/10] cirrus-vga: Convert to realize |
Date: |
Tue, 28 Oct 2014 08:35:37 +0100 |
Signed-off-by: Markus Armbruster <address@hidden>
---
hw/display/cirrus_vga.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c
index 8a5b76c..1ad1073 100644
--- a/hw/display/cirrus_vga.c
+++ b/hw/display/cirrus_vga.c
@@ -2969,7 +2969,7 @@ static const TypeInfo isa_cirrus_vga_info = {
*
***************************************/
-static int pci_cirrus_vga_initfn(PCIDevice *dev)
+static void pci_cirrus_vga_realize(PCIDevice *dev, Error **errp)
{
PCICirrusVGAState *d = DO_UPCAST(PCICirrusVGAState, dev, dev);
CirrusVGAState *s = &d->cirrus_vga;
@@ -2980,9 +2980,9 @@ static int pci_cirrus_vga_initfn(PCIDevice *dev)
Also accept 8 MB/16 MB for backward compatibility. */
if (s->vga.vram_size_mb != 4 && s->vga.vram_size_mb != 8 &&
s->vga.vram_size_mb != 16) {
- error_report("Invalid cirrus_vga ram size '%u'",
- s->vga.vram_size_mb);
- return -1;
+ error_setg(errp, "Invalid cirrus_vga ram size '%u'",
+ s->vga.vram_size_mb);
+ return;
}
/* setup VGA */
vga_common_init(&s->vga, OBJECT(dev), true);
@@ -3007,7 +3007,6 @@ static int pci_cirrus_vga_initfn(PCIDevice *dev)
if (device_id == CIRRUS_ID_CLGD5446) {
pci_register_bar(&d->dev, 1, 0, &s->cirrus_mmio_io);
}
- return 0;
}
static Property pci_vga_cirrus_properties[] = {
@@ -3021,7 +3020,7 @@ static void cirrus_vga_class_init(ObjectClass *klass,
void *data)
DeviceClass *dc = DEVICE_CLASS(klass);
PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
- k->init = pci_cirrus_vga_initfn;
+ k->realize = pci_cirrus_vga_realize;
k->romfile = VGABIOS_CIRRUS_FILENAME;
k->vendor_id = PCI_VENDOR_ID_CIRRUS;
k->device_id = CIRRUS_ID_CLGD5446;
--
1.9.3
- Re: [Qemu-devel] [PATCH RFC 04/10] pcnet: pcnet_common_init() always returns 0, change to void, (continued)
- [Qemu-devel] [PATCH RFC 10/10] pci-assign: Convert to realize, Markus Armbruster, 2014/10/28
- [Qemu-devel] [PATCH RFC 06/10] serial-pci: Convert to realize, Markus Armbruster, 2014/10/28
- [Qemu-devel] [PATCH RFC 02/10] pci: Permit incremental conversion of device models to realize, Markus Armbruster, 2014/10/28
- [Qemu-devel] [PATCH RFC 05/10] pcnet: Convert to realize, Markus Armbruster, 2014/10/28
- [Qemu-devel] [PATCH RFC 07/10] ide/ich: Convert to realize, Markus Armbruster, 2014/10/28
- [Qemu-devel] [PATCH RFC 08/10] cirrus-vga: Convert to realize,
Markus Armbruster <=
- [Qemu-devel] [PATCH RFC 09/10] qxl: Convert to realize, Markus Armbruster, 2014/10/28
- Re: [Qemu-devel] [PATCH RFC 00/10] pci: Partial conversion to realize, Gonglei, 2014/10/28
- Re: [Qemu-devel] [PATCH RFC 00/10] pci: Partial conversion to realize, Andreas Färber, 2014/10/31