{"id":2233278,"url":"http://patchwork.ozlabs.org/api/1.2/patches/2233278/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260506032643.2510575-2-jamin_lin@aspeedtech.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.2/projects/14/?format=json","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":"<20260506032643.2510575-2-jamin_lin@aspeedtech.com>","list_archive_url":null,"date":"2026-05-06T03:26:44","name":"[v1,1/2] hw/usb/hcd-ehci: Rename migration compatibility fetch address fields","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"1b1267d8f5a8d24995b91641b5f26a1038ad1624","submitter":{"id":81768,"url":"http://patchwork.ozlabs.org/api/1.2/people/81768/?format=json","name":"Jamin Lin","email":"jamin_lin@aspeedtech.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260506032643.2510575-2-jamin_lin@aspeedtech.com/mbox/","series":[{"id":502921,"url":"http://patchwork.ozlabs.org/api/1.2/series/502921/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=502921","date":"2026-05-06T03:26:45","name":"hw/usb/ehci: Improve migration helper and property naming","version":1,"mbox":"http://patchwork.ozlabs.org/series/502921/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2233278/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2233278/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=aspeedtech.com header.i=@aspeedtech.com\n header.a=rsa-sha256 header.s=selector1 header.b=CujhCG9H;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists1p.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)","dkim=none (message not signed)\n header.d=none;dmarc=none action=none header.from=aspeedtech.com;"],"Received":["from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g9LS73lnXz1yJx\n\tfor ; Wed, 06 May 2026 13:28:07 +1000 (AEST)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists1p.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1wKSua-0007oy-7I; Tue, 05 May 2026 23:27:00 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1wKSuY-0007oA-P5; Tue, 05 May 2026 23:26:58 -0400","from mail-japanwestazlp170120003.outbound.protection.outlook.com\n ([2a01:111:f403:c406::3] helo=OS8PR02CU002.outbound.protection.outlook.com)\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1wKSuX-00052y-5W; Tue, 05 May 2026 23:26:58 -0400","from TYPPR06MB8206.apcprd06.prod.outlook.com (2603:1096:405:383::19)\n by JH0PR06MB7325.apcprd06.prod.outlook.com (2603:1096:990:a1::12)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9891.15; Wed, 6 May\n 2026 03:26:45 +0000","from TYPPR06MB8206.apcprd06.prod.outlook.com\n ([fe80::e659:1ead:77cb:f6d3]) by TYPPR06MB8206.apcprd06.prod.outlook.com\n ([fe80::e659:1ead:77cb:f6d3%2]) with mapi id 15.20.9870.023; Wed, 6 May 2026\n 03:26:45 +0000"],"ARC-Seal":"i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none;\n b=L+9wuz9zq6/FvbU/RjmhjP486/jpDnT75k41H37OCeKl0y/t1WPB+g5yBK1HH0nf4B96GRhRGabX4cPQ+dgGfrb4d/sXhbr9nomftkbi3J9DL2ciYwh/dhJTRR0Tr6tep+7GfmzydsSMPvqSZGiIfsnN4yzC9IofiO8jOkDAT8sUDdY4FpSmmPu8FxjuOsLyJVAxv3SxUdJEBqS5jJ6RrFF5/AF5APfb/+08WxJQlDveyP2uY6C+198BimFb8S/Y3GW3aW0Q9SEudr5hinIeorGXrkvbreJBnjCbuHMa0Bd5Onz+CyHYfMPIXjpyBXPmmERucj18gOKS9K6CgGPRLA==","ARC-Message-Signature":"i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;\n s=arcselector10001;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1;\n bh=/0Z3fhDJh/SxiuCFbf2Spdj7BoLHYafuISJw2v/PxPI=;\n b=fLvGvFrJcACX+u97/Q6OrI0Lxx9Ip303Uy4XH9WAoKKCqOG155aomS/YGphHlEfDiTi51KsS14ZnTInZFKqJnELTXgf8NdSzjpOnTRfevIH/C7/xxicG5AVjS2gu3cUwy4PNpi+0qZGQNina1cYql28wb1GEwcztJTHgC+KgpSvSGs0tGkXmxqaVXlVo8aKP9ujZFSQxWXHwx540MmndYVmChnQmG2AxxcLEak2sIr4ekJSkwFMHcRxizsMDldIP9zgJS7kkLYdJIvH4ueWCMDTu2cSb2pidHhJifm+/tGuqTTXSmWI3gZj+doZuf4aPtJIGnLyI52PEGwPc801D0g==","ARC-Authentication-Results":"i=1; mx.microsoft.com 1; spf=pass\n smtp.mailfrom=aspeedtech.com; dmarc=pass action=none\n header.from=aspeedtech.com; dkim=pass header.d=aspeedtech.com; arc=none","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=aspeedtech.com;\n s=selector1;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=/0Z3fhDJh/SxiuCFbf2Spdj7BoLHYafuISJw2v/PxPI=;\n b=CujhCG9HgounMFYOppEixGvas+lnXaoopYp6MGkV+fCO+7/XRNAi1SqLUOiYCwYdV7lgNqBpZchIFKaCWA5QWKZ5iqoYUZRUwrL16gPI8WKfhkAKNnZ3tFo3meOQLtTsNRCunbRPGwywfFjUsZwvk1v2fPXqSXLwXoaosAs3lJTE3SKsSvw7bF91RB17nd5HSIEkA05d2Fr+LM9u1L+yZ4y5M6LnEC9X1Q/fEM1ElE2E1NP4tzT0vy5bJFQqsgXWhrPfBBsAFwp5e6hbqz7SXIVW2v05TKdYxN/qwTKilsJqH0h/6A+QzYQ+sUKntAi+3NyCXvSGhx4TA0yExo02PA==","From":"Jamin Lin ","To":"\"philmd@linaro.org\" ,\n \"peterx@redhat.com\" ,\n =?iso-8859-1?q?C=E9dric_Le_Goater?= ,\n Peter Maydell ,\n Steven Lee , Troy Lee ,\n Kane Chen ,\n Andrew Jeffery , Joel Stanley ,\n \"open list:ASPEED BMCs\" ,\n \"open list:All patches CC here\" ","CC":"Jamin Lin , Troy Lee ,\n \"farosas@suse.de\" , \"flwu@google.com\" ,\n \"nabihestefan@google.com\" ","Subject":"[PATCH v1 1/2] hw/usb/hcd-ehci: Rename migration compatibility fetch\n address fields","Thread-Topic":"[PATCH v1 1/2] hw/usb/hcd-ehci: Rename migration compatibility\n fetch address fields","Thread-Index":"AQHc3Qgqcy8dSi89vkGRdd4mbz53gQ==","Date":"Wed, 6 May 2026 03:26:44 +0000","Message-ID":"<20260506032643.2510575-2-jamin_lin@aspeedtech.com>","References":"<20260506032643.2510575-1-jamin_lin@aspeedtech.com>","In-Reply-To":"<20260506032643.2510575-1-jamin_lin@aspeedtech.com>","Accept-Language":"zh-TW, en-US","Content-Language":"en-US","X-MS-Has-Attach":"","X-MS-TNEF-Correlator":"","authentication-results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=aspeedtech.com header.i=@aspeedtech.com\n header.a=rsa-sha256 header.s=selector1 header.b=CujhCG9H;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists1p.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)","dkim=none (message not signed)\n header.d=none;dmarc=none action=none header.from=aspeedtech.com;"],"x-ms-publictraffictype":"Email","x-ms-traffictypediagnostic":"TYPPR06MB8206:EE_|JH0PR06MB7325:EE_","x-ms-office365-filtering-correlation-id":"f00a3af2-3724-453d-9577-08deab1f4c8b","x-ms-exchange-senderadcheck":"1","x-ms-exchange-antispam-relay":"0","x-microsoft-antispam":"BCL:0;\n ARA:13230040|1800799024|366016|7416014|376014|921020|38070700021|22082099003|56012099003|18002099003;","x-microsoft-antispam-message-info":"\n 2gej/5wjYxGyvHXI2G4d3DNr4Mk8JSxJ71GsXmsjDqOgD1Otj+ZokqDIP4oKvCVcQxJrEggLZIitpjKw3R6cCXhI6JdQyZgWEe7EWKnskFFzCYRLATXiL19i+F6aJEik15fTEMVpXKRjDSy8bMTsUwbH3e1I3TxLybGZrbMcYQqyUXn4+MU0V4koDol2JxWgDh35PBXKqKqTMAWh3LpK/TbBaOJTN9nPnXMjw8vLJU3ZXqyRCjGnrEYPv5CB3RhOR0SegyjhVgKKvASIH7rMnYex7XuuF0gr8s/6ZuCcHu65hKfOuFVfX2p7gTKgLaDdzATTS0RjdrNxyHsQPAbC/pr6Mq1WJr5sasnsQrV4YoVfqqeusxSIquYpQ+P2/bBKNmt0SPHIn73MtmiVE0LmNFgbXxK1R7VFIZP77T66YOhVZ6/RCVkRLumWBQVwJX1xX1kICoF6pZH9FG/ocIiHoKYkbUzRQfU6cw0TbC/vyGu6IBg21nL56oNZmaA0a5owe42oqsVZ2XOvU0BD83iPTG9vAlLYCXGmJMunqE3o3DME6/g2dXDrR/KolZMz16yqLx8FRSvxHEt6IrZzBtD0whyprOSPHjB3icEAh2IkghtqX5IAnYTw4Rvx+ujaH62zXRYSGMzO8SWnOHj5m7EG6c+b7C7Tcr5BPaDXn24oZDfyik1Emm1dSASEP88tM/gvzkAieDCibNw2azSdrx7zrJHLyiUGhAOPk+IlOgACTYuQaJ+KH3Tq3OrcEPBB+yFNnxvUzFE0dyaojmVKPbSQOg==","x-forefront-antispam-report":"CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:;\n IPV:NLI; SFV:NSPM; H:TYPPR06MB8206.apcprd06.prod.outlook.com; PTR:; CAT:NONE;\n SFS:(13230040)(1800799024)(366016)(7416014)(376014)(921020)(38070700021)(22082099003)(56012099003)(18002099003);\n DIR:OUT; SFP:1102;","x-ms-exchange-antispam-messagedata-chunkcount":"1","x-ms-exchange-antispam-messagedata-0":"=?iso-8859-1?q?i6e/1Z5n4NMylGfjeU5aYLc?=\n\t=?iso-8859-1?q?ATSSWMoAWkU1YLs/9I9loRbgZRCpFlM3FvmdcuuRMIzmi6Hf7DM1RKAzFlWq?=\n\t=?iso-8859-1?q?fJ3UEFBX/JbUvEQ5KtyjDOb8Duj1zbCRHKQOl2HLAKW/3OqTct7/BQcdIUhc?=\n\t=?iso-8859-1?q?Ew5gTLJvY2FT8DqMs6Ld44Mm9W8+F//cn3IE4C5IpGcPD2bKzQPhD+1nSCyC?=\n\t=?iso-8859-1?q?4bXDcaNTuBDbn48WnBsQ1XVBHZWMQoK9dFSbk+tZ0pR1Gc4qKQEgRjUTOTMP?=\n\t=?iso-8859-1?q?v6cWo0bqLb9TcUW5E6By+nWYRR9AlFj0DsQKRWyUrp5pXTEMmbFWAfVAZ9m6?=\n\t=?iso-8859-1?q?o78eRDp6DeXK3jCqv9V15wnNkmjQ5MvM3ERWovC4oxDl2cpcNUlrtm+CWia8?=\n\t=?iso-8859-1?q?VYEJNwD+3ZW9bUIj7qiVAEvPTkxNKGfVTCCIpbZpCGN+LcNpDwS6OLOGlXki?=\n\t=?iso-8859-1?q?zz+aUxFSimYMN2S4Nwq9Z6IZjblwBEn5rVe94Oveu0N8EcPd2hVsrxHU3jA6?=\n\t=?iso-8859-1?q?5rcUjkDAhlBUknRJjoFzXu6/ESul9GGhTHpZtQ26m+uPl68EJwAOFqYMe/gw?=\n\t=?iso-8859-1?q?9qZ++akGcX4d/RPZn0ZWEc7AdGl0ta7Gxvrub/BsySatIEZF+q6WIxbmm5xR?=\n\t=?iso-8859-1?q?txHLNZbVzPLJEhg2A4DF0rCjUZlzcOlvxe0LGED6sh8YHl/M51gfmL62k99s?=\n\t=?iso-8859-1?q?NWXg/4xCVK9pH0Lu7ZPPXYjC3hmBASkUivslfuiXQGPixSViSQAmAgNxpV9d?=\n\t=?iso-8859-1?q?c5bE4NCq/B7OAwOMB18qE5Zm/kac3K44ywQb9qwcnq/uYwbSLvbmsCZuTSKk?=\n\t=?iso-8859-1?q?hXb//HcvdxsOqB6p2mGkHCfHfO5YwMQfff2hineMhTbWG/Tf3GK7eoh7iKkC?=\n\t=?iso-8859-1?q?P8hf3GrthwfMTg8N37qGA7ncSLotw5yvpngxKZgBobzFlW1xWQYT241a80nu?=\n\t=?iso-8859-1?q?2beSTl5bUcDDnL/PIJAjWxWAFJHuGTfRU5U0Hc+1xQ5ExqmeHAMAfJLYEqjG?=\n\t=?iso-8859-1?q?R4AsIZ/95UJ2A3Mb6St1bqZTKVTLn2k0ionCByMK1FM7/I2fskpbPTGYqTMG?=\n\t=?iso-8859-1?q?QRe4oWtneD/oHeQq5USP+huyvrEbWWrC3HaZImEw8zon9ddwCmOGefEx2VnW?=\n\t=?iso-8859-1?q?/ARl6c0toVUZFsqrrUNHU0EN+Nl8j6zHkF8+SDhIgEbhJ6tK/m4GcGMIpMJ/?=\n\t=?iso-8859-1?q?C87et0y/+Oci8D0QiG/gAfmb+KVuEkuaKjkv/uwewArn6RkOjHwyNVtbgAOD?=\n\t=?iso-8859-1?q?06tZgh/Puw7UR59p8zpdRQ1aOZ67E+88t8P8GR5yGy9w2+vmdKfgggXTP8oQ?=\n\t=?iso-8859-1?q?PQ6ituOi2yT8ye74Nd2WaNGL3YG1xbuhKT2RrgMA39Utr/H6lB7Kv/5B1uZH?=\n\t=?iso-8859-1?q?3q/i+5j/x2dwRQ4MlQMKTaeajUBOxlC0Ecik+tRMPLQLjbmfaEOTg0fW5QOm?=\n\t=?iso-8859-1?q?n3zHogemsTfRT+BKg5D7XNb+aEGP0V7bgL3qUc61p896BJbEsjHI8uzmR6Io?=\n\t=?iso-8859-1?q?peJN+muo5R0uVfGQ7o44sCzTrZmI9PUk1kchoOVGDYRrCT4CZjTvxiSfWXGD?=\n\t=?iso-8859-1?q?0+p//5RlILPMg1Zndzj04T3QSLEcIb1OvPrzwWKmm/YXKMgLZ5HKggffJsy4?=\n\t=?iso-8859-1?q?CLpIMHDAYjfVGqOo0IOJ+CW7y2tFZdyytK7pOI1p4/JDjYa3btOwmShBsBXT?=\n\t=?iso-8859-1?q?Vrku1hR6IQdLm5HQ2VIcEe9itlPLLWJXsGqiGRcNPSTzV5rkVfUWAWDi6XrI?=\n\t=?iso-8859-1?q?QivmR8NWQZZc3pYMcqWCFwaR9rdPRDpFXhZDsxxTsWe31Pw=3D=3D?=","Content-Type":"text/plain; charset=\"iso-8859-1\"","Content-Transfer-Encoding":"quoted-printable","MIME-Version":"1.0","X-Exchange-RoutingPolicyChecked":"\n QMrSbmy9e5AG6o8nW3PdxI1VZk66afdMDJQ0GLDzim4b2D4x7s1kdwegRKApKLCSLigidDyf7nwYCz6KhCG4QJZv56qyUdtdyWjjTZVf7MaWs/EiQV9zcRR+G0EbLQLPT+8vv5lgJk6mzabYlqXgAwGGsqNFckg7MnZu78AHKpfBdg3otKo5YuG+iufYPS48D+h3rPHDQs+EITRcgjvdwEXBhBkVtb9xIUag5Y2yTHfLoZ1IMkO5YJXDo3JD824+PlEU/nsabvCQm1/Kkz+P2CPRE8xnx/2Ddi5bAxdouPQCKTN1HCyXTiF+pYSmxcc0sRJAx8d2GoKlf4EYtSuN6Q==","X-OriginatorOrg":"aspeedtech.com","X-MS-Exchange-CrossTenant-AuthAs":"Internal","X-MS-Exchange-CrossTenant-AuthSource":"TYPPR06MB8206.apcprd06.prod.outlook.com","X-MS-Exchange-CrossTenant-Network-Message-Id":"\n f00a3af2-3724-453d-9577-08deab1f4c8b","X-MS-Exchange-CrossTenant-originalarrivaltime":"06 May 2026 03:26:44.9258 (UTC)","X-MS-Exchange-CrossTenant-fromentityheader":"Hosted","X-MS-Exchange-CrossTenant-id":"43d4aa98-e35b-4575-8939-080e90d5a249","X-MS-Exchange-CrossTenant-mailboxtype":"HOSTED","X-MS-Exchange-CrossTenant-userprincipalname":"\n mJTYtT2Njzxpyb43fTczh7zmUt/hr09vy0vKxSDhxrsdUNwcqdGlcJJ3S+EOT4Bvw/L366SyH06uio5mmH8OB7CvEku6zLQ9zreBGcvSbOA=","X-MS-Exchange-Transport-CrossTenantHeadersStamped":"JH0PR06MB7325","Received-SPF":"pass client-ip=2a01:111:f403:c406::3;\n envelope-from=jamin_lin@aspeedtech.com;\n helo=OS8PR02CU002.outbound.protection.outlook.com","X-Spam_score_int":"-20","X-Spam_score":"-2.1","X-Spam_bar":"--","X-Spam_report":"(-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001,\n SPF_PASS=-0.001 autolearn=ham autolearn_force=no","X-Spam_action":"no action","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"qemu development ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"Rename the 32-bit fetch address migration helper fields to make\ntheir purpose clearer.\n\nThese fields are only used for migration compatibility with older\nmachine types that transfer 32-bit fetch addresses in the migration\nstream. They are not runtime fetch address state.\n\nAlso add comments to clarify the relationship between the migration\ncompatibility fields and the runtime 64-bit fetch address fields.\n\nNo functional change.\n\nSigned-off-by: Jamin Lin \n---\n hw/usb/hcd-ehci.h | 17 ++++++++++++++---\n hw/usb/hcd-ehci.c | 12 ++++++------\n 2 files changed, 20 insertions(+), 9 deletions(-)","diff":"diff --git a/hw/usb/hcd-ehci.h b/hw/usb/hcd-ehci.h\nindex 3d57e1de5f..b5ac9c8670 100644\n--- a/hw/usb/hcd-ehci.h\n+++ b/hw/usb/hcd-ehci.h\n@@ -262,6 +262,10 @@ struct EHCIState {\n \n /* properties */\n uint32_t maxframes;\n+ /*\n+ * Controls migration stream compatibility for old machine types.\n+ * Old machine types only transfer 32-bit fetch addresses.\n+ */\n bool migrate_fetch_addr_64bit;\n bool caps_64bit_addr;\n uint32_t ctrldssegment_default;\n@@ -302,9 +306,16 @@ struct EHCIState {\n EHCIQueueHead aqueues;\n EHCIQueueHead pqueues;\n \n- /* which address to look at next */\n- uint32_t a_fetch_addr_32;\n- uint32_t p_fetch_addr_32;\n+ /*\n+ * which address to look at next\n+ *\n+ * Migration compatibility fields for old machine types that only\n+ * support 32-bit fetch addresses in the migration stream.\n+ *\n+ * New machine types migrate the full 64-bit runtime fetch address.\n+ */\n+ uint32_t migrate_a_fetch_addr;\n+ uint32_t migrate_p_fetch_addr;\n uint64_t a_fetch_addr;\n uint64_t p_fetch_addr;\n \ndiff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c\nindex 62c3770ac5..56ac8f6ae5 100644\n--- a/hw/usb/hcd-ehci.c\n+++ b/hw/usb/hcd-ehci.c\n@@ -2482,8 +2482,8 @@ static int usb_ehci_pre_save(void *opaque)\n ehci->frindex = new_frindex;\n \n if (!ehci->migrate_fetch_addr_64bit) {\n- ehci->a_fetch_addr_32 = ehci->a_fetch_addr;\n- ehci->p_fetch_addr_32 = ehci->p_fetch_addr;\n+ ehci->migrate_a_fetch_addr = ehci->a_fetch_addr;\n+ ehci->migrate_p_fetch_addr = ehci->p_fetch_addr;\n }\n \n return 0;\n@@ -2507,8 +2507,8 @@ static int usb_ehci_post_load(void *opaque, int version_id)\n }\n \n if (!s->migrate_fetch_addr_64bit) {\n- s->a_fetch_addr = s->a_fetch_addr_32;\n- s->p_fetch_addr = s->p_fetch_addr_32;\n+ s->a_fetch_addr = s->migrate_a_fetch_addr;\n+ s->p_fetch_addr = s->migrate_p_fetch_addr;\n }\n \n return 0;\n@@ -2571,9 +2571,9 @@ const VMStateDescription vmstate_ehci = {\n /* schedule state */\n VMSTATE_UINT32(astate, EHCIState),\n VMSTATE_UINT32(pstate, EHCIState),\n- VMSTATE_UINT32_TEST(a_fetch_addr_32, EHCIState,\n+ VMSTATE_UINT32_TEST(migrate_a_fetch_addr, EHCIState,\n ehci_fetch_addr_32_needed),\n- VMSTATE_UINT32_TEST(p_fetch_addr_32, EHCIState,\n+ VMSTATE_UINT32_TEST(migrate_p_fetch_addr, EHCIState,\n ehci_fetch_addr_32_needed),\n VMSTATE_UINT64_TEST(a_fetch_addr, EHCIState,\n ehci_fetch_addr_64_needed),\n","prefixes":["v1","1/2"]}