openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

char-parallel: convert parallel to finalize 

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Marc-André Lureau 2016-12-08 17:57:35 +03:00
parent 9fa2f7a4ed
commit c930572883
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
qemu-char.c
View File

@ -2025,17 +2025,6 @@ static int pp_ioctl(Chardev *chr, int cmd, void *arg)
return 0; return 0;
} }
static void pp_free(Chardev *chr)
{
ParallelChardev *drv = PARALLEL_CHARDEV(chr);
int fd = drv->fd;
pp_hw_mode(drv, IEEE1284_MODE_COMPAT);
ioctl(fd, PPRELEASE);
close(fd);
qemu_chr_be_event(chr, CHR_EVENT_CLOSED);
}
static void qemu_chr_open_pp_fd(Chardev *chr, static void qemu_chr_open_pp_fd(Chardev *chr,
int fd, int fd,
bool *be_opened, bool *be_opened,
@ -4699,18 +4688,33 @@ static void char_parallel_class_init(ObjectClass *oc, void *data)
#if defined(__linux__) #if defined(__linux__)
cc->chr_write = null_chr_write; cc->chr_write = null_chr_write;
cc->chr_ioctl = pp_ioctl; cc->chr_ioctl = pp_ioctl;
cc->chr_free = pp_free;
#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
/* FIXME: no chr_free */
cc->chr_write = null_chr_write; cc->chr_write = null_chr_write;
cc->chr_ioctl = pp_ioctl; cc->chr_ioctl = pp_ioctl;
#endif #endif
} }
static void char_parallel_finalize(Object *obj)
{
#if defined(__linux__)
Chardev *chr = CHARDEV(obj);
ParallelChardev *drv = PARALLEL_CHARDEV(chr);
int fd = drv->fd;
pp_hw_mode(drv, IEEE1284_MODE_COMPAT);
ioctl(fd, PPRELEASE);
close(fd);
qemu_chr_be_event(chr, CHR_EVENT_CLOSED);
#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
/* FIXME: close fd? */
#endif
}
static const TypeInfo char_parallel_type_info = { static const TypeInfo char_parallel_type_info = {
.name = TYPE_CHARDEV_PARALLEL, .name = TYPE_CHARDEV_PARALLEL,
.parent = TYPE_CHARDEV, .parent = TYPE_CHARDEV,
.instance_size = sizeof(ParallelChardev), .instance_size = sizeof(ParallelChardev),
.instance_finalize = char_parallel_finalize,
.class_init = char_parallel_class_init, .class_init = char_parallel_class_init,
}; };
#endif #endif