Commit 10817bf0 authored by Daniel P. Berrangé's avatar Daniel P. Berrangé
Browse files

coroutine: move into libqemuutil.a library 



The coroutine files are currently referenced by the block-obj-y
variable. The coroutine functionality though is already used by
more than just the block code. eg migration code uses coroutine
yield. In the future the I/O channel code will also use the
coroutine yield functionality. Since the coroutine code is nicely
self-contained it can be easily built as part of the libqemuutil.a
library, making it widely available.

The headers are also moved into include/qemu, instead of the
include/block directory, since they are now part of the util
codebase, and the impl was never in the block/ directory
either.

Signed-off-by: default avatarDaniel P. Berrange <berrange@redhat.com>
parent 57cb38b3

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -1193,6 +1193,13 @@ F: crypto/ 
F: include/crypto/

F: tests/test-crypto-*



Coroutines

M: Stefan Hajnoczi <stefanha@redhat.com>

M: Kevin Wolf <kwolf@redhat.com>

F: util/*coroutine*

F: include/qemu/coroutine*

F: tests/test-coroutine.c



Usermode Emulation

------------------

Overall

Makefile.objs

+0 −4
Original line number Diff line number Diff line
@@ -15,10 +15,6 @@ block-obj-$(CONFIG_WIN32) += aio-win32.o 
block-obj-y += block/

block-obj-y += qemu-io-cmds.o



block-obj-y += qemu-coroutine.o qemu-coroutine-lock.o qemu-coroutine-io.o

block-obj-y += qemu-coroutine-sleep.o

block-obj-y += coroutine-$(CONFIG_COROUTINE_BACKEND).o



block-obj-m = block/



#######################################################################

block.c

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
#include "sysemu/block-backend.h"

#include "sysemu/sysemu.h"

#include "qemu/notify.h"

#include "block/coroutine.h"

#include "qemu/coroutine.h"

#include "block/qapi.h"

#include "qmp-commands.h"

#include "qemu/timer.h"

block/qcow2.h

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#define BLOCK_QCOW2_H



#include "crypto/cipher.h"

#include "block/coroutine.h"

#include "qemu/coroutine.h"



//#define DEBUG_ALLOC

//#define DEBUG_ALLOC2

block/vdi.c

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
#include "block/block_int.h"

#include "qemu/module.h"

#include "migration/migration.h"

#include "block/coroutine.h"

#include "qemu/coroutine.h"



#if defined(CONFIG_UUID)

#include <uuid/uuid.h>