From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=59877 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OuoQO-0007BR-Mi for qemu-devel@nongnu.org; Sun, 12 Sep 2010 11:25:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OuoQN-0006Fq-85 for qemu-devel@nongnu.org; Sun, 12 Sep 2010 11:25:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50032) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OuoQM-0006Fl-Uk for qemu-devel@nongnu.org; Sun, 12 Sep 2010 11:24:59 -0400 Date: Sun, 12 Sep 2010 17:18:58 +0200 From: "Michael S. Tsirkin" Message-ID: <20100912151858.GA5018@redhat.com> References: <506dcb9fac70af774159f20559c707d5c0cafd17.1284000417.git.yamahata@valinux.co.jp> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <506dcb9fac70af774159f20559c707d5c0cafd17.1284000417.git.yamahata@valinux.co.jp> Subject: [Qemu-devel] Re: [PATCH 1/3] pci: sorting out type confusion in pci_register_bar(). List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Isaku Yamahata Cc: qemu-devel@nongnu.org On Thu, Sep 09, 2010 at 11:48:55AM +0900, Isaku Yamahata wrote: > This patch sorts out invalid use of pcibus_t. > > In pci_register_bar(), pcibus_t wmask is used. > It should, However, be uint64_t because it is used to set > pci configuration space value(PCIDevice::wmask) by pci_set_quad() > or pci_set_long(). > So make its type uint64_t and cast from pcibus_t to int64_t where > necessary. I don't think we need the cast. Applied without the cast. > Maybe for strict type safety conversion functions would > be desirable. Something like pcibus_to_uintN(), uintN_to_pcibus(). > But conversions are done only a few place, so it wouldn't be > worthwhile. > > Signed-off-by: Isaku Yamahata > --- > hw/pci.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/pci.c b/hw/pci.c > index f03b83e..8d6b299 100644 > --- a/hw/pci.c > +++ b/hw/pci.c > @@ -763,7 +763,7 @@ void pci_register_bar(PCIDevice *pci_dev, int region_num, > { > PCIIORegion *r; > uint32_t addr; > - pcibus_t wmask; > + uint64_t wmask; > > if ((unsigned int)region_num >= PCI_NUM_REGIONS) > return; > @@ -781,7 +781,7 @@ void pci_register_bar(PCIDevice *pci_dev, int region_num, > r->type = type; > r->map_func = map_func; > > - wmask = ~(size - 1); > + wmask = (uint64_t)(~(size - 1)); > addr = pci_bar(pci_dev, region_num); > if (region_num == PCI_ROM_SLOT) { > /* ROM enable bit is writeable */ > -- > 1.7.1.1