diff for duplicates of <4E7CA399.3010301@siemens.com> diff --git a/a/1.txt b/N1/1.txt index 25b8be0..306638b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -135,14 +135,14 @@ index ff2332b..78ed911 100755 esac @@ -3275,9 +3268,6 @@ case "$target_arch2" in - target_phys_bitsd + target_phys_bits=64 target_long_alignment=8 ;; - ia64) -- target_phys_bitsd +- target_phys_bits=64 - ;; alpha) - target_phys_bitsd + target_phys_bits=64 target_long_alignment=8 diff --git a/cpu-exec.c b/cpu-exec.c index f224335..de0d716 100644 @@ -239,7 +239,7 @@ index 288f80c..3c73cea 100644 - irq = ipf_map_irq(&dev->dev, irq); -#endif - - if (dev->girq = irq) + if (dev->girq == irq) return r; diff --git a/hw/ipf.c b/hw/ipf.c @@ -483,7 +483,7 @@ index 10c21eb..0000000 - - for (i = 0; i < nbds; i++) { - bds[i] = boot_device2nibble(boot_device[i]); -- if (bds[i] = 0) { +- if (bds[i] == 0) { - fprintf(stderr, "Invalid boot device for PC: '%c'\n", - boot_device[i]); - exit(1); @@ -540,7 +540,7 @@ index 10c21eb..0000000 - <= heads <= 16, 1 <= cylinders <= 16383. The BIOS - geometry can be different if a translation is done. */ - translation = bdrv_get_translation_hint(hd_table[i]); -- if (translation = BIOS_ATA_TRANSLATION_AUTO) { +- if (translation == BIOS_ATA_TRANSLATION_AUTO) { - bdrv_get_geometry_hint(hd_table[i], &cylinders, - &heads, §ors); - if (cylinders <= 1024 && heads <= 16 && sectors <= 63) { @@ -616,7 +616,7 @@ index 10c21eb..0000000 -{ - static int nb_ne2k = 0; - -- if (nb_ne2k = NE2000_NB_MAX) +- if (nb_ne2k == NE2000_NB_MAX) - return; - isa_ne2000_init(ne2000_io[nb_ne2k], pic[ne2000_irq[nb_ne2k]], nd); - nb_ne2k++; @@ -659,7 +659,7 @@ index 10c21eb..0000000 - } - - /* init CPUs */ -- if (cpu_model = NULL) { +- if (cpu_model == NULL) { - cpu_model = "IA64"; - } - @@ -711,7 +711,7 @@ index 10c21eb..0000000 - - snprintf(buf, sizeof(buf), "%s/%s", bios_dir, FW_FILENAME); - image = read_image(buf, &image_size ); -- if (NULL = image || !image_size) { +- if (NULL == image || !image_size) { - fprintf(stderr, "Error when reading Guest Firmware!\n"); - fprintf(stderr, "Please check Guest firmware at %s\n", buf); - exit(1); @@ -791,7 +791,7 @@ index 10c21eb..0000000 - for(i = 0; i < nb_nics; i++) { - NICInfo *nd = &nd_table[i]; - -- if (!pci_enabled || (nd->model && strcmp(nd->model, "ne2k_isa") = 0)) +- if (!pci_enabled || (nd->model && strcmp(nd->model, "ne2k_isa") == 0)) - pc_init_ne2k_isa(nd, i8259); - else - pci_nic_init(nd, "e1000", NULL); @@ -944,7 +944,7 @@ index 10c21eb..0000000 - ioapic_irq_count[vector] -= 1; - - if (kvm_enabled()) { -- if (kvm_set_irq(vector, ioapic_irq_count[vector] = 0, &pic_ret)) +- if (kvm_set_irq(vector, ioapic_irq_count[vector] == 0, &pic_ret)) - if (pic_ret != 0) - apic_set_irq_delivered(); - return; @@ -1673,7 +1673,7 @@ index 79f8464..0000000 - char *hob_buf; - - hob_buf = malloc(GFW_HOB_SIZE); -- if (hob_buf = NULL) { +- if (hob_buf == NULL) { - Hob_Output("Hob: Could not allocate hob"); - return -1; - } @@ -2108,7 +2108,7 @@ index 79f8464..0000000 - uint8_t *image = NULL, *tmp; - unsigned int bytes; - -- if ((filename = NULL) || (size = NULL)) +- if ((filename == NULL) || (size == NULL)) - return NULL; - - kernel_fd = open(filename, O_RDONLY); @@ -2117,7 +2117,7 @@ index 79f8464..0000000 - goto out_1; - } - -- if ((kernel_gfd = gzdopen(kernel_fd, "rb")) = NULL) { +- if ((kernel_gfd = gzdopen(kernel_fd, "rb")) == NULL) { - Hob_Output("Could not allocate decompression state for state file\n"); - goto out_1; - } @@ -2127,7 +2127,7 @@ index 79f8464..0000000 -#define CHUNK 1*1024*1024 - while(1) - { -- if ((tmp = realloc(image, *size + CHUNK)) = NULL) { +- if ((tmp = realloc(image, *size + CHUNK)) == NULL) { - Hob_Output("Could not allocate memory for kernel image"); - free(image); - image = NULL; @@ -2152,7 +2152,7 @@ index 79f8464..0000000 -#undef CHUNK - -out: -- if (*size = 0) { +- if (*size == 0) { - Hob_Output("Could not read kernel image"); - free(image); - image = NULL; @@ -2183,15 +2183,15 @@ index 79f8464..0000000 - if (strlen(nvram) > PATH_MAX) { - goto out; - } -- if (type = READ_FROM_NVRAM) { -- if (access(nvram, R_OK | W_OK | X_OK) = -1) +- if (type == READ_FROM_NVRAM) { +- if (access(nvram, R_OK | W_OK | X_OK) == -1) - goto out; - nvram_fd = open(nvram, O_RDONLY); - return nvram_fd; - } - else { /* write from gfw to nvram file */ - i = access(nvram, R_OK | W_OK | X_OK); -- if ((i = -1) && (errno != ENOENT)) +- if ((i == -1) && (errno != ENOENT)) - goto out; - nvram_fd = open(nvram, O_CREAT|O_RDWR, 0777); - return nvram_fd; @@ -2199,15 +2199,15 @@ index 79f8464..0000000 - } - else { - strcpy(nvram_path, "nvram.dat"); -- if (type = READ_FROM_NVRAM) { -- if (access(nvram_path, R_OK | W_OK | X_OK) = -1) +- if (type == READ_FROM_NVRAM) { +- if (access(nvram_path, R_OK | W_OK | X_OK) == -1) - goto out; - nvram_fd = open(nvram_path, O_RDONLY); - return nvram_fd; - } - else { /* write from gfw to nvram file */ - i = access(nvram_path, R_OK | W_OK | X_OK); -- if ((i = -1) && (errno != ENOENT)) +- if ((i == -1) && (errno != ENOENT)) - goto out; - nvram_fd = open(nvram_path, O_CREAT|O_RDWR, 0777); - return nvram_fd; @@ -2262,7 +2262,7 @@ index 79f8464..0000000 - cpu_physical_memory_read(nvram_addr_buf.addr, nvram_buf, NVRAM_SIZE); - - nvram_fd = kvm_ia64_nvram_init(type); -- if (nvram_fd = -1) +- if (nvram_fd == -1) - goto out; - - lseek(nvram_fd, 0, SEEK_SET); diff --git a/a/content_digest b/N1/content_digest index 5290c33..e285c6c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,12 @@ "From\0Jan Kiszka <jan.kiszka@siemens.com>\0" "Subject\0[PATCH] qemu-kvm: Remove broken ia64 fragments\0" - "Date\0Fri, 23 Sep 2011 15:19:53 +0000\0" - "To\0kvm-ia64@vger.kernel.org\0" + "Date\0Fri, 23 Sep 2011 17:19:53 +0200\0" + "To\0Avi Kivity <avi@redhat.com>" + " Marcelo Tosatti <mtosatti@redhat.com>\0" + "Cc\0kvm <kvm@vger.kernel.org>" + Jes Sorensen <Jes.Sorensen@redhat.com> + Alexander Graf <agraf@suse.de> + " kvm-ia64@vger.kernel.org <kvm-ia64@vger.kernel.org>\0" "\00:1\0" "b\0" "This target no longer builds since (at least) 0.14, and no one bothered\n" @@ -141,14 +146,14 @@ " esac\n" " \n" "@@ -3275,9 +3268,6 @@ case \"$target_arch2\" in\n" - " target_phys_bitsd\n" + " target_phys_bits=64\n" " target_long_alignment=8\n" " ;;\n" "- ia64)\n" - "- target_phys_bitsd\n" + "- target_phys_bits=64\n" "- ;;\n" " alpha)\n" - " target_phys_bitsd\n" + " target_phys_bits=64\n" " target_long_alignment=8\n" "diff --git a/cpu-exec.c b/cpu-exec.c\n" "index f224335..de0d716 100644\n" @@ -245,7 +250,7 @@ "- irq = ipf_map_irq(&dev->dev, irq);\n" "-#endif\n" "-\n" - " if (dev->girq = irq)\n" + " if (dev->girq == irq)\n" " return r;\n" " \n" "diff --git a/hw/ipf.c b/hw/ipf.c\n" @@ -489,7 +494,7 @@ "-\n" "- for (i = 0; i < nbds; i++) {\n" "- bds[i] = boot_device2nibble(boot_device[i]);\n" - "- if (bds[i] = 0) {\n" + "- if (bds[i] == 0) {\n" "- fprintf(stderr, \"Invalid boot device for PC: '%c'\\n\",\n" "- boot_device[i]);\n" "- exit(1);\n" @@ -546,7 +551,7 @@ "- <= heads <= 16, 1 <= cylinders <= 16383. The BIOS\n" "- geometry can be different if a translation is done. */\n" "- translation = bdrv_get_translation_hint(hd_table[i]);\n" - "- if (translation = BIOS_ATA_TRANSLATION_AUTO) {\n" + "- if (translation == BIOS_ATA_TRANSLATION_AUTO) {\n" "- bdrv_get_geometry_hint(hd_table[i], &cylinders,\n" "- &heads, §ors);\n" "- if (cylinders <= 1024 && heads <= 16 && sectors <= 63) {\n" @@ -622,7 +627,7 @@ "-{\n" "- static int nb_ne2k = 0;\n" "-\n" - "- if (nb_ne2k = NE2000_NB_MAX)\n" + "- if (nb_ne2k == NE2000_NB_MAX)\n" "- return;\n" "- isa_ne2000_init(ne2000_io[nb_ne2k], pic[ne2000_irq[nb_ne2k]], nd);\n" "- nb_ne2k++;\n" @@ -665,7 +670,7 @@ "- }\n" "-\n" "- /* init CPUs */\n" - "- if (cpu_model = NULL) {\n" + "- if (cpu_model == NULL) {\n" "- cpu_model = \"IA64\";\n" "- }\n" "-\n" @@ -717,7 +722,7 @@ "-\n" "- snprintf(buf, sizeof(buf), \"%s/%s\", bios_dir, FW_FILENAME);\n" "- image = read_image(buf, &image_size );\n" - "- if (NULL = image || !image_size) {\n" + "- if (NULL == image || !image_size) {\n" "- fprintf(stderr, \"Error when reading Guest Firmware!\\n\");\n" "- fprintf(stderr, \"Please check Guest firmware at %s\\n\", buf);\n" "- exit(1);\n" @@ -797,7 +802,7 @@ "- for(i = 0; i < nb_nics; i++) {\n" "- NICInfo *nd = &nd_table[i];\n" "-\n" - "- if (!pci_enabled || (nd->model && strcmp(nd->model, \"ne2k_isa\") = 0))\n" + "- if (!pci_enabled || (nd->model && strcmp(nd->model, \"ne2k_isa\") == 0))\n" "- pc_init_ne2k_isa(nd, i8259);\n" "- else\n" "- pci_nic_init(nd, \"e1000\", NULL);\n" @@ -950,7 +955,7 @@ "- ioapic_irq_count[vector] -= 1;\n" "-\n" "- if (kvm_enabled()) {\n" - "-\tif (kvm_set_irq(vector, ioapic_irq_count[vector] = 0, &pic_ret))\n" + "-\tif (kvm_set_irq(vector, ioapic_irq_count[vector] == 0, &pic_ret))\n" "- if (pic_ret != 0)\n" "- apic_set_irq_delivered();\n" "-\t return;\n" @@ -1679,7 +1684,7 @@ "- char *hob_buf;\n" "-\n" "- hob_buf = malloc(GFW_HOB_SIZE);\n" - "- if (hob_buf = NULL) {\n" + "- if (hob_buf == NULL) {\n" "- Hob_Output(\"Hob: Could not allocate hob\");\n" "- return -1;\n" "- }\n" @@ -2114,7 +2119,7 @@ "- uint8_t *image = NULL, *tmp;\n" "- unsigned int bytes;\n" "-\n" - "- if ((filename = NULL) || (size = NULL))\n" + "- if ((filename == NULL) || (size == NULL))\n" "- return NULL;\n" "-\n" "- kernel_fd = open(filename, O_RDONLY);\n" @@ -2123,7 +2128,7 @@ "- goto out_1;\n" "- }\n" "-\n" - "- if ((kernel_gfd = gzdopen(kernel_fd, \"rb\")) = NULL) {\n" + "- if ((kernel_gfd = gzdopen(kernel_fd, \"rb\")) == NULL) {\n" "- Hob_Output(\"Could not allocate decompression state for state file\\n\");\n" "- goto out_1;\n" "- }\n" @@ -2133,7 +2138,7 @@ "-#define CHUNK 1*1024*1024\n" "- while(1)\n" "- {\n" - "- if ((tmp = realloc(image, *size + CHUNK)) = NULL) {\n" + "- if ((tmp = realloc(image, *size + CHUNK)) == NULL) {\n" "- Hob_Output(\"Could not allocate memory for kernel image\");\n" "- free(image);\n" "- image = NULL;\n" @@ -2158,7 +2163,7 @@ "-#undef CHUNK\n" "-\n" "-out:\n" - "- if (*size = 0) {\n" + "- if (*size == 0) {\n" "- Hob_Output(\"Could not read kernel image\");\n" "- free(image);\n" "- image = NULL;\n" @@ -2189,15 +2194,15 @@ "- if (strlen(nvram) > PATH_MAX) {\n" "- goto out;\n" "- }\n" - "- if (type = READ_FROM_NVRAM) {\n" - "- if (access(nvram, R_OK | W_OK | X_OK) = -1)\n" + "- if (type == READ_FROM_NVRAM) {\n" + "- if (access(nvram, R_OK | W_OK | X_OK) == -1)\n" "- goto out;\n" "- nvram_fd = open(nvram, O_RDONLY);\n" "- return nvram_fd;\n" "- }\n" "- else { /* write from gfw to nvram file */\n" "- i = access(nvram, R_OK | W_OK | X_OK);\n" - "- if ((i = -1) && (errno != ENOENT))\n" + "- if ((i == -1) && (errno != ENOENT))\n" "- goto out;\n" "- nvram_fd = open(nvram, O_CREAT|O_RDWR, 0777);\n" "- return nvram_fd;\n" @@ -2205,15 +2210,15 @@ "- }\n" "- else {\n" "- strcpy(nvram_path, \"nvram.dat\");\n" - "- if (type = READ_FROM_NVRAM) {\n" - "- if (access(nvram_path, R_OK | W_OK | X_OK) = -1)\n" + "- if (type == READ_FROM_NVRAM) {\n" + "- if (access(nvram_path, R_OK | W_OK | X_OK) == -1)\n" "- goto out;\n" "- nvram_fd = open(nvram_path, O_RDONLY);\n" "- return nvram_fd;\n" "- }\n" "- else { /* write from gfw to nvram file */\n" "- i = access(nvram_path, R_OK | W_OK | X_OK);\n" - "- if ((i = -1) && (errno != ENOENT))\n" + "- if ((i == -1) && (errno != ENOENT))\n" "- goto out;\n" "- nvram_fd = open(nvram_path, O_CREAT|O_RDWR, 0777);\n" "- return nvram_fd;\n" @@ -2268,7 +2273,7 @@ "- cpu_physical_memory_read(nvram_addr_buf.addr, nvram_buf, NVRAM_SIZE);\n" "-\n" "- nvram_fd = kvm_ia64_nvram_init(type);\n" - "- if (nvram_fd = -1)\n" + "- if (nvram_fd == -1)\n" "- goto out;\n" "-\n" "- lseek(nvram_fd, 0, SEEK_SET);\n" @@ -2748,4 +2753,4 @@ "-- \n" 1.7.3.4 -d0162b656b1fa30b6754731f406ecdd2c41a2868ca7dfe54ecea7fcb6810ea68 +544f0a4f175d812bdf0ca3d95b27ec57132f97bcd0832d5d69ac3ca903a974f7
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.