OSDN Git Service

util: merge main-loop.c and iohandler.c
authorPaolo Bonzini <pbonzini@redhat.com>
Fri, 12 Jul 2019 17:34:35 +0000 (19:34 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Mon, 15 Jul 2019 09:20:43 +0000 (11:20 +0200)
commite9ed92bd8d608722d05b4e6076355314dfd8c26c
tree3d603041dae3f3be4358cc88d202ef6db6d815dd
parentf2b143a28138a837e9a452e247e1703ebd6bf55e
util: merge main-loop.c and iohandler.c

main-loop.c has a dependency on iohandler.c, and everything breaks
if that dependency is instead satisfied by stubs/iohandler.c.
Just put everything in the same file to avoid strange dependencies
on the order of files in util-obj-y.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1562952875-53702-1-git-send-email-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
util/Makefile.objs
util/iohandler.c [deleted file]
util/main-loop.c