From 437fd90c0250dee670290f9b714253671a990160 Mon Sep 17 00:00:00 2001 From: José Pekkarinen Date: Wed, 18 May 2016 13:18:31 +0300 Subject: These changes are the raw update to qemu-2.6. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Collission happened in the following patches: migration: do cleanup operation after completion(738df5b9) Bug fix.(1750c932f86) kvmclock: add a new function to update env->tsc.(b52baab2) The code provided by the patches was already in the upstreamed version. Change-Id: I3cc11841a6a76ae20887b2e245710199e1ea7f9a Signed-off-by: José Pekkarinen --- qemu/roms/openbios/drivers/ide.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qemu/roms/openbios/drivers/ide.h') diff --git a/qemu/roms/openbios/drivers/ide.h b/qemu/roms/openbios/drivers/ide.h index d6c4b9f5d..8983c8ecf 100644 --- a/qemu/roms/openbios/drivers/ide.h +++ b/qemu/roms/openbios/drivers/ide.h @@ -167,7 +167,7 @@ struct ide_drive { struct ide_channel { - char name[32]; + phandle_t ph; struct ide_channel *next; /* -- cgit 1.2.3-korg