Message ID | 1470214147-32560-1-git-send-email-xiecl.fnst@cn.fujitsu.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Wed, Aug 03, 2016 at 04:49:07PM +0800, Changlong Xie wrote: > The old one is confusing with @virtio_device_info in virtio.c, > so make it more appropriate. > > Signed-off-by: Changlong Xie <xiecl.fnst@cn.fujitsu.com> > --- > hw/block/virtio-blk.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Thanks, applied to my block-next tree: https://github.com/stefanha/qemu/commits/block-next Stefan
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index 475a822..a3a9e63 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -987,7 +987,7 @@ static void virtio_blk_class_init(ObjectClass *klass, void *data) vdc->load = virtio_blk_load_device; } -static const TypeInfo virtio_device_info = { +static const TypeInfo virtio_blk_info = { .name = TYPE_VIRTIO_BLK, .parent = TYPE_VIRTIO_DEVICE, .instance_size = sizeof(VirtIOBlock), @@ -997,7 +997,7 @@ static const TypeInfo virtio_device_info = { static void virtio_register_types(void) { - type_register_static(&virtio_device_info); + type_register_static(&virtio_blk_info); } type_init(virtio_register_types)
The old one is confusing with @virtio_device_info in virtio.c, so make it more appropriate. Signed-off-by: Changlong Xie <xiecl.fnst@cn.fujitsu.com> --- hw/block/virtio-blk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)