virtio-rng: QOM realize preparations
Rename qdev -> dev because that's what realize's argument is called by convention. No need to keep more "qdev" around than necessary. Signed-off-by: Andreas Färber <afaerber@suse.de> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
		
							parent
							
								
									a546fb1741
								
							
						
					
					
						commit
						af7671fdc5
					
				@ -135,8 +135,8 @@ static void check_rate_limit(void *opaque)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
static int virtio_rng_device_init(VirtIODevice *vdev)
 | 
					static int virtio_rng_device_init(VirtIODevice *vdev)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    DeviceState *qdev = DEVICE(vdev);
 | 
					    DeviceState *dev = DEVICE(vdev);
 | 
				
			||||||
    VirtIORNG *vrng = VIRTIO_RNG(vdev);
 | 
					    VirtIORNG *vrng = VIRTIO_RNG(dev);
 | 
				
			||||||
    Error *local_err = NULL;
 | 
					    Error *local_err = NULL;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (!vrng->conf.period_ms > 0) {
 | 
					    if (!vrng->conf.period_ms > 0) {
 | 
				
			||||||
@ -148,12 +148,12 @@ static int virtio_rng_device_init(VirtIODevice *vdev)
 | 
				
			|||||||
    if (vrng->conf.rng == NULL) {
 | 
					    if (vrng->conf.rng == NULL) {
 | 
				
			||||||
        vrng->conf.default_backend = RNG_RANDOM(object_new(TYPE_RNG_RANDOM));
 | 
					        vrng->conf.default_backend = RNG_RANDOM(object_new(TYPE_RNG_RANDOM));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        object_property_add_child(OBJECT(qdev),
 | 
					        object_property_add_child(OBJECT(dev),
 | 
				
			||||||
                                  "default-backend",
 | 
					                                  "default-backend",
 | 
				
			||||||
                                  OBJECT(vrng->conf.default_backend),
 | 
					                                  OBJECT(vrng->conf.default_backend),
 | 
				
			||||||
                                  NULL);
 | 
					                                  NULL);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        object_property_set_link(OBJECT(qdev),
 | 
					        object_property_set_link(OBJECT(dev),
 | 
				
			||||||
                                 OBJECT(vrng->conf.default_backend),
 | 
					                                 OBJECT(vrng->conf.default_backend),
 | 
				
			||||||
                                 "rng", NULL);
 | 
					                                 "rng", NULL);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
@ -184,7 +184,7 @@ static int virtio_rng_device_init(VirtIODevice *vdev)
 | 
				
			|||||||
    timer_mod(vrng->rate_limit_timer,
 | 
					    timer_mod(vrng->rate_limit_timer,
 | 
				
			||||||
                   qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + vrng->conf.period_ms);
 | 
					                   qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + vrng->conf.period_ms);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    register_savevm(qdev, "virtio-rng", -1, 1, virtio_rng_save,
 | 
					    register_savevm(dev, "virtio-rng", -1, 1, virtio_rng_save,
 | 
				
			||||||
                    virtio_rng_load, vrng);
 | 
					                    virtio_rng_load, vrng);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    return 0;
 | 
					    return 0;
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user