From patchwork Mon Feb 11 16:13:23 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hahn X-Patchwork-Id: 219737 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id DB4DA2C0324 for ; Tue, 12 Feb 2013 18:42:55 +1100 (EST) Received: from localhost ([::1]:46235 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U5AVy-00062m-0A for incoming@patchwork.ozlabs.org; Tue, 12 Feb 2013 02:42:54 -0500 Received: from eggs.gnu.org ([208.118.235.92]:57743) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U5AVp-00062b-7o for qemu-devel@nongnu.org; Tue, 12 Feb 2013 02:42:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U5AVn-0000M8-Q7 for qemu-devel@nongnu.org; Tue, 12 Feb 2013 02:42:45 -0500 Received: from mail.univention.de ([82.198.197.8]:1797) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U5AVn-0000Le-2j for qemu-devel@nongnu.org; Tue, 12 Feb 2013 02:42:43 -0500 Received: from localhost (localhost [127.0.0.1]) by slugis.knut.univention.de (Postfix) with ESMTP id D44D115099C1 for ; Tue, 12 Feb 2013 08:42:39 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by slugis.knut.univention.de (Postfix) with ESMTP id CA9F4180398B for ; Tue, 12 Feb 2013 08:42:39 +0100 (CET) X-Virus-Scanned: by amavisd-new-2.6.1 (20080629) (Debian) at knut.univention.de Received: from mail.univention.de ([127.0.0.1]) by localhost (slugis.knut.univention.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id aWEMt-j1mCrY for ; Tue, 12 Feb 2013 08:42:39 +0100 (CET) Received: from stave.localnet (stave.knut.univention.de [192.168.0.191]) by slugis.knut.univention.de (Postfix) with ESMTPSA id 6AF8115099C1 for ; Tue, 12 Feb 2013 08:42:39 +0100 (CET) From: Philipp Hahn Organization: Univention.de To: qemu-devel@nongnu.org Date: Mon, 11 Feb 2013 17:13:23 +0100 User-Agent: KMail/1.13.7 (Linux/3.2.0-4-amd64; KDE/4.8.4; x86_64; ; ) References: <1360111706-13138-1-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1360111706-13138-1-git-send-email-mdroth@linux.vnet.ibm.com> MIME-Version: 1.0 Message-Id: <201302111713.23490.hahn@univention.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 82.198.197.8 Subject: Re: [Qemu-devel] [PATCH for-1.4 0/2] fix migration failure from 1.3 due to SeaBIOS size change X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Hello, On Wednesday 06 February 2013 01:48:24 Michael Roth wrote: > Migration from 1.3 currently fails due to a mismatch between the expected > size of 256KB and the received size of 128KB for seabios. ... > 2) We can begin checking in past versions of SeaBIOS and other roms and > loading those according to selected machine type. This would be similar to > be how we've dealt with similar issues regarding the default vram size > changing for VGA, but might not scale well with ISPs. We currenty are carrying the attached patch with our Debian based distribution, which fixes a very similar issue with the PXE-BIOSs, because Debian provides it's own compilation of etherboot and iPXE. As each upgrade threatens to break all your previous snapshots, would it help to include the BIOSs within the saved state instead of letting qemu pickup the current external file? Sincerely Philipp diff -urN qemu-kvm-1.1.2+dfsg.orig/debian/patches/romfile-compatibility.diff qemu-kvm-1.1.2+dfsg/debian/patches/romfile-compatibility.diff --- qemu-kvm-1.1.2+dfsg.orig/debian/patches/romfile-compatibility.diff 1970-01-01 01:00:00.000000000 +0100 +++ qemu-kvm-1.1.2+dfsg/debian/patches/romfile-compatibility.diff 2012-10-08 14:25:09.225656404 +0200 @@ -0,0 +1,39 @@ +Bug #24702: Fix PXE ROM size mismatch + +For pc-0.14 and older use the PXE ROMs from the deprecated etherboot-qemu +package, which have different sizes. Without the patch the virtual PC gets +build with the current ROM sizes. Loading then fails because the stored PCI ROM +BAR size mismatches the configured size. +--- a/hw/pc_piix.c ++++ b/hw/pc_piix.c +@@ -433,6 +433,30 @@ static QEMUMachine pc_machine_v0_15 = { + .driver = "virtio-balloon-pci",\ + .property = "event_idx",\ + .value = "off",\ ++ },{\ ++ .driver = "ne2000",\ ++ .property = "romfile",\ ++ .value = "/usr/lib/etherboot/rtl8029.rom",\ ++ },{\ ++ .driver = "rtl8139",\ ++ .property = "romfile",\ ++ .value = "/usr/lib/etherboot/rtl8139.rom",\ ++ },{\ ++ .driver = "e1000",\ ++ .property = "romfile",\ ++ .value = "/usr/lib/etherboot/e1000-82540em.rom",\ ++ },{\ ++ .driver = "pcnet",\ ++ .property = "romfile",\ ++ .value = "/usr/lib/etherboot/pcnet32.rom",\ ++ },{\ ++ .driver = "ne2k-isa",\ ++ .property = "romfile",\ ++ .value = "/usr/lib/etherboot/ne.rom",\ ++ },{\ ++ .driver = "virtio-net-pci",\ ++ .property = "romfile",\ ++ .value = "/usr/lib/etherboot/virtio-net.rom",\ + } + + static QEMUMachine pc_machine_v0_14 = { diff -urN qemu-kvm-1.1.2+dfsg.orig/debian/patches/series qemu-kvm-1.1.2+dfsg/debian/patches/series --- qemu-kvm-1.1.2+dfsg.orig/debian/patches/series 2012-09-10 12:14:05.000000000 +0200 +++ qemu-kvm-1.1.2+dfsg/debian/patches/series 2012-10-08 14:24:51.497155189 +0200 @@ -8,3 +8,4 @@ net-add--netdev-options-to-man-page.patch revert-serial-fix-retry-logic.patch +romfile-compatibility.diff diff -urN qemu-kvm-1.1.2+dfsg.orig/debian/control qemu-kvm-1.1.2+dfsg/debian/control --- qemu-kvm-1.1.2+dfsg.orig/debian/control 2012-09-11 08:29:43.000000000 +0200 +++ qemu-kvm-1.1.2+dfsg/debian/control 2012-10-08 15:06:39.201155102 +0200 @@ -37,7 +37,8 @@ seabios (>> 1.7.0~), vgabios (>= 0.6c-3~), qemu-keymaps, qemu-utils (>> 0.14.0), ipxe-qemu | ipxe (<< 1.0.0+git-20120202.f6840ba-2) -Recommends: bridge-utils, iproute +Recommends: bridge-utils, iproute, + etherboot-qemu Suggests: debootstrap, vde2, samba Provides: kvm Conflicts: kvm-source (<= 18-1), kvm-data (<= 66+dfsg-1.1), kvm (<< 1:0)