From patchwork Thu Dec 15 21:02:28 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jordan Justen X-Patchwork-Id: 131734 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1121BB70B7 for ; Fri, 16 Dec 2011 08:02:50 +1100 (EST) Received: from localhost ([::1]:55306 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RbIRs-0005zw-6R for incoming@patchwork.ozlabs.org; Thu, 15 Dec 2011 16:02:40 -0500 Received: from eggs.gnu.org ([140.186.70.92]:33402) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RbIRk-0005zm-0s for qemu-devel@nongnu.org; Thu, 15 Dec 2011 16:02:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RbIRi-0002Hf-BU for qemu-devel@nongnu.org; Thu, 15 Dec 2011 16:02:31 -0500 Received: from mail-yx0-f173.google.com ([209.85.213.173]:63194) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RbIRi-0002HE-5s for qemu-devel@nongnu.org; Thu, 15 Dec 2011 16:02:30 -0500 Received: by yenm6 with SMTP id m6so2048104yen.4 for ; Thu, 15 Dec 2011 13:02:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type; bh=efxF59nZDGm07Or1iXbs+YM8TqLdP2eRnWyR1JeMVa0=; b=SPtvPdMMDWbf/UUm6Pvj4gHWS2mS2pnNYxSfLRxrfEti3G0hKDKzZNtmjDpTPIMSE4 Xg9KXn3vo2jBLYaeVvGL27W8hrW2Must9+AZCjqC55IsPekug5hX0LnDIc61rgbOCKDn 1OYjyJLwHMSwmkDvbq0ykb2GudHcy8aEJYM1U= MIME-Version: 1.0 Received: by 10.236.173.202 with SMTP id v50mr7171677yhl.102.1323982948881; Thu, 15 Dec 2011 13:02:28 -0800 (PST) Received: by 10.147.35.13 with HTTP; Thu, 15 Dec 2011 13:02:28 -0800 (PST) In-Reply-To: <1323982273-13623-1-git-send-email-jordan.l.justen@intel.com> References: <1323982273-13623-1-git-send-email-jordan.l.justen@intel.com> Date: Thu, 15 Dec 2011 13:02:28 -0800 Message-ID: From: Jordan Justen To: qemu-devel , Avi Kivity X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.213.173 Subject: Re: [Qemu-devel] [PATCH v9 0/3] PC system flash support 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 I verified that 'info mtree' and 'info qdev' are equivalent for pc-1.0 when using master and with my patches. However, I did discover that v1.0 seems to differ from master for this same test. I've attached the logs. 00000000fee00000-00000000feefffff (prio 0): apic 4000000000000000-7fffffffffffffff (prio 0): alias pci-hole64 @pci 4000000000000000-7fffffffffffffff pc.ram @@ -56,6 +58,7 @@ 00000000000003f8-00000000000003ff (prio 0): serial 00000000000004d0-00000000000004d0 (prio 0): elcr 00000000000004d1-00000000000004d1 (prio 0): elcr + 0000000000000510-0000000000000511 (prio 0): fwcfg 0000000000000cf8-0000000000000cfb (prio 0): pci-conf-idx 0000000000000cfc-0000000000000cff (prio 0): pci-conf-data 0000000000005658-0000000000005658 (prio 0): vmport @@ -126,7 +129,7 @@ dev-prop: opt_io_size = 0 dev-prop: bootindex = -1 dev-prop: discard_granularity = 0 - dev-prop: ver = "1.0" + dev-prop: ver = "1.0.50" dev-prop: serial = "QM00003" bus-prop: unit = 0 bus: ide.0 @@ -218,7 +221,7 @@ dev-prop: data_iobase = 0x511 irq 0 mmio ffffffffffffffff/0000000000000002 - mmio ffffffffffffffff/0000000000000002 + mmio ffffffffffffffff/0000000000000001 dev: apic, id "" dev-prop: id = 0 irq 0 Thanks, -Jordan On Thu, Dec 15, 2011 at 12:51, Jordan Justen wrote: > Enable flash emulation in a PC system using pflash_cfi01. > > v9: > * Add pc-1.1 > * pc-1.0 uses previous rom firmware init code path > > v8: > * Cleanup two chunks of debug code (printf messages) > * Fix comment in pc.h (pcflash.c => pc_sysfw.c) > > v7: > * Do not add system firmware to qemu roms > * If kvm is enabled, copy pflash drive contents into a >  read-only ram region, since kvm cannot currently execute >  code from a pflash device. > * Rename pcflash.c to pc_sysfw.c > > v6: > * Rebase for memory API > * pflash_cfi01: Set error in status register when a write to >  erase is attempted in read-only mode. > * Add system firmware to qemu roms > > v5: > * Enable pflash read-only mode > * Enable -drive with if=pflash to define system firmware image > > v4: > * Rebase > > v3: > * Fix code style issues > * Add additional comments > > v2: > * Convert debug printf to DPRINTF > > Jordan Justen (3): >  pc: Add pc-1.1 machine type >  pflash: Support read-only mode >  pc: Support system flash memory with pflash > >  Makefile.target                    |    1 + >  blockdev.c                         |    3 +- >  default-configs/i386-softmmu.mak   |    1 + >  default-configs/x86_64-softmmu.mak |    1 + >  hw/boards.h                        |    1 + >  hw/pc.c                            |   58 +------- >  hw/pc.h                            |    7 +- >  hw/pc_piix.c                       |   40 +++++- >  hw/pc_sysfw.c                      |  255 ++++++++++++++++++++++++++++++++++++ >  hw/pflash_cfi01.c                  |   44 ++++-- >  hw/pflash_cfi02.c                  |   83 +++++++------ >  vl.c                               |    2 +- >  12 files changed, 382 insertions(+), 114 deletions(-) >  create mode 100644 hw/pc_sysfw.c > > --- v1.0-pc.log 2011-12-15 12:14:53.000000000 -0800 +++ master-pc-1.0.log 2011-12-15 12:25:04.000000000 -0800 @@ -1,4 +1,4 @@ -QEMU 1.0 monitor - type 'help' for more information +QEMU 1.0.50 monitor - type 'help' for more information (qemu) info mtree memory 0000000000000000-7ffffffffffffffe (prio 0): system @@ -18,6 +18,8 @@ 00000000000ec000-00000000000effff (prio 1): alias pam-ram @pc.ram 00000000000ec000-00000000000effff 00000000000f0000-00000000000fffff (prio 1): alias pam-rom @pc.ram 00000000000f0000-00000000000fffff 0000000008000000-00000000ffffffff (prio 0): alias pci-hole @pci 0000000008000000-00000000ffffffff + 00000000fec00000-00000000fec00fff (prio 0): ioapic + 00000000fed00000-00000000fed003ff (prio 0): hpet