vfio/pci: replace 1 with PCI_CAP_LIST_NEXT to make code self-explain
Use the macro PCI_CAP_LIST_NEXT instead of 1, so that the code would be more self-explain. This patch makes this change and also fixs one typo in comment. Signed-off-by: Wei Yang <richard.weiyang@gmail.com> Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
This commit is contained in:
		
							parent
							
								
									40f8f0c31b
								
							
						
					
					
						commit
						3fc1c182c1
					
				@ -1509,7 +1509,7 @@ static uint8_t vfio_std_cap_max_size(PCIDevice *pdev, uint8_t pos)
 | 
				
			|||||||
    uint16_t next = PCI_CONFIG_SPACE_SIZE;
 | 
					    uint16_t next = PCI_CONFIG_SPACE_SIZE;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    for (tmp = pdev->config[PCI_CAPABILITY_LIST]; tmp;
 | 
					    for (tmp = pdev->config[PCI_CAPABILITY_LIST]; tmp;
 | 
				
			||||||
         tmp = pdev->config[tmp + 1]) {
 | 
					         tmp = pdev->config[tmp + PCI_CAP_LIST_NEXT]) {
 | 
				
			||||||
        if (tmp > pos && tmp < next) {
 | 
					        if (tmp > pos && tmp < next) {
 | 
				
			||||||
            next = tmp;
 | 
					            next = tmp;
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
@ -1698,7 +1698,7 @@ static int vfio_add_std_cap(VFIOPCIDevice *vdev, uint8_t pos)
 | 
				
			|||||||
    int ret;
 | 
					    int ret;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    cap_id = pdev->config[pos];
 | 
					    cap_id = pdev->config[pos];
 | 
				
			||||||
    next = pdev->config[pos + 1];
 | 
					    next = pdev->config[pos + PCI_CAP_LIST_NEXT];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /*
 | 
					    /*
 | 
				
			||||||
     * If it becomes important to configure capabilities to their actual
 | 
					     * If it becomes important to configure capabilities to their actual
 | 
				
			||||||
@ -1712,7 +1712,7 @@ static int vfio_add_std_cap(VFIOPCIDevice *vdev, uint8_t pos)
 | 
				
			|||||||
     * pci_add_capability always inserts the new capability at the head
 | 
					     * pci_add_capability always inserts the new capability at the head
 | 
				
			||||||
     * of the chain.  Therefore to end up with a chain that matches the
 | 
					     * of the chain.  Therefore to end up with a chain that matches the
 | 
				
			||||||
     * physical device, we insert from the end by making this recursive.
 | 
					     * physical device, we insert from the end by making this recursive.
 | 
				
			||||||
     * This is also why we pre-caclulate size above as cached config space
 | 
					     * This is also why we pre-calculate size above as cached config space
 | 
				
			||||||
     * will be changed as we unwind the stack.
 | 
					     * will be changed as we unwind the stack.
 | 
				
			||||||
     */
 | 
					     */
 | 
				
			||||||
    if (next) {
 | 
					    if (next) {
 | 
				
			||||||
@ -1728,7 +1728,7 @@ static int vfio_add_std_cap(VFIOPCIDevice *vdev, uint8_t pos)
 | 
				
			|||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /* Use emulated next pointer to allow dropping caps */
 | 
					    /* Use emulated next pointer to allow dropping caps */
 | 
				
			||||||
    pci_set_byte(vdev->emulated_config_bits + pos + 1, 0xff);
 | 
					    pci_set_byte(vdev->emulated_config_bits + pos + PCI_CAP_LIST_NEXT, 0xff);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    switch (cap_id) {
 | 
					    switch (cap_id) {
 | 
				
			||||||
    case PCI_CAP_ID_MSI:
 | 
					    case PCI_CAP_ID_MSI:
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user