From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NfDJp-0005pR-3Y for qemu-devel@nongnu.org; Wed, 10 Feb 2010 09:13:29 -0500 Received: from [199.232.76.173] (port=46401 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NfDJo-0005p1-Pd for qemu-devel@nongnu.org; Wed, 10 Feb 2010 09:13:28 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NfDJn-0000F6-8h for qemu-devel@nongnu.org; Wed, 10 Feb 2010 09:13:28 -0500 Received: from mail-iw0-f194.google.com ([209.85.223.194]:51836) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NfDJn-0000Ev-13 for qemu-devel@nongnu.org; Wed, 10 Feb 2010 09:13:27 -0500 Received: by iwn32 with SMTP id 32so41806iwn.14 for ; Wed, 10 Feb 2010 06:13:26 -0800 (PST) Message-ID: <4B72BF03.2040400@codemonkey.ws> Date: Wed, 10 Feb 2010 08:13:23 -0600 From: Anthony Liguori MIME-Version: 1.0 Subject: Re: [Qemu-devel] [PATCH 09/15] eepro100: convert to new pci interface References: <1265752899-26980-1-git-send-email-aliguori@us.ibm.com> <1265752899-26980-10-git-send-email-aliguori@us.ibm.com> <4B7252EA.7000300@mail.berlios.de> In-Reply-To: <4B7252EA.7000300@mail.berlios.de> Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefan Weil Cc: Michael Tsirkin , Anthony Liguori , qemu-devel@nongnu.org On 02/10/2010 12:32 AM, Stefan Weil wrote: > See my inline comments. > > > Anthony Liguori schrieb: > >> - Removed some dead defines for TARGET_I386 so that we could build once >> >> Signed-off-by: Anthony Liguori >> --- >> hw/eepro100.c | 238 ++++++++++++++------------------------------------------- >> 1 files changed, 57 insertions(+), 181 deletions(-) >> >> diff --git a/hw/eepro100.c b/hw/eepro100.c >> index b33dbb8..16230c9 100644 >> --- a/hw/eepro100.c >> +++ b/hw/eepro100.c >> @@ -33,10 +33,6 @@ >> * Open Source Software Developer Manual >> */ >> >> -#if defined(TARGET_I386) >> -# warning "PXE boot still not working!" >> -#endif >> - >> >> > You did not fix PXE boot here, did you? > So the warning or a comment should stay there. > A comment is fine, but the TARGET_I386 makes this file unnecessarily dependent on TARGET. With this change, we only need to build eepro100.o once. >> /***********************************************************/ >> /* PCI EEPRO100 definitions */ >> >> -static void pci_map(PCIDevice * pci_dev, int region_num, >> - pcibus_t addr, pcibus_t size, int type) >> +static void pci_io_write(PCIDevice *dev, pcibus_t addr, int size, >> + uint32_t value) >> { >> - EEPRO100State *s = DO_UPCAST(EEPRO100State, dev, pci_dev); >> - >> - TRACE(OTHER, logout("region %d, addr=0x%08"FMT_PCIBUS", " >> - "size=0x%08"FMT_PCIBUS", type=%d\n", >> - region_num, addr, size, type)); >> + EEPRO100State *s = DO_UPCAST(EEPRO100State, dev, dev); >> >> > Please don't change the name of the PCIDevice pointer argument > from pci_dev to dev. > > This dev, dev in DO_UPCAST is ugly and misleading. > It's very common and I changed it for consistency. I honestly don't care though either way. Regards, Anthony Liguori