Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/806868/?format=api
{ "id": 806868, "url": "http://patchwork.ozlabs.org/api/patches/806868/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/1503965694-10794-68-git-send-email-mdroth@linux.vnet.ibm.com/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "name": "QEMU Development", "link_name": "qemu-devel", "list_id": "qemu-devel.nongnu.org", "list_email": "qemu-devel@nongnu.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<1503965694-10794-68-git-send-email-mdroth@linux.vnet.ibm.com>", "list_archive_url": null, "date": "2017-08-29T00:14:42", "name": "[67/79] spapr: fix migration to pseries machine < 2.8", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "9bbb0c47105f61b73c2a7e98352354f7af25b04d", "submitter": { "id": 5549, "url": "http://patchwork.ozlabs.org/api/people/5549/?format=api", "name": "Michael Roth", "email": "mdroth@linux.vnet.ibm.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/1503965694-10794-68-git-send-email-mdroth@linux.vnet.ibm.com/mbox/", "series": [ { "id": 281, "url": "http://patchwork.ozlabs.org/api/series/281/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=281", "date": "2017-08-29T00:13:45", "name": "Patch Round-up for stable 2.9.1, freeze on 2017-09-04", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/281/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/806868/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/806868/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@bilbo.ozlabs.org", "Authentication-Results": "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=<UNKNOWN>)", "Received": [ "from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xh9Hl4Kyjz9s7g\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 29 Aug 2017 10:58:43 +1000 (AEST)", "from localhost ([::1]:42120 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1dmUrZ-0005Ig-GO\n\tfor incoming@patchwork.ozlabs.org; Mon, 28 Aug 2017 20:58:41 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:48862)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <mdroth@linux.vnet.ibm.com>) id 1dmUCq-0001jz-Fy\n\tfor qemu-devel@nongnu.org; Mon, 28 Aug 2017 20:16:39 -0400", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <mdroth@linux.vnet.ibm.com>) id 1dmUCn-000698-AY\n\tfor qemu-devel@nongnu.org; Mon, 28 Aug 2017 20:16:36 -0400", "from mx0b-001b2d01.pphosted.com ([148.163.158.5]:35200\n\thelo=mx0a-001b2d01.pphosted.com)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <mdroth@linux.vnet.ibm.com>)\n\tid 1dmUCn-00067v-64\n\tfor qemu-devel@nongnu.org; Mon, 28 Aug 2017 20:16:33 -0400", "from pps.filterd (m0098413.ppops.net [127.0.0.1])\n\tby mx0b-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id\n\tv7T0E8CG017802\n\tfor <qemu-devel@nongnu.org>; Mon, 28 Aug 2017 20:16:32 -0400", "from e36.co.us.ibm.com (e36.co.us.ibm.com [32.97.110.154])\n\tby mx0b-001b2d01.pphosted.com with ESMTP id 2cmub2ww9f-1\n\t(version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT)\n\tfor <qemu-devel@nongnu.org>; Mon, 28 Aug 2017 20:16:32 -0400", "from localhost\n\tby e36.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use\n\tOnly! Violators will be prosecuted\n\tfor <qemu-devel@nongnu.org> from <mdroth@linux.vnet.ibm.com>;\n\tMon, 28 Aug 2017 18:16:31 -0600", "from b03cxnp07029.gho.boulder.ibm.com (9.17.130.16)\n\tby e36.co.us.ibm.com (192.168.1.136) with IBM ESMTP SMTP Gateway:\n\tAuthorized Use Only! Violators will be prosecuted; \n\tMon, 28 Aug 2017 18:16:29 -0600", "from b03ledav004.gho.boulder.ibm.com\n\t(b03ledav004.gho.boulder.ibm.com [9.17.130.235])\n\tby b03cxnp07029.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with\n\tESMTP id v7T0GTwk8323330; Mon, 28 Aug 2017 17:16:29 -0700", "from b03ledav004.gho.boulder.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id 217C67803F;\n\tMon, 28 Aug 2017 18:16:29 -0600 (MDT)", "from localhost (unknown [9.80.85.217])\n\tby b03ledav004.gho.boulder.ibm.com (Postfix) with ESMTP id E530C78037;\n\tMon, 28 Aug 2017 18:16:28 -0600 (MDT)" ], "From": "Michael Roth <mdroth@linux.vnet.ibm.com>", "To": "qemu-devel@nongnu.org", "Date": "Mon, 28 Aug 2017 19:14:42 -0500", "X-Mailer": "git-send-email 2.7.4", "In-Reply-To": "<1503965694-10794-1-git-send-email-mdroth@linux.vnet.ibm.com>", "References": "<1503965694-10794-1-git-send-email-mdroth@linux.vnet.ibm.com>", "X-TM-AS-GCONF": "00", "x-cbid": "17082900-0020-0000-0000-00000CA0E9E3", "X-IBM-SpamModules-Scores": "", "X-IBM-SpamModules-Versions": "BY=3.00007630; HX=3.00000241; KW=3.00000007;\n\tPH=3.00000004; SC=3.00000226; SDB=6.00909028; UDB=6.00455849;\n\tIPR=6.00689279; \n\tBA=6.00005557; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009;\n\tZB=6.00000000; \n\tZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00016909;\n\tXFM=3.00000015; UTC=2017-08-29 00:16:31", "X-IBM-AV-DETECTION": "SAVI=unused REMOTE=unused XFE=unused", "x-cbparentid": "17082900-0021-0000-0000-00005DE891EC", "Message-Id": "<1503965694-10794-68-git-send-email-mdroth@linux.vnet.ibm.com>", "X-Proofpoint-Virus-Version": "vendor=fsecure engine=2.50.10432:, ,\n\tdefinitions=2017-08-28_13:, , signatures=0", "X-Proofpoint-Spam-Details": "rule=outbound_notspam policy=outbound score=0\n\tspamscore=0 suspectscore=3\n\tmalwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam\n\tadjust=0 reason=mlx scancount=1 engine=8.0.1-1707230000\n\tdefinitions=main-1708290001", "X-detected-operating-system": "by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy]", "X-Received-From": "148.163.158.5", "Subject": "[Qemu-devel] [PATCH 67/79] spapr: fix migration to pseries machine\n\t< 2.8", "X-BeenThere": "qemu-devel@nongnu.org", "X-Mailman-Version": "2.1.21", "Precedence": "list", "List-Id": "<qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<http://lists.nongnu.org/archive/html/qemu-devel/>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Cc": "Laurent Vivier <lvivier@redhat.com>, qemu-stable@nongnu.org,\n\tDavid Gibson <david@gibson.dropbear.id.au>", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>" }, "content": "From: Laurent Vivier <lvivier@redhat.com>\n\nsince commit 5c4537bd (\"spapr: Fix 2.7<->2.8 migration of PCI host bridge\"),\nsome migration fields are forged from the new ones in spapr_pci_pre_save().\n\nIt works well, except when the number of MSI devices is 0,\nbecause in this case the function exits immediately.\n\nThis fix moves the migration code before the exit code.\n\nThe problem can be reproduced with these commands:\n\nsource qemu-2.9:\n\n qemu-system-ppc64 -monitor stdio -M pseries-2.6 -nodefaults -S\n\ndestination qemu-2.6:\n\n qemu-system-ppc64 -monitor stdio -M pseries-2.6 -nodefaults \\\n -incoming tcp:0:4444\n\non the source:\n\n migrate tcp:localhost:4444\n\nDestination fails with the following error:\n\n qemu-system-ppc64: error while loading state for\n instance 0x0 of device 'spapr_pci'\n qemu-system-ppc64: load of migration failed: Invalid argument\n\nSigned-off-by: Laurent Vivier <lvivier@redhat.com>\nReviewed-by: Greg Kurz <groug@kaod.org>\nSigned-off-by: David Gibson <david@gibson.dropbear.id.au>\n(cherry picked from commit e806b4db1477a1c6bfda7bba28c7f26c47f18e1e)\nSigned-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>\n---\n hw/ppc/spapr_pci.c | 28 ++++++++++++++--------------\n 1 file changed, 14 insertions(+), 14 deletions(-)", "diff": "diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c\nindex 98c52e4..ecfbf01 100644\n--- a/hw/ppc/spapr_pci.c\n+++ b/hw/ppc/spapr_pci.c\n@@ -1893,20 +1893,6 @@ static void spapr_pci_pre_save(void *opaque)\n gpointer key, value;\n int i;\n \n- g_free(sphb->msi_devs);\n- sphb->msi_devs = NULL;\n- sphb->msi_devs_num = g_hash_table_size(sphb->msi);\n- if (!sphb->msi_devs_num) {\n- return;\n- }\n- sphb->msi_devs = g_malloc(sphb->msi_devs_num * sizeof(spapr_pci_msi_mig));\n-\n- g_hash_table_iter_init(&iter, sphb->msi);\n- for (i = 0; g_hash_table_iter_next(&iter, &key, &value); ++i) {\n- sphb->msi_devs[i].key = *(uint32_t *) key;\n- sphb->msi_devs[i].value = *(spapr_pci_msi *) value;\n- }\n-\n if (sphb->pre_2_8_migration) {\n sphb->mig_liobn = sphb->dma_liobn[0];\n sphb->mig_mem_win_addr = sphb->mem_win_addr;\n@@ -1920,6 +1906,20 @@ static void spapr_pci_pre_save(void *opaque)\n sphb->mig_mem_win_size += sphb->mem64_win_size;\n }\n }\n+\n+ g_free(sphb->msi_devs);\n+ sphb->msi_devs = NULL;\n+ sphb->msi_devs_num = g_hash_table_size(sphb->msi);\n+ if (!sphb->msi_devs_num) {\n+ return;\n+ }\n+ sphb->msi_devs = g_malloc(sphb->msi_devs_num * sizeof(spapr_pci_msi_mig));\n+\n+ g_hash_table_iter_init(&iter, sphb->msi);\n+ for (i = 0; g_hash_table_iter_next(&iter, &key, &value); ++i) {\n+ sphb->msi_devs[i].key = *(uint32_t *) key;\n+ sphb->msi_devs[i].value = *(spapr_pci_msi *) value;\n+ }\n }\n \n static int spapr_pci_post_load(void *opaque, int version_id)\n", "prefixes": [ "67/79" ] }