From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:44970) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U20PS-0002Qc-TJ for qemu-devel@nongnu.org; Sun, 03 Feb 2013 09:19:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U20PR-0002fu-7E for qemu-devel@nongnu.org; Sun, 03 Feb 2013 09:19:06 -0500 Received: from e34.co.us.ibm.com ([32.97.110.152]:41314) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U20PQ-0002fm-V6 for qemu-devel@nongnu.org; Sun, 03 Feb 2013 09:19:05 -0500 Received: from /spool/local by e34.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sun, 3 Feb 2013 07:19:03 -0700 Received: from d03relay03.boulder.ibm.com (d03relay03.boulder.ibm.com [9.17.195.228]) by d03dlp03.boulder.ibm.com (Postfix) with ESMTP id A44D119D8042 for ; Sun, 3 Feb 2013 07:19:01 -0700 (MST) Received: from d03av05.boulder.ibm.com (d03av05.boulder.ibm.com [9.17.195.85]) by d03relay03.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r13EJ2dj236744 for ; Sun, 3 Feb 2013 07:19:02 -0700 Received: from d03av05.boulder.ibm.com (loopback [127.0.0.1]) by d03av05.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r13EJ16d020721 for ; Sun, 3 Feb 2013 07:19:02 -0700 From: Anthony Liguori In-Reply-To: <0F5F4857-BC11-44A9-9462-69829EF6F645@suse.de> References: <20130130102906.GA3184@lain> <4F4059A2-0C4A-4DDB-8EFB-CC63D89433F4@suse.de> <0F5F4857-BC11-44A9-9462-69829EF6F645@suse.de> Date: Sun, 03 Feb 2013 08:18:58 -0600 Message-ID: <87k3qpscod.fsf@codemonkey.ws> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [OpenBIOS] Fix double nvram entry on newworld List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alexander Graf , Blue Swirl Cc: The OpenBIOS Mailinglist , qemu-devel Alexander Graf writes: > Am 02.02.2013 um 14:05 schrieb Blue Swirl : > >> On Thu, Jan 31, 2013 at 3:10 PM, Alexander Graf wrote: >>>=20 >>> On 30.01.2013, at 11:29, Amadeusz S=C5=82awi=C5=84ski wrote: >>>=20 >>>> Fix double nvram entry on newworld >>>>=20 >>>> There are two nvram entries on newworld (for example qemu -M mac99) >>>>=20 >>>> The first one (nvram@fff04000) has initialized .properties while the >>>> other one has words. >>>>=20 >>>> 0 > dev / ls >>>> ... >>>> fff75e24 pci@f2000000 >>>> fff77848 nvram@fff04000 >>>> fff778e0 nvram >>>> ok >>>> 0 > dev /nvram@fff04000 ok >>>> 0 > words >>>> ok >>>> 0 > .properties >>>> name "nvram" >>>> #bytes 2000 >>>> reg fff04000 00004000 >>>> device_type "nvram" >>>> compatible "nvram,flash" >>>> ok >>>> 0 > dev /nvram@0 ok >>>> 0 > words close open seek write read size >>>> ok >>>> 0 > .properties >>>> name "nvram" >>>> ok >>>>=20 >>>> This patch fixes initialization, so only one node is created >>>> containing both .properties and words. >>>>=20 >>>> 0 > dev / ls >>>> ... >>>> fff75e24 pci@f2000000 >>>> fff77868 nvram@fff04000 >>>> ok >>>> 0 > dev /nvram@fff04000 ok >>>> 0 > words close open seek write read size >>>> ok >>>> 0 > .properties >>>> name "nvram" >>>> #bytes 2000 >>>> reg fff04000 00004000 >>>> device_type "nvram" >>>> compatible "nvram,flash" >>>> ok >>>>=20 >>>> Signed-off-by: Amadeusz S=C5=82awi=C5=84ski >>>=20 >>> Blue, once this patch is in the tree, do you think you could rebuild Op= enBIOS for QEMU, so that it will land in 1.4? >>=20 >> Sorry, it didn't happen before the freeze. I'm not sure if new >> OpenBIOS images qualifies as a bug fix. > > I would say yes ;). > > Anthony, any objections from your side? Nope. Regards, Anthony Liguori > > > Alex > >> Most of the changes since >> r1063 (now in QEMU) are bug fixes, though: >> a5af2b3 macio.c: Fix double nvram entry on newworld >> ff86ced SPARC32: WIM register update delay >> 8e9793b SPARC32: Clear FP register >> c23f9f7 esp.c: fix SCSI command code displayed in do_command() debug sta= tement. >> 39988d6 esp.c: fix TEST_UNIT_READY SCSI command length. >> 75e29de Revert configuration change from previous commit. >> d5df782 video.c: Fix compilation when CONFIG_DEBUG_CONSOLE_VIDEO is >> set to false. >> 91119ec video.c: Fix incorrect sized type in fill_rect(). >> 3caf41b mac-parts.c: Update bootpath to reflect the chosen partition >> if unspecified. >> ec237bb Switch partition argument parsing to use left-parse-string as >> per CHRP bindings. >> e4ada76 PPC: Mimic Apple's OpenFirmware behaviour if a divide by zero oc= curs. >> 7e64c09 mac-parts.c: Add Apple_Bootstrap to partition types considered >> for Mac boot. >> 5b48904 PPC: Fix filll word used by BootX >> 1711362 Ignore any attempts to emit a character to stdout when stdout >> is set to 0. >> 6294e00 adb_kbd.c: Implement dummy get-key-map word for the ADB >> keyboard package. >> 1484d2b PPC: Fix mapping of OpenBIOS ROM in RAM copy within OFMEM >> 69c27c4 PPC: Fix next slot eviction >> 1be3a15 video.c: Place framebuffer address in frame-buffer-adr >> e11cacd mac-parts.c: Fix detection of wrapped HFS+ volumes. >> 7694794 PPC: Implement filll (fill long) word for QEMU/PPC as required b= y BootX. >> 1fbbbd2 Redefine "to" word in device.fs to allow the current package >> to be set like a standard value. >> 1da510f Rework mac-parts.c to use CHRP-compliant partition search, >> followed by Apple OF partition search. >> b70a1f7 PPC: Rework assignment of keyboard devalias. >> dd37f6b Add a default "decode-unit" word for devices that don't >> implement their own. >> 7a370cc PPC: Add keyboard device alias as a duplicate of stdin. >> 58106df Fix dir cd:,\ (no partition specified) when reading from Mac par= titions. >> 5f23f2c Improve dir word by reducing complexity and adding some more >> diagnostics. >> a78e3b4 The spin word is set by BootX when Mac OS X is booting. >> 37d2f65 PPC32: Enable local variables for the PPC32 build. >> 538d404 Implementation of Forth local variables for OpenBIOS. >> 5bb1484 amd64: Fix compilation from last commit to implement "dir" >> word for HFS+ filesystem. >> 0495b71 Add initial implementation of "dir" word for HFS+ filesystems. >> 21ed61f Fix HFS+ display for non-ASCII characters. >> 5b22479 Fix bug related to opening backup volumes in libhfsp's volume_op= en(). >> f095c85 ppc qemu: Increase PCI hole for heathrow >>=20 >>>=20 >>>=20 >>> Thanks, >>>=20 >>> Alex >>>=20 >>>>=20 >>>> diff -uNr a/drivers/macio.c b/drivers/macio.c >>>> --- a/drivers/macio.c 2013-01-28 12:16:54.849868216 +0100 >>>> +++ b/drivers/macio.c 2013-01-28 12:17:27.595867493 +0100 >>>> @@ -57,12 +57,6 @@ >>>> } else { >>>> nvram_offset =3D NW_IO_NVRAM_OFFSET; >>>> nvram_size =3D NW_IO_NVRAM_SIZE; >>>> - push_str("/"); >>>> - fword("find-device"); >>>> - fword("new-device"); >>>> - push_str("nvram"); >>>> - fword("device-name"); >>>> - fword("finish-device"); >>>> } >>>> nvram =3D (char*)addr + nvram_offset; >>>> snprintf(buf, sizeof(buf), "%s/nvram", path); >>>>=20 >>>> -- >>>> OpenBIOS http://openbios.org/ >>>> Mailinglist: http://lists.openbios.org/mailman/listinfo >>>> Free your System - May the Forth be with you >>>=20