OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

block: Convert bdrv_first to QTAILQ 

Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Stefan Hajnoczi 2010-04-10 07:02:42 +01:00 committed by Kevin Wolf
parent b66460e4e9
commit 1b7bdbc13c
2 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
block.c
View File

@ -55,7 +55,8 @@ static int bdrv_read_em(BlockDriverState *bs, int64_t sector_num,
static int bdrv_write_em(BlockDriverState *bs, int64_t sector_num, static int bdrv_write_em(BlockDriverState *bs, int64_t sector_num,
const uint8_t *buf, int nb_sectors); const uint8_t *buf, int nb_sectors);
static BlockDriverState *bdrv_first; static QTAILQ_HEAD(, BlockDriverState) bdrv_states =
QTAILQ_HEAD_INITIALIZER(bdrv_states);
static BlockDriver *first_drv; static BlockDriver *first_drv;
@ -148,16 +149,12 @@ void bdrv_register(BlockDriver *bdrv)
/* create a new block device (by default it is empty) */ /* create a new block device (by default it is empty) */
BlockDriverState *bdrv_new(const char *device_name) BlockDriverState *bdrv_new(const char *device_name)
{ {
BlockDriverState **pbs, *bs; BlockDriverState *bs;
bs = qemu_mallocz(sizeof(BlockDriverState)); bs = qemu_mallocz(sizeof(BlockDriverState));
pstrcpy(bs->device_name, sizeof(bs->device_name), device_name); pstrcpy(bs->device_name, sizeof(bs->device_name), device_name);
if (device_name[0] != '\0') { if (device_name[0] != '\0') {
/* insert at the end */ QTAILQ_INSERT_TAIL(&bdrv_states, bs, list);
pbs = &bdrv_first;
while (*pbs != NULL)
pbs = &(*pbs)->next;
*pbs = bs;
} }
return bs; return bs;
} }
@ -545,13 +542,10 @@ void bdrv_close(BlockDriverState *bs)
void bdrv_delete(BlockDriverState *bs) void bdrv_delete(BlockDriverState *bs)
{ {
BlockDriverState **pbs; /* remove from list, if necessary */
if (bs->device_name[0] != '\0') {
pbs = &bdrv_first; QTAILQ_REMOVE(&bdrv_states, bs, list);
while (*pbs != bs && *pbs != NULL) }
pbs = &(*pbs)->next;
if (*pbs == bs)
*pbs = bs->next;
bdrv_close(bs); bdrv_close(bs);
qemu_free(bs); qemu_free(bs);
@ -1172,9 +1166,10 @@ BlockDriverState *bdrv_find(const char *name)
{ {
BlockDriverState *bs; BlockDriverState *bs;
for (bs = bdrv_first; bs != NULL; bs = bs->next) { QTAILQ_FOREACH(bs, &bdrv_states, list) {
if (!strcmp(name, bs->device_name)) if (!strcmp(name, bs->device_name)) {
return bs; return bs;
}
} }
return NULL; return NULL;
} }
@ -1183,7 +1178,7 @@ void bdrv_iterate(void (*it)(void *opaque, BlockDriverState *bs), void *opaque)
{ {
BlockDriverState *bs; BlockDriverState *bs;
for (bs = bdrv_first; bs != NULL; bs = bs->next) { QTAILQ_FOREACH(bs, &bdrv_states, list) {
it(opaque, bs); it(opaque, bs);
} }
} }
@ -1203,10 +1198,12 @@ void bdrv_flush_all(void)
{ {
BlockDriverState *bs; BlockDriverState *bs;
for (bs = bdrv_first; bs != NULL; bs = bs->next) QTAILQ_FOREACH(bs, &bdrv_states, list) {
if (bs->drv && !bdrv_is_read_only(bs) && if (bs->drv && !bdrv_is_read_only(bs) &&
(!bdrv_is_removable(bs) || bdrv_is_inserted(bs))) (!bdrv_is_removable(bs) || bdrv_is_inserted(bs))) {
bdrv_flush(bs); bdrv_flush(bs);
}
}
} }
/* /*
@ -1340,7 +1337,7 @@ void bdrv_info(Monitor *mon, QObject **ret_data)
bs_list = qlist_new(); bs_list = qlist_new();
for (bs = bdrv_first; bs != NULL; bs = bs->next) { QTAILQ_FOREACH(bs, &bdrv_states, list) {
QObject *bs_obj; QObject *bs_obj;
const char *type = "unknown"; const char *type = "unknown";
@ -1445,7 +1442,7 @@ void bdrv_info_stats(Monitor *mon, QObject **ret_data)
devices = qlist_new(); devices = qlist_new();
for (bs = bdrv_first; bs != NULL; bs = bs->next) { QTAILQ_FOREACH(bs, &bdrv_states, list) {
obj = qobject_from_jsonf("{ 'device': %s, 'stats': {" obj = qobject_from_jsonf("{ 'device': %s, 'stats': {"
"'rd_bytes': %" PRId64 "," "'rd_bytes': %" PRId64 ","
"'wr_bytes': %" PRId64 "," "'wr_bytes': %" PRId64 ","

3
block_int.h
View File

@ -26,6 +26,7 @@
#include "block.h" #include "block.h"
#include "qemu-option.h" #include "qemu-option.h"
#include "qemu-queue.h"
#define BLOCK_FLAG_ENCRYPT 1 #define BLOCK_FLAG_ENCRYPT 1
#define BLOCK_FLAG_COMPRESS 2 #define BLOCK_FLAG_COMPRESS 2
@ -180,7 +181,7 @@ struct BlockDriverState {
char device_name[32]; char device_name[32];
unsigned long *dirty_bitmap; unsigned long *dirty_bitmap;
int64_t dirty_count; int64_t dirty_count;
BlockDriverState *next; QTAILQ_ENTRY(BlockDriverState) list;
void *private; void *private;
}; };