From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=44143 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q2Bki-0004Jp-QW for qemu-devel@nongnu.org; Tue, 22 Mar 2011 20:16:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q2BkT-0003dE-RN for qemu-devel@nongnu.org; Tue, 22 Mar 2011 20:16:44 -0400 Received: from e2.ny.us.ibm.com ([32.97.182.142]:36040) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q2BkT-0003d4-PC for qemu-devel@nongnu.org; Tue, 22 Mar 2011 20:16:29 -0400 Received: from d01dlp02.pok.ibm.com (d01dlp02.pok.ibm.com [9.56.224.85]) by e2.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id p2MNvlqC026758 for ; Tue, 22 Mar 2011 19:57:47 -0400 Received: from d01relay03.pok.ibm.com (d01relay03.pok.ibm.com [9.56.227.235]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id 62FE26E8039 for ; Tue, 22 Mar 2011 20:16:29 -0400 (EDT) Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by d01relay03.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p2N0GTU2325100 for ; Tue, 22 Mar 2011 20:16:29 -0400 Received: from d01av01.pok.ibm.com (loopback [127.0.0.1]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p2N0GThj008489 for ; Tue, 22 Mar 2011 20:16:29 -0400 From: Anthony Liguori Date: Tue, 22 Mar 2011 19:16:11 -0500 Message-Id: <1300839376-22520-7-git-send-email-aliguori@us.ibm.com> In-Reply-To: <1300839376-22520-1-git-send-email-aliguori@us.ibm.com> References: <1300839376-22520-1-git-send-email-aliguori@us.ibm.com> Subject: [Qemu-devel] [PATCH 06/11] fdc: fix migration of non-ISA fdc devices List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Jan Kiszka , Anthony Liguori , Juan Quintela Again, we are not using a unique name for non-ISA fdc devices and as a result, we may misinterpret an ISA fdc device as a non-ISA fdc device. In this case, both ISA fdc and non-ISA fdc are using too generic of a name. Since ISA fdc is more common, let it keep the old name. Signed-off-by: Anthony Liguori --- hw/fdc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/fdc.c b/hw/fdc.c index 4b02dce..9432d09 100644 --- a/hw/fdc.c +++ b/hw/fdc.c @@ -1947,7 +1947,7 @@ static void init_vmstate_description_0(void) vmstate_init(init_vmstate_description_0); static const VMStateDescription vmstate_sysbus_fdc ={ - .name = "fdc", + .name = "sysbus-fdc", .version_id = 2, .minimum_version_id = 2, .fields = (VMStateField []) { -- 1.7.0.4