mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Xen PCI passthru: convert to realize()

Browse Source 
Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
This commit is contained in:
Cao jin 2016-01-17 20:13:15 +08:00 committed by Stefano Stabellini
parent d50a6e58e8
commit 5a11d0f754
1 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
hw/xen/xen_pt.c
View File

@ -760,10 +760,10 @@ static void xen_pt_destroy(PCIDevice *d) {
} }
/* init */ /* init */
static int xen_pt_initfn(PCIDevice *d) static void xen_pt_realize(PCIDevice *d, Error **errp)
{ {
XenPCIPassthroughState *s = XEN_PT_DEVICE(d); XenPCIPassthroughState *s = XEN_PT_DEVICE(d);
int rc = 0; int i, rc = 0;
uint8_t machine_irq = 0, scratch; uint8_t machine_irq = 0, scratch;
uint16_t cmd = 0; uint16_t cmd = 0;
int pirq = XEN_PT_UNASSIGNED_PIRQ; int pirq = XEN_PT_UNASSIGNED_PIRQ;
@ -781,8 +781,8 @@ static int xen_pt_initfn(PCIDevice *d)
&err); &err);
if (err) { if (err) {
error_append_hint(&err, "Failed to \"open\" the real pci device"); error_append_hint(&err, "Failed to \"open\" the real pci device");
error_report_err(err); error_propagate(errp, err);
return -1; return;
} }
s->is_virtfn = s->real_device.is_virtfn; s->is_virtfn = s->real_device.is_virtfn;
@ -802,19 +802,19 @@ static int xen_pt_initfn(PCIDevice *d)
if ((s->real_device.domain == 0) && (s->real_device.bus == 0) && if ((s->real_device.domain == 0) && (s->real_device.bus == 0) &&
(s->real_device.dev == 2) && (s->real_device.func == 0)) { (s->real_device.dev == 2) && (s->real_device.func == 0)) {
if (!is_igd_vga_passthrough(&s->real_device)) { if (!is_igd_vga_passthrough(&s->real_device)) {
XEN_PT_ERR(d, "Need to enable igd-passthru if you're trying" error_setg(errp, "Need to enable igd-passthru if you're trying"
" to passthrough IGD GFX.\n"); " to passthrough IGD GFX");
xen_host_pci_device_put(&s->real_device); xen_host_pci_device_put(&s->real_device);
return -1; return;
} }
xen_pt_setup_vga(s, &s->real_device, &err); xen_pt_setup_vga(s, &s->real_device, &err);
if (err) { if (err) {
error_append_hint(&err, "Setup VGA BIOS of passthrough" error_append_hint(&err, "Setup VGA BIOS of passthrough"
" GFX failed"); " GFX failed");
error_report_err(err); error_propagate(errp, err);
xen_host_pci_device_put(&s->real_device); xen_host_pci_device_put(&s->real_device);
return -1; return;
} }
/* Register ISA bridge for passthrough GFX. */ /* Register ISA bridge for passthrough GFX. */
@ -836,20 +836,19 @@ static int xen_pt_initfn(PCIDevice *d)
/* Bind interrupt */ /* Bind interrupt */
rc = xen_host_pci_get_byte(&s->real_device, PCI_INTERRUPT_PIN, &scratch); rc = xen_host_pci_get_byte(&s->real_device, PCI_INTERRUPT_PIN, &scratch);
if (rc) { if (rc) {
XEN_PT_ERR(d, "Failed to read PCI_INTERRUPT_PIN! (rc:%d)\n", rc); error_setg_errno(errp, errno, "Failed to read PCI_INTERRUPT_PIN");
goto err_out; goto err_out;
} }
if (!scratch) { if (!scratch) {
XEN_PT_LOG(d, "no pin interrupt\n"); error_setg(errp, "no pin interrupt");
goto out; goto out;
} }
machine_irq = s->real_device.irq; machine_irq = s->real_device.irq;
rc = xc_physdev_map_pirq(xen_xc, xen_domid, machine_irq, &pirq); rc = xc_physdev_map_pirq(xen_xc, xen_domid, machine_irq, &pirq);
if (rc < 0) { if (rc < 0) {
XEN_PT_ERR(d, "Mapping machine irq %u to pirq %i failed, (err: %d)\n", error_setg_errno(errp, errno, "Mapping machine irq %u to"
machine_irq, pirq, errno); " pirq %i failed", machine_irq, pirq);
/* Disable PCI intx assertion (turn on bit10 of devctl) */ /* Disable PCI intx assertion (turn on bit10 of devctl) */
cmd |= PCI_COMMAND_INTX_DISABLE; cmd |= PCI_COMMAND_INTX_DISABLE;
@ -870,8 +869,8 @@ static int xen_pt_initfn(PCIDevice *d)
PCI_SLOT(d->devfn), PCI_SLOT(d->devfn),
e_intx); e_intx);
if (rc < 0) { if (rc < 0) {
XEN_PT_ERR(d, "Binding of interrupt %i failed! (err: %d)\n", error_setg_errno(errp, errno, "Binding of interrupt %u failed",
e_intx, errno); e_intx);
/* Disable PCI intx assertion (turn on bit10 of devctl) */ /* Disable PCI intx assertion (turn on bit10 of devctl) */
cmd |= PCI_COMMAND_INTX_DISABLE; cmd |= PCI_COMMAND_INTX_DISABLE;
@ -879,8 +878,8 @@ static int xen_pt_initfn(PCIDevice *d)
if (xen_pt_mapped_machine_irq[machine_irq] == 0) { if (xen_pt_mapped_machine_irq[machine_irq] == 0) {
if (xc_physdev_unmap_pirq(xen_xc, xen_domid, machine_irq)) { if (xc_physdev_unmap_pirq(xen_xc, xen_domid, machine_irq)) {
XEN_PT_ERR(d, "Unmapping of machine interrupt %i failed!" error_setg_errno(errp, errno, "Unmapping of machine"
" (err: %d)\n", machine_irq, errno); " interrupt %u failed", machine_irq);
} }
} }
s->machine_irq = 0; s->machine_irq = 0;
@ -893,14 +892,14 @@ out:
rc = xen_host_pci_get_word(&s->real_device, PCI_COMMAND, &val); rc = xen_host_pci_get_word(&s->real_device, PCI_COMMAND, &val);
if (rc) { if (rc) {
XEN_PT_ERR(d, "Failed to read PCI_COMMAND! (rc: %d)\n", rc); error_setg_errno(errp, errno, "Failed to read PCI_COMMAND");
goto err_out; goto err_out;
} else { } else {
val |= cmd; val |= cmd;
rc = xen_host_pci_set_word(&s->real_device, PCI_COMMAND, val); rc = xen_host_pci_set_word(&s->real_device, PCI_COMMAND, val);
if (rc) { if (rc) {
XEN_PT_ERR(d, "Failed to write PCI_COMMAND val=0x%x!(rc: %d)\n", error_setg_errno(errp, errno, "Failed to write PCI_COMMAND"
val, rc); " val = 0x%x", val);
goto err_out; goto err_out;
} }
} }
@ -910,15 +909,19 @@ out:
memory_listener_register(&s->io_listener, &address_space_io); memory_listener_register(&s->io_listener, &address_space_io);
s->listener_set = true; s->listener_set = true;
XEN_PT_LOG(d, XEN_PT_LOG(d,
"Real physical device %02x:%02x.%d registered successfully!\n", "Real physical device %02x:%02x.%d registered successfully\n",
s->hostaddr.bus, s->hostaddr.slot, s->hostaddr.function); s->hostaddr.bus, s->hostaddr.slot, s->hostaddr.function);
return 0; return;
err_out: err_out:
for (i = 0; i < PCI_ROM_SLOT; i++) {
object_unparent(OBJECT(&s->bar[i]));
}
object_unparent(OBJECT(&s->rom));
xen_pt_destroy(d); xen_pt_destroy(d);
assert(rc); assert(rc);
return rc;
} }
static void xen_pt_unregister_device(PCIDevice *d) static void xen_pt_unregister_device(PCIDevice *d)
@ -937,7 +940,7 @@ static void xen_pci_passthrough_class_init(ObjectClass *klass, void *data)
DeviceClass *dc = DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);
PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
k->init = xen_pt_initfn; k->realize = xen_pt_realize;
k->exit = xen_pt_unregister_device; k->exit = xen_pt_unregister_device;
k->config_read = xen_pt_pci_read_config; k->config_read = xen_pt_pci_read_config;
k->config_write = xen_pt_pci_write_config; k->config_write = xen_pt_pci_write_config;