diff for duplicates of <20140521234806.GA4110@shangw> diff --git a/a/1.txt b/N1/1.txt index 2470cf2..4953957 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -207,8 +207,8 @@ Ok. Will use "switch()" in next revision. >>+ goto out; >>+ } >>+ ->>+ if (option = EEH_OPT_DISABLE || ->>+ option = EEH_OPT_ENABLE) { +>>+ if (option == EEH_OPT_DISABLE || +>>+ option == EEH_OPT_ENABLE) { >>+ *retval = 0; >>+ } else { >>+ if (!eeh_ops || !eeh_ops->set_option) { @@ -269,7 +269,7 @@ Will have names in next revision and use "switch()", thanks. >>+ * built in "shared" mode. Also, the PE address has the format >>+ * of "00BBSS00". >>+ */ ->>+ if (option = 0) { +>>+ if (option == 0) { >>+ bus = eeh_pe_bus_get(pe); >>+ if (!bus) { >>+ *retval = -3; @@ -398,7 +398,7 @@ Thanks. >>+ * frozen PE. >>+ */ ->>+ if (option = EEH_RESET_DEACTIVATE) { +>>+ if (option == EEH_RESET_DEACTIVATE) { >>+ ret = eeh_ops->set_option(pe, EEH_OPT_THAW_MMIO); >>+ if (ret) { >>+ pr_debug("%s: Cannot enable IO for PHB#%d-PE#%d (%d)\n", @@ -519,7 +519,7 @@ Ok. I'll avoid mentioning "VFIO" and "guest". >>+ int ret; >> 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); @@ -611,7 +611,7 @@ Gavin >>@@ -682,6 +755,20 @@ hot_reset_release: >> kfree(groups); >> return ret; ->>+ } else if (cmd = VFIO_EEH_OP) { +>>+ } else if (cmd == VFIO_EEH_OP) { >>+ struct vfio_eeh_op info; >>+ int ret = 0; >>+ diff --git a/a/content_digest b/N1/content_digest index f4e4966..4291666 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "ref\0537CA50E.9090404@suse.de\0" "From\0Gavin Shan <gwshan@linux.vnet.ibm.com>\0" "Subject\0Re: [PATCH v5 3/4] drivers/vfio: EEH support for VFIO PCI device\0" - "Date\0Wed, 21 May 2014 23:48:06 +0000\0" + "Date\0Thu, 22 May 2014 09:48:06 +1000\0" "To\0Alexander Graf <agraf@suse.de>\0" "Cc\0aik@ozlabs.ru" Gavin Shan <gwshan@linux.vnet.ibm.com> @@ -222,8 +222,8 @@ ">>+\t\tgoto out;\n" ">>+\t}\n" ">>+\n" - ">>+\tif (option = EEH_OPT_DISABLE ||\n" - ">>+\t option = EEH_OPT_ENABLE) {\n" + ">>+\tif (option == EEH_OPT_DISABLE ||\n" + ">>+\t option == EEH_OPT_ENABLE) {\n" ">>+\t\t*retval = 0;\n" ">>+\t} else {\n" ">>+\t\tif (!eeh_ops || !eeh_ops->set_option) {\n" @@ -284,7 +284,7 @@ ">>+\t * built in \"shared\" mode. Also, the PE address has the format\n" ">>+\t * of \"00BBSS00\".\n" ">>+\t */\n" - ">>+\tif (option = 0) {\n" + ">>+\tif (option == 0) {\n" ">>+\t\tbus = eeh_pe_bus_get(pe);\n" ">>+\t\tif (!bus) {\n" ">>+\t\t\t*retval = -3;\n" @@ -413,7 +413,7 @@ "\n" ">>+\t * frozen PE.\n" ">>+\t */\n" - ">>+\tif (option = EEH_RESET_DEACTIVATE) {\n" + ">>+\tif (option == EEH_RESET_DEACTIVATE) {\n" ">>+\t\tret = eeh_ops->set_option(pe, EEH_OPT_THAW_MMIO);\n" ">>+\t\tif (ret) {\n" ">>+\t\t\tpr_debug(\"%s: Cannot enable IO for PHB#%d-PE#%d (%d)\\n\",\n" @@ -534,7 +534,7 @@ ">>+\tint ret;\n" ">> \tif (!try_module_get(THIS_MODULE))\n" ">> \t\treturn -ENODEV;\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" @@ -626,7 +626,7 @@ ">>@@ -682,6 +755,20 @@ hot_reset_release:\n" ">> \t\tkfree(groups);\n" ">> \t\treturn ret;\n" - ">>+\t} else if (cmd = VFIO_EEH_OP) {\n" + ">>+\t} else if (cmd == VFIO_EEH_OP) {\n" ">>+\t\tstruct vfio_eeh_op info;\n" ">>+\t\tint ret = 0;\n" ">>+\n" @@ -700,4 +700,4 @@ ">More majordomo info at http://vger.kernel.org/majordomo-info.html\n" > -fd149c4ea5e3962617182d70aa0cfa07791392b2be563b11e0499bef77879d58 +8e07a84385b5c8d6787028e54745d19ecdad630b8be12ed7e0e92a78b43ea034
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.