On Sun, Jul 05, 2009 at 09:03:00PM +0300, Avi Kivity wrote:
> On 07/05/2009 08:35 PM, Michael S. Tsirkin wrote:
>> Support msi-x with irqchip in kernel: allocate entries
>> when they are used, and update when they are unmasked.
>>
>> @@ -340,6 +447,10 @@ void msix_notify(PCIDevice *dev, unsigned vector)
>> msix_set_pending(dev, vector);
>> return;
>> }
>> + if (kvm_enabled()&& qemu_kvm_irqchip_in_kernel()) {
>> + kvm_set_irq(dev->msix_irq_entries[vector].gsi, 1, NULL);
>>
>
> Toggle back to zero after setting to one, for consistency.
>
>> --- a/qemu-kvm.c
>> +++ b/qemu-kvm.c
>> @@ -1448,6 +1448,60 @@ int kvm_del_routing_entry(kvm_context_t kvm,
>> #endif
>> }
>>
>> +int kvm_update_routing_entry(kvm_context_t kvm,
>> + struct kvm_irq_routing_entry* entry,
>> + struct kvm_irq_routing_entry* newentry)
>> +{
>> +#ifdef KVM_CAP_IRQ_ROUTING
>> + struct kvm_irq_routing_entry *e;
>> + int i, gsi, found = 0;
>> +
>> + if (entry->gsi != newentry->gsi ||
>> + entry->type != newentry->type) {
>> + return -EINVAL;
>> + }
>> + gsi = entry->gsi;
>> +
>> + for (i = 0; i< kvm->irq_routes->nr; ++i) {
>> + e =&kvm->irq_routes->entries[i];
>> + if (e->type != entry->type || e->gsi != gsi) {
>> + continue;
>> + }
>> + switch (e->type)
>> + {
>> + case KVM_IRQ_ROUTING_IRQCHIP: {
>> + if (e->u.irqchip.irqchip ==
>> + entry->u.irqchip.irqchip
>> + && e->u.irqchip.pin ==
>> + entry->u.irqchip.pin) {
>> + found = 1;
>> + }
>>
>
> this
> is
> not
> readable
OK, but other functions in this file look the same.
>> + break;
>> + }
>> + case KVM_IRQ_ROUTING_MSI: {
>> + if (e->u.msi.address_lo ==
>> + entry->u.msi.address_lo
>> + && e->u.msi.address_hi ==
>> + entry->u.msi.address_hi
>> + && e->u.msi.data == entry->u.msi.data) {
>> + found = 1;
>> + }
>> + break;
>> + }
>> + default:
>> + break;
>> + }
>> + if (found) {
>> + memcpy(e, entry, sizeof *e);
>> + return 0;
>> + }
>> + }
>> + return -ESRCH;
>> +#else
>> + return -ENOSYS;
>> +#endif
>> +}
>>
>
> Please detab the whole thing.
>
> You use perror() on functions that return -errno; please fix.
Should I send output to stderr or to console, btw?
>
> --
> Do not meddle in the internals of kernels, for they are subtle and quick to panic.
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
