[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] Re: [PATCH v2 3/4] xen/pci: Move x86 specific code to x86 directory.
Hello Jan, > On 6 Nov 2020, at 9:09 am, Jan Beulich <jbeulich@xxxxxxxx> wrote: > > On 03.11.2020 16:59, Rahul Singh wrote: >> --- a/xen/drivers/passthrough/pci.c >> +++ b/xen/drivers/passthrough/pci.c >> @@ -14,7 +14,6 @@ >> * this program; If not, see <http://www.gnu.org/licenses/>. >> */ >> >> -#include <xen/sched.h> Removed in this patch series 3/4 >> #include <xen/pci.h> >> #include <xen/pci_regs.h> I will remove in next version. >> #include <xen/pci_ids.h> It is required for PCI_VENDOR_ID_INTEL that is referenced in apply_quirks function. > > I think this hunk wants dropping - struct domain continues to be used > in this file, for example. > >> @@ -847,71 +845,6 @@ int pci_remove_device(u16 seg, u8 bus, u8 devfn) >> return ret; >> } >> >> -static int pci_clean_dpci_irq(struct domain *d, >> - struct hvm_pirq_dpci *pirq_dpci, void *arg) >> -{ >> - struct dev_intx_gsi_link *digl, *tmp; >> - >> - pirq_guest_unbind(d, dpci_pirq(pirq_dpci)); >> - >> - if ( pt_irq_need_timer(pirq_dpci->flags) ) >> - kill_timer(&pirq_dpci->timer); >> - >> - list_for_each_entry_safe ( digl, tmp, &pirq_dpci->digl_list, list ) >> - { >> - list_del(&digl->list); >> - xfree(digl); >> - } >> - >> - radix_tree_delete(&d->pirq_tree, dpci_pirq(pirq_dpci)->pirq); >> - >> - if ( !pt_pirq_softirq_active(pirq_dpci) ) >> - return 0; >> - >> - domain_get_irq_dpci(d)->pending_pirq_dpci = pirq_dpci; >> - >> - return -ERESTART; >> -} >> - >> -static int pci_clean_dpci_irqs(struct domain *d) >> -{ >> - struct hvm_irq_dpci *hvm_irq_dpci = NULL; >> - >> - if ( !is_iommu_enabled(d) ) >> - return 0; >> - >> - if ( !is_hvm_domain(d) ) >> - return 0; >> - >> - spin_lock(&d->event_lock); >> - hvm_irq_dpci = domain_get_irq_dpci(d); >> - if ( hvm_irq_dpci != NULL ) >> - { >> - int ret = 0; >> - >> - if ( hvm_irq_dpci->pending_pirq_dpci ) >> - { >> - if ( pt_pirq_softirq_active(hvm_irq_dpci->pending_pirq_dpci) ) >> - ret = -ERESTART; >> - else >> - hvm_irq_dpci->pending_pirq_dpci = NULL; >> - } >> - >> - if ( !ret ) >> - ret = pt_pirq_iterate(d, pci_clean_dpci_irq, NULL); >> - if ( ret ) >> - { >> - spin_unlock(&d->event_lock); >> - return ret; >> - } >> - >> - hvm_domain_irq(d)->dpci = NULL; >> - free_hvm_irq_dpci(hvm_irq_dpci); >> - } >> - spin_unlock(&d->event_lock); >> - return 0; >> -} > > If this code gets moved, I think it ought to move into > xen/drivers/passthrough/io.c, as that's where all the companion code > sits. (The file as a whole, getting built for x86/HVM only, may want > moving to xen/drivers/passthrough/x86/ if the underlying model isn't > suitable for Arm. Then it probably also would want to be named hvm.c, > to express its limited purpose.) Ok I will move the code to the file io.c and move that file to x86 directory and rename it hvm.c > > Jan Regards, Rahul
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |