diff for duplicates of <20140606005558.GA13936@shangw> diff --git a/a/1.txt b/N1/1.txt index 38b04ae..9ff618f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -167,7 +167,7 @@ On Thu, Jun 05, 2014 at 11:18:34AM -0600, Alex Williamson wrote: >> if (!try_module_get(THIS_MODULE)) >> return -ENODEV; >> ->> if (atomic_inc_return(&vdev->refcnt) = 1) { +>> if (atomic_inc_return(&vdev->refcnt) == 1) { >> - int ret = vfio_pci_enable(vdev); >> - if (ret) { >> - module_put(THIS_MODULE); @@ -203,7 +203,7 @@ Yep, I need to call vfio_pci_disable(vdev) for the case. I'll fix, thanks. >> >> switch (cmd) { >> case VFIO_CHECK_EXTENSION: ->> - return (arg = VFIO_SPAPR_TCE_IOMMU) ? 1 : 0; +>> - return (arg == VFIO_SPAPR_TCE_IOMMU) ? 1 : 0; >> + switch (arg) { >> + case VFIO_SPAPR_TCE_IOMMU: >> + ret = 1; @@ -281,7 +281,7 @@ Yes, we can. I'll remove those in next revision. Thanks. >> + >> + switch (cmd) { >> + case VFIO_CHECK_EXTENSION: ->> + if (arg = VFIO_EEH) +>> + if (arg == VFIO_EEH) >> + ret = eeh_enabled() ? 1 : 0; >> + else >> + ret = 0; diff --git a/a/content_digest b/N1/content_digest index 85dd99b..ea3825e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "ref\01401988714.9207.198.camel@ul30vt.home\0" "From\0Gavin Shan <gwshan@linux.vnet.ibm.com>\0" "Subject\0Re: [PATCH v8 3/3] drivers/vfio: EEH support for VFIO PCI device\0" - "Date\0Fri, 06 Jun 2014 00:55:58 +0000\0" + "Date\0Fri, 6 Jun 2014 10:55:58 +1000\0" "To\0Alex Williamson <alex.williamson@redhat.com>\0" "Cc\0aik@ozlabs.ru" Gavin Shan <gwshan@linux.vnet.ibm.com> @@ -182,7 +182,7 @@ ">> \tif (!try_module_get(THIS_MODULE))\n" ">> \t\treturn -ENODEV;\n" ">> \n" - ">> \tif (atomic_inc_return(&vdev->refcnt) = 1) {\n" + ">> \tif (atomic_inc_return(&vdev->refcnt) == 1) {\n" ">> -\t\tint ret = vfio_pci_enable(vdev);\n" ">> -\t\tif (ret) {\n" ">> -\t\t\tmodule_put(THIS_MODULE);\n" @@ -218,7 +218,7 @@ ">> \n" ">> \tswitch (cmd) {\n" ">> \tcase VFIO_CHECK_EXTENSION:\n" - ">> -\t\treturn (arg = VFIO_SPAPR_TCE_IOMMU) ? 1 : 0;\n" + ">> -\t\treturn (arg == VFIO_SPAPR_TCE_IOMMU) ? 1 : 0;\n" ">> +\t\tswitch (arg) {\n" ">> +\t\tcase VFIO_SPAPR_TCE_IOMMU:\n" ">> +\t\t\tret = 1;\n" @@ -296,7 +296,7 @@ ">> +\n" ">> +\tswitch (cmd) {\n" ">> +\tcase VFIO_CHECK_EXTENSION:\n" - ">> +\t\tif (arg = VFIO_EEH)\n" + ">> +\t\tif (arg == VFIO_EEH)\n" ">> +\t\t\tret = eeh_enabled() ? 1 : 0;\n" ">> +\t\telse\n" ">> +\t\t\tret = 0;\n" @@ -447,4 +447,4 @@ ">\n" > -7c985f05974b2b35bbe62c177366d21c58b05d6b33227a66723ca5e84b2801c0 +cc87235b4da7143784884ef134af4750bb5606708857751d8e8e01525ba03c8a
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.