ipack: Pass size to ipack_bus_new_inplace()
To be passed to qbus_create_inplace(). Simplify DEVICE() cast to avoid parent field access. Reviewed-by: Wenchao Xia <xiawenc@linux.vnet.ibm.com> Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
		
							parent
							
								
									ab809e84a7
								
							
						
					
					
						commit
						77cbb28a5b
					
				| 
						 | 
				
			
			@ -24,7 +24,8 @@ IPackDevice *ipack_device_find(IPackBus *bus, int32_t slot)
 | 
			
		|||
    return NULL;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void ipack_bus_new_inplace(IPackBus *bus, DeviceState *parent,
 | 
			
		||||
void ipack_bus_new_inplace(IPackBus *bus, size_t bus_size,
 | 
			
		||||
                           DeviceState *parent,
 | 
			
		||||
                           const char *name, uint8_t n_slots,
 | 
			
		||||
                           qemu_irq_handler handler)
 | 
			
		||||
{
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -72,7 +72,8 @@ extern const VMStateDescription vmstate_ipack_device;
 | 
			
		|||
    VMSTATE_STRUCT(_field, _state, 1, vmstate_ipack_device, IPackDevice)
 | 
			
		||||
 | 
			
		||||
IPackDevice *ipack_device_find(IPackBus *bus, int32_t slot);
 | 
			
		||||
void ipack_bus_new_inplace(IPackBus *bus, DeviceState *parent,
 | 
			
		||||
void ipack_bus_new_inplace(IPackBus *bus, size_t bus_size,
 | 
			
		||||
                           DeviceState *parent,
 | 
			
		||||
                           const char *name, uint8_t n_slots,
 | 
			
		||||
                           qemu_irq_handler handler);
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -607,7 +607,7 @@ static int tpci200_initfn(PCIDevice *pci_dev)
 | 
			
		|||
    pci_register_bar(&s->dev, 4, PCI_BASE_ADDRESS_SPACE_MEMORY, &s->las2);
 | 
			
		||||
    pci_register_bar(&s->dev, 5, PCI_BASE_ADDRESS_SPACE_MEMORY, &s->las3);
 | 
			
		||||
 | 
			
		||||
    ipack_bus_new_inplace(&s->bus, DEVICE(&s->dev), NULL,
 | 
			
		||||
    ipack_bus_new_inplace(&s->bus, sizeof(s->bus), DEVICE(pci_dev), NULL,
 | 
			
		||||
                          N_MODULES, tpci200_set_irq);
 | 
			
		||||
 | 
			
		||||
    return 0;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue