[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/10] pci-assign: Convert to realize
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 10/10] pci-assign: Convert to realize |
Date: |
Mon, 19 Jan 2015 15:52:37 +0100 |
Signed-off-by: Markus Armbruster <address@hidden>
---
hw/i386/kvm/pci-assign.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/hw/i386/kvm/pci-assign.c b/hw/i386/kvm/pci-assign.c
index bb206da..5a92800 100644
--- a/hw/i386/kvm/pci-assign.c
+++ b/hw/i386/kvm/pci-assign.c
@@ -1742,7 +1742,7 @@ static void reset_assigned_device(DeviceState *dev)
assigned_dev_pci_write_config(pci_dev, PCI_COMMAND, 0, 1);
}
-static int assigned_initfn(struct PCIDevice *pci_dev)
+static void assigned_realize(struct PCIDevice *pci_dev, Error **errp)
{
AssignedDevice *dev = DO_UPCAST(AssignedDevice, dev, pci_dev);
uint8_t e_intx;
@@ -1825,7 +1825,7 @@ static int assigned_initfn(struct PCIDevice *pci_dev)
assigned_dev_load_option_rom(dev);
- return 0;
+ return;
assigned_out:
deassign_device(dev);
@@ -1835,9 +1835,7 @@ out:
exit_with_error:
assert(local_err);
- qerror_report_err(local_err);
- error_free(local_err);
- return -1;
+ error_propagate(errp, local_err);
}
static void assigned_exitfn(struct PCIDevice *pci_dev)
@@ -1873,7 +1871,7 @@ static void assign_class_init(ObjectClass *klass, void
*data)
PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
DeviceClass *dc = DEVICE_CLASS(klass);
- k->init = assigned_initfn;
+ k->realize = assigned_realize;
k->exit = assigned_exitfn;
k->config_read = assigned_dev_pci_read_config;
k->config_write = assigned_dev_pci_write_config;
--
1.9.3
- [Qemu-devel] [PATCH 00/10] pci: Partial conversion to realize, Markus Armbruster, 2015/01/19
- [Qemu-devel] [PATCH 02/10] pci: Permit incremental conversion of device models to realize, Markus Armbruster, 2015/01/19
- [Qemu-devel] [PATCH 04/10] pcnet: pcnet_common_init() always returns 0, change to void, Markus Armbruster, 2015/01/19
- [Qemu-devel] [PATCH 07/10] ide/ich: Convert to realize, Markus Armbruster, 2015/01/19
- [Qemu-devel] [PATCH 09/10] qxl: Convert to realize, Markus Armbruster, 2015/01/19
- [Qemu-devel] [PATCH 01/10] pci: Convert core to realize, Markus Armbruster, 2015/01/19
- [Qemu-devel] [PATCH 06/10] serial-pci: Convert to realize, Markus Armbruster, 2015/01/19
- [Qemu-devel] [PATCH 10/10] pci-assign: Convert to realize,
Markus Armbruster <=
- [Qemu-devel] [PATCH 03/10] pci: Trivial device model conversions to realize, Markus Armbruster, 2015/01/19
- [Qemu-devel] [PATCH 08/10] cirrus-vga: Convert to realize, Markus Armbruster, 2015/01/19
- [Qemu-devel] [PATCH 05/10] pcnet: Convert to realize, Markus Armbruster, 2015/01/19
- Re: [Qemu-devel] [PATCH 00/10] pci: Partial conversion to realize, Andreas Färber, 2015/01/19