diff for duplicates of <4FD969D3.1050700@ozlabs.ru> diff --git a/a/1.txt b/N1/1.txt index 0ba613d..94693cf 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -114,7 +114,7 @@ index 93017cd..21fbc50 100644 - QTAILQ_FOREACH(qdev, &phb->host_state.bus->qbus.children, sibling) { - PCIDevice *dev = (PCIDevice *)qdev; -- if (dev->devfn = devfn) { +- if (dev->devfn == devfn) { - return dev; - } + return NULL; @@ -133,7 +133,7 @@ index 93017cd..21fbc50 100644 + + QTAILQ_FOREACH(qdev, &phb->host_state.bus->qbus.children, sibling) { + PCIDevice *dev = (PCIDevice *)qdev; -+ if (dev->devfn = devfn) { ++ if (dev->devfn == devfn) { + return dev; } } @@ -156,7 +156,7 @@ index 93017cd..21fbc50 100644 + uint32_t config_addr = pdev->devfn << 8; + + /* Disabling - nothing to do */ -+ if (0 = req_num) { ++ if (0 == req_num) { + return 0; + } + @@ -167,7 +167,7 @@ index 93017cd..21fbc50 100644 + return -1; + } + -+ if (0 = ph->msi_table[ndev].nvec) { ++ if (0 == ph->msi_table[ndev].nvec) { + irq = spapr_allocate_irq_block(req_num, XICS_MSI); + if (irq < 0) { + return -1; @@ -231,7 +231,7 @@ index 93017cd..21fbc50 100644 +#define RTAS_CHANGE_MSI_FN 3 +#define RTAS_CHANGE_MSIX_FN 4 + unsigned int func = rtas_ld(args, 3); -+ unsigned int req_num = rtas_ld(args, 4); /* 0 = remove all */ ++ unsigned int req_num = rtas_ld(args, 4); /* 0 == remove all */ + unsigned int seq_num = rtas_ld(args, 5); + int assigned_num = -1; + enum { MSI = 1, MSIX = 2 } ret_intr_type = MSI; @@ -263,11 +263,11 @@ index 93017cd..21fbc50 100644 + return; + } + -+ if (0 = req_num) { ++ if (0 == req_num) { + /* Calculate a device number in the map to remove */ + for (i = 0; i < SPAPR_MSIX_MAX_DEVS; ++i) { + if (phb->msi_table[i].nvec && -+ (phb->msi_table[i].config_addr = config_addr)) { ++ (phb->msi_table[i].config_addr == config_addr)) { + trace_spapr_pci_msi("Releasing MSI config for device#", i); + break; + } @@ -302,7 +302,7 @@ index 93017cd..21fbc50 100644 + } + + assigned_num = spapr_pci_config_msi(phb, i, pdev, -+ ret_intr_type = MSIX, req_num); ++ ret_intr_type == MSIX, req_num); + + if (assigned_num < 0) { + fprintf(stderr, "rtas_ibm_change_msi(%u) failed\n", func); @@ -338,13 +338,13 @@ index 93017cd..21fbc50 100644 + + /* Find device descriptor and start IRQ */ + for (i = 0; i < SPAPR_MSIX_MAX_DEVS; ++i) { -+ if (phb->msi_table[i].config_addr = config_addr) { ++ if (phb->msi_table[i].config_addr == config_addr) { + intr_src_num = phb->msi_table[i].dt_irq + ioa_intr_num; + break; + } + } + /* Device has not been configured, return error */ -+ if (-1 = intr_src_num) { ++ if (-1 == intr_src_num) { + rtas_st(rets, 0, -1); /* Hardware error */ + return; + } @@ -353,7 +353,7 @@ index 93017cd..21fbc50 100644 + + rtas_st(rets, 0, 0); + rtas_st(rets, 1, intr_src_num); -+ rtas_st(rets, 2, 1);/* 0 = level; 1 = edge */ ++ rtas_st(rets, 2, 1);/* 0 == level; 1 == edge */ +} + static int pci_swizzle(int slot, int pin) diff --git a/a/content_digest b/N1/content_digest index 51f2755..1573d9e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\04FD968BB.2000505@ozlabs.ru\0" "From\0Alexey Kardashevskiy <aik@ozlabs.ru>\0" - "Subject\0[PATCH 3/3] pseries pci: added MSI/MSIX support\0" - "Date\0Thu, 14 Jun 2012 04:34:27 +0000\0" + "Subject\0[Qemu-devel] [PATCH 3/3] pseries pci: added MSI/MSIX support\0" + "Date\0Thu, 14 Jun 2012 14:34:27 +1000\0" "To\0qemu-devel@nongnu.org <qemu-devel@nongnu.org>" " kvm-ppc@vger.kernel.org\0" "\00:1\0" @@ -122,7 +122,7 @@ "\n" "- QTAILQ_FOREACH(qdev, &phb->host_state.bus->qbus.children, sibling) {\n" "- PCIDevice *dev = (PCIDevice *)qdev;\n" - "- if (dev->devfn = devfn) {\n" + "- if (dev->devfn == devfn) {\n" "- return dev;\n" "- }\n" "+ return NULL;\n" @@ -141,7 +141,7 @@ "+\n" "+ QTAILQ_FOREACH(qdev, &phb->host_state.bus->qbus.children, sibling) {\n" "+ PCIDevice *dev = (PCIDevice *)qdev;\n" - "+ if (dev->devfn = devfn) {\n" + "+ if (dev->devfn == devfn) {\n" "+ return dev;\n" " }\n" " }\n" @@ -164,7 +164,7 @@ "+ uint32_t config_addr = pdev->devfn << 8;\n" "+\n" "+ /* Disabling - nothing to do */\n" - "+ if (0 = req_num) {\n" + "+ if (0 == req_num) {\n" "+ return 0;\n" "+ }\n" "+\n" @@ -175,7 +175,7 @@ "+ return -1;\n" "+ }\n" "+\n" - "+ if (0 = ph->msi_table[ndev].nvec) {\n" + "+ if (0 == ph->msi_table[ndev].nvec) {\n" "+ irq = spapr_allocate_irq_block(req_num, XICS_MSI);\n" "+ if (irq < 0) {\n" "+ return -1;\n" @@ -239,7 +239,7 @@ "+#define RTAS_CHANGE_MSI_FN 3\n" "+#define RTAS_CHANGE_MSIX_FN 4\n" "+ unsigned int func = rtas_ld(args, 3);\n" - "+ unsigned int req_num = rtas_ld(args, 4); /* 0 = remove all */\n" + "+ unsigned int req_num = rtas_ld(args, 4); /* 0 == remove all */\n" "+ unsigned int seq_num = rtas_ld(args, 5);\n" "+ int assigned_num = -1;\n" "+ enum { MSI = 1, MSIX = 2 } ret_intr_type = MSI;\n" @@ -271,11 +271,11 @@ "+ return;\n" "+ }\n" "+\n" - "+ if (0 = req_num) {\n" + "+ if (0 == req_num) {\n" "+ /* Calculate a device number in the map to remove */\n" "+ for (i = 0; i < SPAPR_MSIX_MAX_DEVS; ++i) {\n" "+ if (phb->msi_table[i].nvec &&\n" - "+ (phb->msi_table[i].config_addr = config_addr)) {\n" + "+ (phb->msi_table[i].config_addr == config_addr)) {\n" "+ trace_spapr_pci_msi(\"Releasing MSI config for device#\", i);\n" "+ break;\n" "+ }\n" @@ -310,7 +310,7 @@ "+ }\n" "+\n" "+ assigned_num = spapr_pci_config_msi(phb, i, pdev,\n" - "+ ret_intr_type = MSIX, req_num);\n" + "+ ret_intr_type == MSIX, req_num);\n" "+\n" "+ if (assigned_num < 0) {\n" "+ fprintf(stderr, \"rtas_ibm_change_msi(%u) failed\\n\", func);\n" @@ -346,13 +346,13 @@ "+\n" "+ /* Find device descriptor and start IRQ */\n" "+ for (i = 0; i < SPAPR_MSIX_MAX_DEVS; ++i) {\n" - "+ if (phb->msi_table[i].config_addr = config_addr) {\n" + "+ if (phb->msi_table[i].config_addr == config_addr) {\n" "+ intr_src_num = phb->msi_table[i].dt_irq + ioa_intr_num;\n" "+ break;\n" "+ }\n" "+ }\n" "+ /* Device has not been configured, return error */\n" - "+ if (-1 = intr_src_num) {\n" + "+ if (-1 == intr_src_num) {\n" "+ rtas_st(rets, 0, -1); /* Hardware error */\n" "+ return;\n" "+ }\n" @@ -361,7 +361,7 @@ "+\n" "+ rtas_st(rets, 0, 0);\n" "+ rtas_st(rets, 1, intr_src_num);\n" - "+ rtas_st(rets, 2, 1);/* 0 = level; 1 = edge */\n" + "+ rtas_st(rets, 2, 1);/* 0 == level; 1 == edge */\n" "+}\n" "+\n" " static int pci_swizzle(int slot, int pin)\n" @@ -496,4 +496,4 @@ "-- \n" 1.7.7.3 -3d84764176511acc118c613699bc4e7832817ecd54d458d8f66fce603513067f +1fa8e4e6a5fc335a6a92d3dbbbb85e17157844fdc4d1eb87a5965a75e86864b7
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.