From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=57001 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OM6cM-0004lp-V1 for qemu-devel@nongnu.org; Tue, 08 Jun 2010 17:45:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OM6cL-0002Gp-P0 for qemu-devel@nongnu.org; Tue, 08 Jun 2010 17:45:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:13765) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OM6cL-0002Gk-DM for qemu-devel@nongnu.org; Tue, 08 Jun 2010 17:45:53 -0400 From: Alex Williamson In-Reply-To: <20100608212659.GS28492@x200.localdomain> References: <20100608191447.4451.47795.stgit@localhost.localdomain> <20100608191535.4451.48702.stgit@localhost.localdomain> <20100608212659.GS28492@x200.localdomain> Content-Type: text/plain; charset="UTF-8" Date: Tue, 08 Jun 2010 15:45:48 -0600 Message-ID: <1276033548.3079.20.camel@x201> Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] Re: [RFC PATCH 2/6] ram_blocks: Convert to a QLIST List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Chris Wright Cc: quintela@redhat.com, qemu-devel@nongnu.org, kvm@vger.kernel.org On Tue, 2010-06-08 at 14:26 -0700, Chris Wright wrote: > * Alex Williamson (alex.williamson@redhat.com) wrote: > > extern int phys_ram_fd; > > -extern uint8_t *phys_ram_dirty; > > extern ram_addr_t ram_size; > > -extern ram_addr_t last_ram_offset; > > + > > +typedef struct RAMBlock { > > + uint8_t *host; > > + ram_addr_t offset; > > + ram_addr_t length; > > + QLIST_ENTRY(RAMBlock) next; > > +} RAMBlock; > > + > > +typedef struct RAMList { > > + uint8_t *phys_dirty; > > + ram_addr_t last_offset; > > + QLIST_HEAD(ram, RAMBlock) blocks; > > +} RAMList; > > +extern RAMList ram; > > such a generic name for global namespace Well it is _the_ ram, but yea... ;) Suggestions? > > - if (!block) { > > - fprintf(stderr, "Bad ram offset %" PRIx64 "\n", (uint64_t)addr); > > - abort(); > > - } > > - /* Move this entry to to start of the list. */ > > - if (prev) { > > - prev->next = block->next; > > - block->next = *prevp; > > - *prevp = block; > > + QLIST_FOREACH(block, &ram.blocks, next) { > > + if (addr - block->offset < block->length) { > > + QLIST_REMOVE(block, next); > > + QLIST_INSERT_HEAD(&ram.blocks, block, next); > > + return block->host + (addr - block->offset); > > + } > > } > > - return block->host + (addr - block->offset); > > + > > + return NULL; > > Why not preserve the error message and abort()? In error cases this > would now just segfault. Guess I was hoping the caller might do something smart, but I'll put it back since that hasn't happened. Thanks, Alex