[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 05/11] xen-pvdevice: convert to realize()
From: |
Stefano Stabellini |
Subject: |
[Qemu-devel] [PULL 05/11] xen-pvdevice: convert to realize() |
Date: |
Thu, 21 Jan 2016 17:01:24 +0000 |
From: Cao jin <address@hidden>
Signed-off-by: Cao jin <address@hidden>
Reviewed-by: Stefano Stabellini <address@hidden>
---
hw/i386/xen/xen_pvdevice.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/hw/i386/xen/xen_pvdevice.c b/hw/i386/xen/xen_pvdevice.c
index c218947..9abcf25 100644
--- a/hw/i386/xen/xen_pvdevice.c
+++ b/hw/i386/xen/xen_pvdevice.c
@@ -69,14 +69,16 @@ static const MemoryRegionOps xen_pv_mmio_ops = {
.endianness = DEVICE_LITTLE_ENDIAN,
};
-static int xen_pv_init(PCIDevice *pci_dev)
+static void xen_pv_realize(PCIDevice *pci_dev, Error **errp)
{
XenPVDevice *d = XEN_PV_DEVICE(pci_dev);
uint8_t *pci_conf;
/* device-id property must always be supplied */
- if (d->device_id == 0xffff)
- return -1;
+ if (d->device_id == 0xffff) {
+ error_setg(errp, "Device ID invalid, it must always be supplied");
+ return;
+ }
pci_conf = pci_dev->config;
@@ -97,8 +99,6 @@ static int xen_pv_init(PCIDevice *pci_dev)
pci_register_bar(pci_dev, 1, PCI_BASE_ADDRESS_MEM_PREFETCH,
&d->mmio);
-
- return 0;
}
static Property xen_pv_props[] = {
@@ -114,7 +114,7 @@ static void xen_pv_class_init(ObjectClass *klass, void
*data)
DeviceClass *dc = DEVICE_CLASS(klass);
PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
- k->init = xen_pv_init;
+ k->realize = xen_pv_realize;
k->class_id = PCI_CLASS_SYSTEM_OTHER;
dc->desc = "Xen PV Device";
dc->props = xen_pv_props;
--
1.7.10.4
- [Qemu-devel] [PULL 0/11] xen-20160121, Stefano Stabellini, 2016/01/21
- [Qemu-devel] [PULL 07/11] Xen: use qemu_strtoul instead of strtol, Stefano Stabellini, 2016/01/21
- [Qemu-devel] [PULL 04/11] xen-hvm: Clean up xen_ram_alloc() error handling, Stefano Stabellini, 2016/01/21
- [Qemu-devel] [PULL 10/11] Add Error **errp for xen_pt_config_init(), Stefano Stabellini, 2016/01/21
- [Qemu-devel] [PULL 03/11] xen-hvm: Clean up xen_hvm_init() error handling, Stefano Stabellini, 2016/01/21
- [Qemu-devel] [PULL 05/11] xen-pvdevice: convert to realize(),
Stefano Stabellini <=
- [Qemu-devel] [PULL 01/11] MAINTAINERS: update Xen files, Stefano Stabellini, 2016/01/21
- [Qemu-devel] [PULL 06/11] Change xen_host_pci_sysfs_path() to return void, Stefano Stabellini, 2016/01/21
- [Qemu-devel] [PULL 08/11] Add Error **errp for xen_host_pci_device_get(), Stefano Stabellini, 2016/01/21
- [Qemu-devel] [PULL 09/11] Add Error **errp for xen_pt_setup_vga(), Stefano Stabellini, 2016/01/21
- [Qemu-devel] [PULL 02/11] xenfb.c: avoid expensive loops when prod <= out_cons, Stefano Stabellini, 2016/01/21
- [Qemu-devel] [PULL 11/11] Xen PCI passthru: convert to realize(), Stefano Stabellini, 2016/01/21
- Re: [Qemu-devel] [PULL 0/11] xen-20160121, Peter Maydell, 2016/01/21