On 2011-08-23 19:33, Jan Kiszka wrote:
> Device assignment no longer peeks into config_map, so we can drop all
> the related changes and sync the PCI core with upstream.
>
> Signed-off-by: Jan Kiszka <jan.kiszka@xxxxxxxxxxx>
> ---
> hw/pci.c | 29 +++++++++++++++--------------
> hw/pci.h | 7 +++++--
> 2 files changed, 20 insertions(+), 16 deletions(-)
>
> diff --git a/hw/pci.c b/hw/pci.c
> index 5c87a62..0225888 100644
> --- a/hw/pci.c
> +++ b/hw/pci.c
> @@ -806,7 +806,7 @@ static void pci_config_alloc(PCIDevice *pci_dev)
> pci_dev->cmask = g_malloc0(config_size);
> pci_dev->wmask = g_malloc0(config_size);
> pci_dev->w1cmask = g_malloc0(config_size);
> - pci_dev->config_map = g_malloc0(config_size);
> + pci_dev->used = g_malloc0(config_size);
> }
>
> static void pci_config_free(PCIDevice *pci_dev)
> @@ -815,7 +815,7 @@ static void pci_config_free(PCIDevice *pci_dev)
> g_free(pci_dev->cmask);
> g_free(pci_dev->wmask);
> g_free(pci_dev->w1cmask);
> - g_free(pci_dev->config_map);
> + g_free(pci_dev->used);
> }
>
> /* -1 for devfn means auto assign */
> @@ -846,8 +846,6 @@ static PCIDevice *do_pci_register_device(PCIDevice *pci_dev, PCIBus *bus,
> pci_dev->irq_state = 0;
> pci_config_alloc(pci_dev);
>
> - memset(pci_dev->config_map, 0xff, PCI_CONFIG_HEADER_SIZE);
> -
> pci_config_set_vendor_id(pci_dev->config, info->vendor_id);
> pci_config_set_device_id(pci_dev->config, info->device_id);
> pci_config_set_revision(pci_dev->config, info->revision);
> @@ -1887,7 +1885,7 @@ static int pci_find_space(PCIDevice *pdev, uint8_t size)
> int offset = PCI_CONFIG_HEADER_SIZE;
> int i;
> for (i = PCI_CONFIG_HEADER_SIZE; i < config_size; ++i)
> - if (pdev->config_map[i])
> + if (pdev->used[i])
> offset = i + 1;
> else if (i - offset + 1 == size)
> return offset;
> @@ -2062,13 +2060,13 @@ int pci_add_capability(PCIDevice *pdev, uint8_t cap_id,
> int i;
>
> for (i = offset; i < offset + size; i++) {
> - if (pdev->config_map[i]) {
> + if (pdev->used[i]) {
> fprintf(stderr, "ERROR: %04x:%02x:%02x.%x "
> "Attempt to add PCI capability %x at offset "
> "%x overlaps existing capability %x at offset %x\n",
> pci_find_domain(pdev->bus), pci_bus_num(pdev->bus),
> PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn),
> - cap_id, offset, pdev->config_map[i], i);
> + cap_id, offset, pdev->used[i], i);
> return -EINVAL;
This hunk is actually not equivalent. So the whole patch should be
skipped for now. I'll post a new version once upstreaming and merging
back of that error detection is done.
Jan
--
Siemens AG, Corporate Technology, CT T DE IT 1
Corporate Competence Center Embedded Linux
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
