Il 24/09/2012 11:58, Orit Wasserman ha scritto:
>>> >> if (s->fd != -1) {
>>> >> + qemu_set_fd_handler2(s->fd, NULL, NULL, NULL, NULL);
>>> >> close(s->fd);
>>> >> s->fd = -1;
>>> >> }
>> >
>> > As far as I can see, qemu_set_fd_handler2() treats invalid file
>> > descriptor -1 just like any other. If it's in io_handlers, it gets
>> > deleted, else it's a nop. Thus, the old code works.
> Not any more, there was an assert(fd >=0) added in commit
> bbdd2ad0814ea0911076419ea21b7957505cf1cc
> recently.
>
>> > I'm not sufficiently familiar with the migration code to judge whether
>> > moving the handler reset down is safe.
>> >
> I can keep the call in the same location if you think it is safer.
I think it's okay as you did, given how the code looks like now.
I plan to make qemu_fclose take care of closing the file descriptor, but
then I'll adjust the code myself. I just want this series to go in. :)))
Paolo