Commit bce33948 authored by Konrad Rzeszutek Wilk's avatar Konrad Rzeszutek Wilk Committed by Stefano Stabellini
Browse files

xen/pt: Make xen_pt_unregister_device idempotent 



To deal with xen_host_pci_[set|get]_ functions returning error values
and clearing ourselves in the init function we should make the
.exit (xen_pt_unregister_device) function be idempotent in case
the generic code starts calling .exit (or for fun does it before
calling .init!).

Reviewed-by: default avatarStefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: default avatarStefano Stabellini <stefano.stabellini@eu.citrix.com>
parent fe2da64c

hw/xen/xen-host-pci-device.c

+5 −0
Original line number Diff line number Diff line
@@ -392,6 +392,11 @@ error: 
    return rc;

}



bool xen_host_pci_device_closed(XenHostPCIDevice *d)

{

    return d->config_fd == -1;

}



void xen_host_pci_device_put(XenHostPCIDevice *d)

{

    if (d->config_fd >= 0) {

hw/xen/xen-host-pci-device.h

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ typedef struct XenHostPCIDevice { 
int xen_host_pci_device_get(XenHostPCIDevice *d, uint16_t domain,

                            uint8_t bus, uint8_t dev, uint8_t func);

void xen_host_pci_device_put(XenHostPCIDevice *pci_dev);

bool xen_host_pci_device_closed(XenHostPCIDevice *d);



int xen_host_pci_get_byte(XenHostPCIDevice *d, int pos, uint8_t *p);

int xen_host_pci_get_word(XenHostPCIDevice *d, int pos, uint16_t *p);

hw/xen/xen_pt.c

+14 −6
Original line number Diff line number Diff line
@@ -840,6 +840,7 @@ out: 


    memory_listener_register(&s->memory_listener, &s->dev.bus_master_as);

    memory_listener_register(&s->io_listener, &address_space_io);

    s->listener_set = true;

    XEN_PT_LOG(d,

               "Real physical device %02x:%02x.%d registered successfully!\n",

               s->hostaddr.bus, s->hostaddr.slot, s->hostaddr.function);
@@ -852,10 +853,11 @@ static void xen_pt_unregister_device(PCIDevice *d) 
    XenPCIPassthroughState *s = XEN_PT_DEVICE(d);

    XenHostPCIDevice *host_dev = &s->real_device;

    uint8_t machine_irq = s->machine_irq;

    uint8_t intx = xen_pt_pci_intx(s);

    uint8_t intx;

    int rc;



    if (machine_irq) {

    if (machine_irq && !xen_host_pci_device_closed(&s->real_device)) {

        intx = xen_pt_pci_intx(s);

        rc = xc_domain_unbind_pt_irq(xen_xc, xen_domid, machine_irq,

                                     PT_IRQ_TYPE_PCI,

                                     pci_bus_num(d->bus),
@@ -870,6 +872,7 @@ static void xen_pt_unregister_device(PCIDevice *d) 
        }

    }



    /* N.B. xen_pt_config_delete takes care of freeing them. */

    if (s->msi) {

        xen_pt_msi_disable(s);

    }
@@ -889,6 +892,7 @@ static void xen_pt_unregister_device(PCIDevice *d) 
                           machine_irq, errno);

            }

        }

        s->machine_irq = 0;

    }



    /* delete all emulated config registers */
@@ -896,11 +900,15 @@ static void xen_pt_unregister_device(PCIDevice *d) 


    xen_pt_unregister_vga_regions(host_dev);



    if (s->listener_set) {

        memory_listener_unregister(&s->memory_listener);

        memory_listener_unregister(&s->io_listener);



        s->listener_set = false;

    }

    if (!xen_host_pci_device_closed(&s->real_device)) {

        xen_host_pci_device_put(&s->real_device);

    }

}



static Property xen_pci_passthrough_properties[] = {

    DEFINE_PROP_PCI_HOST_DEVADDR("hostaddr", XenPCIPassthroughState, hostaddr),

hw/xen/xen_pt.h

+2 −0
Original line number Diff line number Diff line
@@ -225,6 +225,7 @@ struct XenPCIPassthroughState { 


    MemoryListener memory_listener;

    MemoryListener io_listener;

    bool listener_set;

};



int xen_pt_config_init(XenPCIPassthroughState *s);
@@ -290,6 +291,7 @@ static inline uint8_t xen_pt_pci_intx(XenPCIPassthroughState *s) 
                   " value=%i, acceptable range is 1 - 4\n", r_val);

        r_val = 0;

    } else {

        /* Note that if s.real_device.config_fd is closed we make 0xff. */

        r_val -= 1;

    }