[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] Re: [PATCH 8/9] eepro100: Fix mapping of flash memory
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] Re: [PATCH 8/9] eepro100: Fix mapping of flash memory |
Date: |
Tue, 6 Apr 2010 17:30:03 +0300 |
User-agent: |
Mutt/1.5.19 (2009-01-05) |
On Tue, Apr 06, 2010 at 04:23:41PM +0200, Stefan Weil wrote:
> Michael S. Tsirkin schrieb:
> > On Tue, Apr 06, 2010 at 01:44:08PM +0200, Stefan Weil wrote:
> >
> >> Signed-off-by: Stefan Weil <address@hidden>
> >> ---
> >> hw/eepro100.c | 5 +++--
> >> 1 files changed, 3 insertions(+), 2 deletions(-)
> >>
> >> diff --git a/hw/eepro100.c b/hw/eepro100.c
> >> index f0acdbc..2401888 100644
> >> --- a/hw/eepro100.c
> >> +++ b/hw/eepro100.c
> >> @@ -1622,8 +1622,9 @@ static void pci_mmio_map(PCIDevice * pci_dev, int
> >> region_num,
> >> "size=0x%08"FMT_PCIBUS", type=%d\n",
> >> region_num, addr, size, type));
> >>
> >> - if (region_num == 0) {
> >> - /* Map control / status registers. */
> >> + assert(region_num == 0 || region_num == 2);
> >> + if (region_num == 0 || region_num == 2) {
> >>
> >
> > Looks a bit strange ... Why do we need the if here?
> >
>
> It is not needed if everything works as it should.
>
> For compilations without NDEBUG, assert will catch
> a wrong region_num anyway.
>
> If code is compiled with NDEBUG, the assert does
> nothing, so the if is an additional guard.
We don't need the guard though: the only way to get
non 0 and non 2 region is because of a bug in code.
So the check is just a debugging aid.
> >
> >> + /* Map control / status registers and flash. */
> >> cpu_register_physical_memory(addr, size, s->mmio_index);
> >> s->region[region_num] = addr;
> >> }
> >> --
> >> 1.7.0
> >>
- Re: [Qemu-devel] [PATCH 6/9] eepro100: Support compilation without EEPROM, (continued)
[Qemu-devel] [PATCH 5/9] eepro100: Set configuration bit for standard TCB, Stefan Weil, 2010/04/06
[Qemu-devel] [PATCH 7/9] eepro100: Set power management capability using pci_reserve_capability, Stefan Weil, 2010/04/06
[Qemu-devel] [PATCH 8/9] eepro100: Fix mapping of flash memory, Stefan Weil, 2010/04/06
[Qemu-devel] [PATCH 9/9] eepro100: Fix PCI interrupt pin configuration regression, Stefan Weil, 2010/04/06
[Qemu-devel] Re: eepro100: New patches, Michael S. Tsirkin, 2010/04/06