diff for duplicates of <537CA50E.9090404@suse.de> diff --git a/a/1.txt b/N1/1.txt index 02711f1..a50ac2d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -188,8 +188,8 @@ check. > + 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) { @@ -247,7 +247,7 @@ this function. > + * 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; @@ -366,7 +366,7 @@ recursive > + * 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", @@ -489,7 +489,7 @@ Also, don't mention VFIO or guests in any function inside this file. > 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); @@ -579,7 +579,7 @@ Alex > > 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 f930f07..3c47b2a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\01400648623-9127-4-git-send-email-gwshan@linux.vnet.ibm.com\0" "From\0Alexander Graf <agraf@suse.de>\0" "Subject\0Re: [PATCH v5 3/4] drivers/vfio: EEH support for VFIO PCI device\0" - "Date\0Wed, 21 May 2014 13:07:26 +0000\0" + "Date\0Wed, 21 May 2014 15:07:26 +0200\0" "To\0Gavin Shan <gwshan@linux.vnet.ibm.com>" " kvm-ppc@vger.kernel.org\0" "Cc\0aik@ozlabs.ru" @@ -201,8 +201,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" @@ -260,7 +260,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" @@ -379,7 +379,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" @@ -502,7 +502,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" @@ -592,7 +592,7 @@ "> \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" @@ -664,4 +664,4 @@ "> \n" > #endif /* _UAPIVFIO_H */ -c4cd43281b6da61b19d6362a1d2b94a7f03fa51be78d5c6184981710f06d5211 +1113ad7243a9196fdf468bdf7fd48605d76e90378424d4357ab68177194c3a1e
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.