| Message ID | 1256905286-25435-27-git-send-email-yamahata@valinux.co.jp |
|---|---|
| State | New |
| Headers | show |
On Fri, Oct 30, 2009 at 09:21:20PM +0900, Isaku Yamahata wrote: > clean up pci_default_write_config() by the range helper functions. > > Suggested by Michael S. Tsirkin <mst@redhat.com> > Cc: Michael S. Tsirkin <mst@redhat.com> > Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Acked-by: Michael S. Tsirkin <mst@redhat.com> > --- > hw/pci.c | 8 ++------ > 1 files changed, 2 insertions(+), 6 deletions(-) > > diff --git a/hw/pci.c b/hw/pci.c > index 67133b6..d9fd564 100644 > --- a/hw/pci.c > +++ b/hw/pci.c > @@ -699,19 +699,15 @@ uint32_t pci_default_read_config(PCIDevice *d, > > void pci_default_write_config(PCIDevice *d, uint32_t addr, uint32_t val, int l) > { > - uint8_t orig[PCI_CONFIG_SPACE_SIZE]; > int i; > uint32_t config_size = pci_config_size(d); > > - /* not efficient, but simple */ > - memcpy(orig, d->config, PCI_CONFIG_SPACE_SIZE); > for(i = 0; i < l && addr < config_size; val >>= 8, ++i, ++addr) { > uint8_t wmask = d->wmask[addr]; > d->config[addr] = (d->config[addr] & ~wmask) | (val & wmask); > } > - if (memcmp(orig + PCI_BASE_ADDRESS_0, d->config + PCI_BASE_ADDRESS_0, 24) > - || ((orig[PCI_COMMAND] ^ d->config[PCI_COMMAND]) > - & (PCI_COMMAND_MEMORY | PCI_COMMAND_IO))) > + if (ranges_overlap(addr, l, PCI_BASE_ADDRESS_0, 24) || > + range_covers_byte(addr, l, PCI_COMMAND)) > pci_update_mappings(d); > } > > -- > 1.6.0.2
On Fri, Oct 30, 2009 at 09:21:20PM +0900, Isaku Yamahata wrote: > clean up pci_default_write_config() by the range helper functions. > > Suggested by Michael S. Tsirkin <mst@redhat.com> > Cc: Michael S. Tsirkin <mst@redhat.com> > Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Mabe you can float this patch up so I can put it on pci tree. > --- > hw/pci.c | 8 ++------ > 1 files changed, 2 insertions(+), 6 deletions(-) > > diff --git a/hw/pci.c b/hw/pci.c > index 67133b6..d9fd564 100644 > --- a/hw/pci.c > +++ b/hw/pci.c > @@ -699,19 +699,15 @@ uint32_t pci_default_read_config(PCIDevice *d, > > void pci_default_write_config(PCIDevice *d, uint32_t addr, uint32_t val, int l) > { > - uint8_t orig[PCI_CONFIG_SPACE_SIZE]; > int i; > uint32_t config_size = pci_config_size(d); > > - /* not efficient, but simple */ > - memcpy(orig, d->config, PCI_CONFIG_SPACE_SIZE); > for(i = 0; i < l && addr < config_size; val >>= 8, ++i, ++addr) { > uint8_t wmask = d->wmask[addr]; > d->config[addr] = (d->config[addr] & ~wmask) | (val & wmask); > } > - if (memcmp(orig + PCI_BASE_ADDRESS_0, d->config + PCI_BASE_ADDRESS_0, 24) > - || ((orig[PCI_COMMAND] ^ d->config[PCI_COMMAND]) > - & (PCI_COMMAND_MEMORY | PCI_COMMAND_IO))) > + if (ranges_overlap(addr, l, PCI_BASE_ADDRESS_0, 24) || > + range_covers_byte(addr, l, PCI_COMMAND)) > pci_update_mappings(d); > } > > -- > 1.6.0.2 > >
diff --git a/hw/pci.c b/hw/pci.c index 67133b6..d9fd564 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -699,19 +699,15 @@ uint32_t pci_default_read_config(PCIDevice *d, void pci_default_write_config(PCIDevice *d, uint32_t addr, uint32_t val, int l) { - uint8_t orig[PCI_CONFIG_SPACE_SIZE]; int i; uint32_t config_size = pci_config_size(d); - /* not efficient, but simple */ - memcpy(orig, d->config, PCI_CONFIG_SPACE_SIZE); for(i = 0; i < l && addr < config_size; val >>= 8, ++i, ++addr) { uint8_t wmask = d->wmask[addr]; d->config[addr] = (d->config[addr] & ~wmask) | (val & wmask); } - if (memcmp(orig + PCI_BASE_ADDRESS_0, d->config + PCI_BASE_ADDRESS_0, 24) - || ((orig[PCI_COMMAND] ^ d->config[PCI_COMMAND]) - & (PCI_COMMAND_MEMORY | PCI_COMMAND_IO))) + if (ranges_overlap(addr, l, PCI_BASE_ADDRESS_0, 24) || + range_covers_byte(addr, l, PCI_COMMAND)) pci_update_mappings(d); }
clean up pci_default_write_config() by the range helper functions. Suggested by Michael S. Tsirkin <mst@redhat.com> Cc: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> --- hw/pci.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-)