* [Qemu-devel] [PULL 00/14] Block patches
@ 2010-05-28 16:45 Kevin Wolf
0 siblings, 0 replies; 28+ messages in thread
From: Kevin Wolf @ 2010-05-28 16:45 UTC (permalink / raw)
To: anthony; +Cc: kwolf, qemu-devel
Hi Anthony,
this includes again some patches that should be applied to stable-0.12, too:
86fa8da qcow2: Fix corruption after error in update_refcount
25408c0 qcow2: Fix corruption after refblock allocation
cbf1dff block: Fix multiwrite with overlapping requests
175e115 qcow2: Fix error handling in l2_allocate
1b7c801 qcow2: Clear L2 table cache after write error
Kevin
The following changes since commit 29f91781bd300b228d9c38b9f6c1e0b6a38f25fb:
Jes Sorensen (1):
vhost_net.c: v2 Fix build failure introduced by 0bfcd599e3f5c5679cc7d0165a0a1822e2f60de2
are available in the git repository at:
git://repo.or.cz/qemu/kevin.git for-anthony
Gerd Hoffmann (1):
drive: allow rerror, werror and readonly for if=none
Jes Sorensen (1):
block.h: Make BDRV_SECTOR_SIZE 64 bit safe
Kevin Wolf (9):
qcow2: Clear L2 table cache after write error
qcow2: Fix error handling in l2_allocate
block: Fix multiwrite with overlapping requests
qemu-io: Add multiwrite command
qcow2: Allow qcow2_get_cluster_offset to return errors
qcow2: Change l2_load to return 0/-errno
qcow2: Return right error code in write_refcount_block_entries
qcow2: Fix corruption after refblock allocation
qcow2: Fix corruption after error in update_refcount
MORITA Kazutaka (1):
add support for protocol driver create_options
Nicholas A. Bellinger (1):
block: Add missing bdrv_delete() for SG_IO BlockDriver in find_image_format()
Stefan Hajnoczi (1):
posix-aio-compat: Expand tabs that have crept in
block.c | 13 ++--
block.h | 3 +-
block/qcow2-cluster.c | 94 ++++++++++++++----------
block/qcow2-refcount.c | 42 +++++++----
block/qcow2.c | 16 +++-
block/qcow2.h | 4 +-
posix-aio-compat.c | 58 +++++++-------
qemu-img.c | 49 +++++++++----
qemu-io.c | 192 ++++++++++++++++++++++++++++++++++++++++++++++++
qemu-option.c | 53 ++++++++++++--
qemu-option.h | 2 +
vl.c | 6 +-
12 files changed, 414 insertions(+), 118 deletions(-)
^ permalink raw reply [flat|nested] 28+ messages in thread
* [Qemu-devel] [PULL 00/14] Block patches
@ 2010-06-22 14:09 Kevin Wolf
0 siblings, 0 replies; 28+ messages in thread
From: Kevin Wolf @ 2010-06-22 14:09 UTC (permalink / raw)
To: anthony; +Cc: kwolf, qemu-devel
The following changes since commit cada87c432e3b9cd55869a24055baf2b7bc0b70c:
Blue Swirl (1):
Update OpenBIOS images
are available in the git repository at:
git://repo.or.cz/qemu/kevin.git for-anthony
Christoph Hellwig (1):
block: fix physical_block_size calculation
Eduardo Habkost (1):
monitor: allow device to be ejected if no disk is inserted
Kevin Wolf (8):
block: Add bdrv_(p)write_sync
cow: Use bdrv_(p)write_sync for metadata writes
qcow: Use bdrv_(p)write_sync for metadata writes
qcow2: Use bdrv_(p)write_sync for metadata writes
vmdk: Use bdrv_(p)write_sync for metadata writes
vpc: Use bdrv_(p)write_sync for metadata writes
qcow2: Fix qemu-img check segfault on corrupted images
qcow2: Don't try to check tables that couldn't be loaded
MORITA Kazutaka (1):
qemu-io: check registered fds in command_loop()
Nicholas Bellinger (2):
scsi-bus: Add PERSISTENT_RESERVE_OUT SCSIRequest->cmd.mode setup
scsi-bus: Add MAINTENANCE_IN and MAINTENANCE_OUT SCSIRequest xfer and mode assignments
Yoshiaki Tamura (1):
virtio-blk: fix the list operation in virtio_blk_load().
block.c | 37 +++++++++++++++++++++++++++++++++++++
block.h | 4 ++++
block/cow.c | 20 +++++++++++---------
block/qcow.c | 18 ++++++++++--------
block/qcow2-cluster.c | 24 ++++++++++++------------
block/qcow2-refcount.c | 39 ++++++++++++++++++++++++---------------
block/qcow2-snapshot.c | 23 +++++++++++------------
block/qcow2.c | 10 +++++-----
block/vmdk.c | 10 +++++-----
block/vpc.c | 9 +++++----
block_int.h | 4 +++-
blockdev.c | 22 ++++++++++------------
cmd.c | 33 ++++++++++++++++++++++++++++++---
hw/scsi-bus.c | 11 +++++++++++
hw/scsi-defs.h | 2 ++
hw/virtio-blk.c | 2 +-
16 files changed, 181 insertions(+), 87 deletions(-)
^ permalink raw reply [flat|nested] 28+ messages in thread
* [Qemu-devel] [PULL 00/14] Block patches
@ 2010-12-09 11:09 Kevin Wolf
2010-12-09 11:09 ` [Qemu-devel] [PATCH 01/14] block: Make bdrv_create_file() ':' handling consistent Kevin Wolf
` (15 more replies)
0 siblings, 16 replies; 28+ messages in thread
From: Kevin Wolf @ 2010-12-09 11:09 UTC (permalink / raw)
To: anthony; +Cc: kwolf, qemu-devel
The following changes since commit 138b38b61bf92d4e9588acf934e532499c94e185:
ppc: kvm: fix signedness warning (2010-12-08 21:30:19 +0100)
are available in the git repository at:
git://repo.or.cz/qemu/kevin.git for-anthony
Christian Brunner (1):
ceph/rbd block driver for qemu-kvm
Jes Sorensen (8):
Add missing tracing to qemu_mallocz()
Use qemu_mallocz() instead of calloc() in img_convert()
img_convert(): Only try to free bs[] entries if bs is valid.
Consolidate printing of block driver options
Fix formatting and missing braces in qemu-img.c
Fail if detecting an unknown option
Make error handling more consistent in img_create() and img_resize()
qemu-img: Deprecate obsolete -6 and -e options
Stefan Hajnoczi (5):
block: Make bdrv_create_file() ':' handling consistent
qemu-option: Don't reinvent append_option_parameters()
qemu-option: Fix parse_option_parameters() documentation typo
qemu-img: Free option parameter lists in img_create()
qemu-img: Fail creation if backing format is invalid
Makefile.objs | 1 +
block.c | 2 +-
block/rbd.c | 1059 +++++++++++++++++++++++++++++++++++++++++++++++++++++
block/rbd_types.h | 71 ++++
block_int.h | 1 -
configure | 52 +++
qemu-img.c | 247 ++++++++-----
qemu-malloc.c | 5 +-
qemu-option.c | 13 +-
9 files changed, 1344 insertions(+), 107 deletions(-)
create mode 100644 block/rbd.c
create mode 100644 block/rbd_types.h
^ permalink raw reply [flat|nested] 28+ messages in thread
* [Qemu-devel] [PATCH 01/14] block: Make bdrv_create_file() ':' handling consistent
2010-12-09 11:09 [Qemu-devel] [PULL 00/14] Block patches Kevin Wolf
@ 2010-12-09 11:09 ` Kevin Wolf
2010-12-09 11:09 ` [Qemu-devel] [PATCH 02/14] Add missing tracing to qemu_mallocz() Kevin Wolf
` (14 subsequent siblings)
15 siblings, 0 replies; 28+ messages in thread
From: Kevin Wolf @ 2010-12-09 11:09 UTC (permalink / raw)
To: anthony; +Cc: kwolf, qemu-devel
From: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Filenames may start with "<protocol>:" to explicitly use a protocol like
nbd. Filenames with unknown protocols are rejected in most of QEMU
except for bdrv_create_file(). Even if a file with an invalid filename
can be created, QEMU cannot use it since all the other relevant
functions reject such paths. Make bdrv_create_file() consistent.
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
block.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/block.c b/block.c
index 63effd8..e7a986c 100644
--- a/block.c
+++ b/block.c
@@ -215,7 +215,7 @@ int bdrv_create_file(const char* filename, QEMUOptionParameter *options)
drv = bdrv_find_protocol(filename);
if (drv == NULL) {
- drv = bdrv_find_format("file");
+ return -ENOENT;
}
return bdrv_create(drv, filename, options);
--
1.7.2.3
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [Qemu-devel] [PATCH 02/14] Add missing tracing to qemu_mallocz()
2010-12-09 11:09 [Qemu-devel] [PULL 00/14] Block patches Kevin Wolf
2010-12-09 11:09 ` [Qemu-devel] [PATCH 01/14] block: Make bdrv_create_file() ':' handling consistent Kevin Wolf
@ 2010-12-09 11:09 ` Kevin Wolf
2010-12-09 11:09 ` [Qemu-devel] [PATCH 03/14] Use qemu_mallocz() instead of calloc() in img_convert() Kevin Wolf
` (13 subsequent siblings)
15 siblings, 0 replies; 28+ messages in thread
From: Kevin Wolf @ 2010-12-09 11:09 UTC (permalink / raw)
To: anthony; +Cc: kwolf, qemu-devel
From: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
qemu-malloc.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/qemu-malloc.c b/qemu-malloc.c
index 28fb05a..b9b3851 100644
--- a/qemu-malloc.c
+++ b/qemu-malloc.c
@@ -64,10 +64,13 @@ void *qemu_realloc(void *ptr, size_t size)
void *qemu_mallocz(size_t size)
{
+ void *ptr;
if (!size && !allow_zero_malloc()) {
abort();
}
- return qemu_oom_check(calloc(1, size ? size : 1));
+ ptr = qemu_oom_check(calloc(1, size ? size : 1));
+ trace_qemu_malloc(size, ptr);
+ return ptr;
}
char *qemu_strdup(const char *str)
--
1.7.2.3
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [Qemu-devel] [PATCH 03/14] Use qemu_mallocz() instead of calloc() in img_convert()
2010-12-09 11:09 [Qemu-devel] [PULL 00/14] Block patches Kevin Wolf
2010-12-09 11:09 ` [Qemu-devel] [PATCH 01/14] block: Make bdrv_create_file() ':' handling consistent Kevin Wolf
2010-12-09 11:09 ` [Qemu-devel] [PATCH 02/14] Add missing tracing to qemu_mallocz() Kevin Wolf
@ 2010-12-09 11:09 ` Kevin Wolf
2010-12-09 11:10 ` [Qemu-devel] [PATCH 04/14] img_convert(): Only try to free bs[] entries if bs is valid Kevin Wolf
` (12 subsequent siblings)
15 siblings, 0 replies; 28+ messages in thread
From: Kevin Wolf @ 2010-12-09 11:09 UTC (permalink / raw)
To: anthony; +Cc: kwolf, qemu-devel
From: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
qemu-img.c | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index fa77ac0..eca99c4 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -699,11 +699,7 @@ static int img_convert(int argc, char **argv)
return 1;
}
- bs = calloc(bs_n, sizeof(BlockDriverState *));
- if (!bs) {
- error("Out of memory");
- return 1;
- }
+ bs = qemu_mallocz(bs_n * sizeof(BlockDriverState *));
total_sectors = 0;
for (bs_i = 0; bs_i < bs_n; bs_i++) {
@@ -983,7 +979,7 @@ out:
bdrv_delete(bs[bs_i]);
}
}
- free(bs);
+ qemu_free(bs);
if (ret) {
return 1;
}
--
1.7.2.3
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [Qemu-devel] [PATCH 04/14] img_convert(): Only try to free bs[] entries if bs is valid.
2010-12-09 11:09 [Qemu-devel] [PULL 00/14] Block patches Kevin Wolf
` (2 preceding siblings ...)
2010-12-09 11:09 ` [Qemu-devel] [PATCH 03/14] Use qemu_mallocz() instead of calloc() in img_convert() Kevin Wolf
@ 2010-12-09 11:10 ` Kevin Wolf
2010-12-09 11:10 ` [Qemu-devel] [PATCH 05/14] Consolidate printing of block driver options Kevin Wolf
` (11 subsequent siblings)
15 siblings, 0 replies; 28+ messages in thread
From: Kevin Wolf @ 2010-12-09 11:10 UTC (permalink / raw)
To: anthony; +Cc: kwolf, qemu-devel
From: Jes Sorensen <Jes.Sorensen@redhat.com>
This allows for jumping to 'out:' consistently for error exit.
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
qemu-img.c | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index eca99c4..aded72d 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -696,7 +696,8 @@ static int img_convert(int argc, char **argv)
if (bs_n > 1 && out_baseimg) {
error("-B makes no sense when concatenating multiple input images");
- return 1;
+ ret = -1;
+ goto out;
}
bs = qemu_mallocz(bs_n * sizeof(BlockDriverState *));
@@ -974,12 +975,14 @@ out:
if (out_bs) {
bdrv_delete(out_bs);
}
- for (bs_i = 0; bs_i < bs_n; bs_i++) {
- if (bs[bs_i]) {
- bdrv_delete(bs[bs_i]);
+ if (bs) {
+ for (bs_i = 0; bs_i < bs_n; bs_i++) {
+ if (bs[bs_i]) {
+ bdrv_delete(bs[bs_i]);
+ }
}
+ qemu_free(bs);
}
- qemu_free(bs);
if (ret) {
return 1;
}
--
1.7.2.3
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [Qemu-devel] [PATCH 05/14] Consolidate printing of block driver options
2010-12-09 11:09 [Qemu-devel] [PULL 00/14] Block patches Kevin Wolf
` (3 preceding siblings ...)
2010-12-09 11:10 ` [Qemu-devel] [PATCH 04/14] img_convert(): Only try to free bs[] entries if bs is valid Kevin Wolf
@ 2010-12-09 11:10 ` Kevin Wolf
2010-12-09 11:10 ` [Qemu-devel] [PATCH 06/14] Fix formatting and missing braces in qemu-img.c Kevin Wolf
` (10 subsequent siblings)
15 siblings, 0 replies; 28+ messages in thread
From: Kevin Wolf @ 2010-12-09 11:10 UTC (permalink / raw)
To: anthony; +Cc: kwolf, qemu-devel
From: Jes Sorensen <Jes.Sorensen@redhat.com>
This consolidates the printing of block driver options in
print_block_option_help() which is called from both img_create() and
img_convert().
This allows for the "?" detection to be done just after the parsing of
options and the filename, instead of half way down the codepath of
these functions.
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
qemu-img.c | 46 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 37 insertions(+), 9 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index aded72d..50cfdda 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -188,6 +188,33 @@ static int read_password(char *buf, int buf_size)
}
#endif
+static int print_block_option_help(const char *filename, const char *fmt)
+{
+ BlockDriver *drv, *proto_drv;
+ QEMUOptionParameter *create_options = NULL;
+
+ /* Find driver and parse its options */
+ drv = bdrv_find_format(fmt);
+ if (!drv) {
+ error("Unknown file format '%s'", fmt);
+ return 1;
+ }
+
+ proto_drv = bdrv_find_protocol(filename);
+ if (!proto_drv) {
+ error("Unknown protocol '%s'", filename);
+ return 1;
+ }
+
+ create_options = append_option_parameters(create_options,
+ drv->create_options);
+ create_options = append_option_parameters(create_options,
+ proto_drv->create_options);
+ print_option_help(create_options);
+ free_option_parameters(create_options);
+ return 0;
+}
+
static BlockDriverState *bdrv_new_open(const char *filename,
const char *fmt,
int flags)
@@ -310,6 +337,11 @@ static int img_create(int argc, char **argv)
help();
filename = argv[optind++];
+ if (options && !strcmp(options, "?")) {
+ ret = print_block_option_help(filename, fmt);
+ goto out;
+ }
+
/* Find driver and parse its options */
drv = bdrv_find_format(fmt);
if (!drv) {
@@ -328,11 +360,6 @@ static int img_create(int argc, char **argv)
create_options = append_option_parameters(create_options,
proto_drv->create_options);
- if (options && !strcmp(options, "?")) {
- print_option_help(create_options);
- goto out;
- }
-
/* Create parameter list with default values */
param = parse_option_parameters("", create_options, param);
set_option_parameter_int(param, BLOCK_OPT_SIZE, -1);
@@ -694,6 +721,11 @@ static int img_convert(int argc, char **argv)
out_filename = argv[argc - 1];
+ if (options && !strcmp(options, "?")) {
+ ret = print_block_option_help(out_filename, out_fmt);
+ goto out;
+ }
+
if (bs_n > 1 && out_baseimg) {
error("-B makes no sense when concatenating multiple input images");
ret = -1;
@@ -746,10 +778,6 @@ static int img_convert(int argc, char **argv)
drv->create_options);
create_options = append_option_parameters(create_options,
proto_drv->create_options);
- if (options && !strcmp(options, "?")) {
- print_option_help(create_options);
- goto out;
- }
if (options) {
param = parse_option_parameters(options, create_options, param);
--
1.7.2.3
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [Qemu-devel] [PATCH 06/14] Fix formatting and missing braces in qemu-img.c
2010-12-09 11:09 [Qemu-devel] [PULL 00/14] Block patches Kevin Wolf
` (4 preceding siblings ...)
2010-12-09 11:10 ` [Qemu-devel] [PATCH 05/14] Consolidate printing of block driver options Kevin Wolf
@ 2010-12-09 11:10 ` Kevin Wolf
2010-12-09 11:10 ` [Qemu-devel] [PATCH 07/14] Fail if detecting an unknown option Kevin Wolf
` (9 subsequent siblings)
15 siblings, 0 replies; 28+ messages in thread
From: Kevin Wolf @ 2010-12-09 11:10 UTC (permalink / raw)
To: anthony; +Cc: kwolf, qemu-devel
From: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
qemu-img.c | 77 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 51 insertions(+), 26 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index 50cfdda..cc77048 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -305,8 +305,9 @@ static int img_create(int argc, char **argv)
flags = 0;
for(;;) {
c = getopt(argc, argv, "F:b:f:he6o:");
- if (c == -1)
+ if (c == -1) {
break;
+ }
switch(c) {
case 'h':
help();
@@ -333,8 +334,9 @@ static int img_create(int argc, char **argv)
}
/* Get the filename */
- if (optind >= argc)
+ if (optind >= argc) {
help();
+ }
filename = argv[optind++];
if (options && !strcmp(options, "?")) {
@@ -471,8 +473,9 @@ static int img_check(int argc, char **argv)
fmt = NULL;
for(;;) {
c = getopt(argc, argv, "f:h");
- if (c == -1)
+ if (c == -1) {
break;
+ }
switch(c) {
case 'h':
help();
@@ -482,8 +485,9 @@ static int img_check(int argc, char **argv)
break;
}
}
- if (optind >= argc)
+ if (optind >= argc) {
help();
+ }
filename = argv[optind++];
bs = bdrv_new_open(filename, fmt, BDRV_O_FLAGS);
@@ -547,8 +551,9 @@ static int img_commit(int argc, char **argv)
fmt = NULL;
for(;;) {
c = getopt(argc, argv, "f:h");
- if (c == -1)
+ if (c == -1) {
break;
+ }
switch(c) {
case 'h':
help();
@@ -558,8 +563,9 @@ static int img_commit(int argc, char **argv)
break;
}
}
- if (optind >= argc)
+ if (optind >= argc) {
help();
+ }
filename = argv[optind++];
bs = bdrv_new_open(filename, fmt, BDRV_O_FLAGS | BDRV_O_RDWR);
@@ -683,8 +689,9 @@ static int img_convert(int argc, char **argv)
flags = 0;
for(;;) {
c = getopt(argc, argv, "f:O:B:s:hce6o:");
- if (c == -1)
+ if (c == -1) {
break;
+ }
switch(c) {
case 'h':
help();
@@ -717,7 +724,9 @@ static int img_convert(int argc, char **argv)
}
bs_n = argc - optind - 1;
- if (bs_n < 1) help();
+ if (bs_n < 1) {
+ help();
+ }
out_filename = argv[argc - 1];
@@ -905,8 +914,9 @@ static int img_convert(int argc, char **argv)
}
assert (remainder == 0);
- if (n < cluster_sectors)
+ if (n < cluster_sectors) {
memset(buf + n * 512, 0, cluster_size - n * 512);
+ }
if (is_not_zero(buf, cluster_size)) {
ret = bdrv_write_compressed(out_bs, sector_num, buf,
cluster_sectors);
@@ -926,12 +936,14 @@ static int img_convert(int argc, char **argv)
sector_num = 0; // total number of sectors converted so far
for(;;) {
nb_sectors = total_sectors - sector_num;
- if (nb_sectors <= 0)
+ if (nb_sectors <= 0) {
break;
- if (nb_sectors >= (IO_BUF_SIZE / 512))
+ }
+ if (nb_sectors >= (IO_BUF_SIZE / 512)) {
n = (IO_BUF_SIZE / 512);
- else
+ } else {
n = nb_sectors;
+ }
while (sector_num - bs_offset >= bs_sectors) {
bs_i ++;
@@ -943,8 +955,9 @@ static int img_convert(int argc, char **argv)
sector_num, bs_i, bs_offset, bs_sectors); */
}
- if (n > bs_offset + bs_sectors - sector_num)
+ if (n > bs_offset + bs_sectors - sector_num) {
n = bs_offset + bs_sectors - sector_num;
+ }
if (has_zero_init) {
/* If the output image is being created as a copy on write image,
@@ -1080,8 +1093,9 @@ static int img_info(int argc, char **argv)
fmt = NULL;
for(;;) {
c = getopt(argc, argv, "f:h");
- if (c == -1)
+ if (c == -1) {
break;
+ }
switch(c) {
case 'h':
help();
@@ -1091,8 +1105,9 @@ static int img_info(int argc, char **argv)
break;
}
}
- if (optind >= argc)
+ if (optind >= argc) {
help();
+ }
filename = argv[optind++];
bs = bdrv_new_open(filename, fmt, BDRV_O_FLAGS | BDRV_O_NO_BACKING);
@@ -1103,11 +1118,12 @@ static int img_info(int argc, char **argv)
bdrv_get_geometry(bs, &total_sectors);
get_human_readable_size(size_buf, sizeof(size_buf), total_sectors * 512);
allocated_size = get_allocated_file_size(filename);
- if (allocated_size < 0)
+ if (allocated_size < 0) {
snprintf(dsize_buf, sizeof(dsize_buf), "unavailable");
- else
+ } else {
get_human_readable_size(dsize_buf, sizeof(dsize_buf),
allocated_size);
+ }
printf("image: %s\n"
"file format: %s\n"
"virtual size: %s (%" PRId64 " bytes)\n"
@@ -1115,11 +1131,13 @@ static int img_info(int argc, char **argv)
filename, fmt_name, size_buf,
(total_sectors * 512),
dsize_buf);
- if (bdrv_is_encrypted(bs))
+ if (bdrv_is_encrypted(bs)) {
printf("encrypted: yes\n");
+ }
if (bdrv_get_info(bs, &bdi) >= 0) {
- if (bdi.cluster_size != 0)
+ if (bdi.cluster_size != 0) {
printf("cluster_size: %d\n", bdi.cluster_size);
+ }
}
bdrv_get_backing_filename(bs, backing_filename, sizeof(backing_filename));
if (backing_filename[0] != '\0') {
@@ -1152,8 +1170,9 @@ static int img_snapshot(int argc, char **argv)
/* Parse commandline parameters */
for(;;) {
c = getopt(argc, argv, "la:c:d:h");
- if (c == -1)
+ if (c == -1) {
break;
+ }
switch(c) {
case 'h':
help();
@@ -1193,8 +1212,9 @@ static int img_snapshot(int argc, char **argv)
}
}
- if (optind >= argc)
+ if (optind >= argc) {
help();
+ }
filename = argv[optind++];
/* Open the image */
@@ -1218,23 +1238,26 @@ static int img_snapshot(int argc, char **argv)
sn.date_nsec = tv.tv_usec * 1000;
ret = bdrv_snapshot_create(bs, &sn);
- if (ret)
+ if (ret) {
error("Could not create snapshot '%s': %d (%s)",
snapshot_name, ret, strerror(-ret));
+ }
break;
case SNAPSHOT_APPLY:
ret = bdrv_snapshot_goto(bs, snapshot_name);
- if (ret)
+ if (ret) {
error("Could not apply snapshot '%s': %d (%s)",
snapshot_name, ret, strerror(-ret));
+ }
break;
case SNAPSHOT_DELETE:
ret = bdrv_snapshot_delete(bs, snapshot_name);
- if (ret)
+ if (ret) {
error("Could not delete snapshot '%s': %d (%s)",
snapshot_name, ret, strerror(-ret));
+ }
break;
}
@@ -1262,8 +1285,9 @@ static int img_rebase(int argc, char **argv)
for(;;) {
c = getopt(argc, argv, "uhf:F:b:");
- if (c == -1)
+ if (c == -1) {
break;
+ }
switch(c) {
case 'h':
help();
@@ -1283,8 +1307,9 @@ static int img_rebase(int argc, char **argv)
}
}
- if ((optind >= argc) || !out_baseimg)
+ if ((optind >= argc) || !out_baseimg) {
help();
+ }
filename = argv[optind++];
/*
--
1.7.2.3
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [Qemu-devel] [PATCH 07/14] Fail if detecting an unknown option
2010-12-09 11:09 [Qemu-devel] [PULL 00/14] Block patches Kevin Wolf
` (5 preceding siblings ...)
2010-12-09 11:10 ` [Qemu-devel] [PATCH 06/14] Fix formatting and missing braces in qemu-img.c Kevin Wolf
@ 2010-12-09 11:10 ` Kevin Wolf
2010-12-09 11:10 ` [Qemu-devel] [PATCH 08/14] Make error handling more consistent in img_create() and img_resize() Kevin Wolf
` (8 subsequent siblings)
15 siblings, 0 replies; 28+ messages in thread
From: Kevin Wolf @ 2010-12-09 11:10 UTC (permalink / raw)
To: anthony; +Cc: kwolf, qemu-devel
From: Jes Sorensen <Jes.Sorensen@redhat.com>
This patch changes qemu-img to exit if an unknown option is detected,
instead of trying to continue with a set of arguments which may be
incorrect.
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
qemu-img.c | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index cc77048..6fd52e9 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -309,6 +309,7 @@ static int img_create(int argc, char **argv)
break;
}
switch(c) {
+ case '?':
case 'h':
help();
break;
@@ -477,6 +478,7 @@ static int img_check(int argc, char **argv)
break;
}
switch(c) {
+ case '?':
case 'h':
help();
break;
@@ -555,6 +557,7 @@ static int img_commit(int argc, char **argv)
break;
}
switch(c) {
+ case '?':
case 'h':
help();
break;
@@ -693,6 +696,7 @@ static int img_convert(int argc, char **argv)
break;
}
switch(c) {
+ case '?':
case 'h':
help();
break;
@@ -1097,6 +1101,7 @@ static int img_info(int argc, char **argv)
break;
}
switch(c) {
+ case '?':
case 'h':
help();
break;
@@ -1174,6 +1179,7 @@ static int img_snapshot(int argc, char **argv)
break;
}
switch(c) {
+ case '?':
case 'h':
help();
return 0;
@@ -1289,6 +1295,7 @@ static int img_rebase(int argc, char **argv)
break;
}
switch(c) {
+ case '?':
case 'h':
help();
return 0;
@@ -1503,6 +1510,7 @@ static int img_resize(int argc, char **argv)
break;
}
switch(c) {
+ case '?':
case 'h':
help();
break;
--
1.7.2.3
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [Qemu-devel] [PATCH 08/14] Make error handling more consistent in img_create() and img_resize()
2010-12-09 11:09 [Qemu-devel] [PULL 00/14] Block patches Kevin Wolf
` (6 preceding siblings ...)
2010-12-09 11:10 ` [Qemu-devel] [PATCH 07/14] Fail if detecting an unknown option Kevin Wolf
@ 2010-12-09 11:10 ` Kevin Wolf
2010-12-09 11:10 ` [Qemu-devel] [PATCH 09/14] ceph/rbd block driver for qemu-kvm Kevin Wolf
` (7 subsequent siblings)
15 siblings, 0 replies; 28+ messages in thread
From: Kevin Wolf @ 2010-12-09 11:10 UTC (permalink / raw)
To: anthony; +Cc: kwolf, qemu-devel
From: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
qemu-img.c | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index 6fd52e9..5b6e648 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -349,13 +349,15 @@ static int img_create(int argc, char **argv)
drv = bdrv_find_format(fmt);
if (!drv) {
error("Unknown file format '%s'", fmt);
- return 1;
+ ret = -1;
+ goto out;
}
proto_drv = bdrv_find_protocol(filename);
if (!proto_drv) {
error("Unknown protocol '%s'", filename);
- return 1;
+ ret = -1;
+ goto out;
}
create_options = append_option_parameters(create_options,
@@ -1492,7 +1494,7 @@ static int img_resize(int argc, char **argv)
int c, ret, relative;
const char *filename, *fmt, *size;
int64_t n, total_size;
- BlockDriverState *bs;
+ BlockDriverState *bs = NULL;
QEMUOptionParameter *param;
QEMUOptionParameter resize_options[] = {
{
@@ -1544,14 +1546,16 @@ static int img_resize(int argc, char **argv)
param = parse_option_parameters("", resize_options, NULL);
if (set_option_parameter(param, BLOCK_OPT_SIZE, size)) {
/* Error message already printed when size parsing fails */
- exit(1);
+ ret = -1;
+ goto out;
}
n = get_option_parameter(param, BLOCK_OPT_SIZE)->value.n;
free_option_parameters(param);
bs = bdrv_new_open(filename, fmt, BDRV_O_FLAGS | BDRV_O_RDWR);
if (!bs) {
- return 1;
+ ret = -1;
+ goto out;
}
if (relative) {
@@ -1581,7 +1585,9 @@ static int img_resize(int argc, char **argv)
break;
}
out:
- bdrv_delete(bs);
+ if (bs) {
+ bdrv_delete(bs);
+ }
if (ret) {
return 1;
}
--
1.7.2.3
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [Qemu-devel] [PATCH 09/14] ceph/rbd block driver for qemu-kvm
2010-12-09 11:09 [Qemu-devel] [PULL 00/14] Block patches Kevin Wolf
` (7 preceding siblings ...)
2010-12-09 11:10 ` [Qemu-devel] [PATCH 08/14] Make error handling more consistent in img_create() and img_resize() Kevin Wolf
@ 2010-12-09 11:10 ` Kevin Wolf
2010-12-09 11:10 ` [Qemu-devel] [PATCH 10/14] qemu-img: Deprecate obsolete -6 and -e options Kevin Wolf
` (6 subsequent siblings)
15 siblings, 0 replies; 28+ messages in thread
From: Kevin Wolf @ 2010-12-09 11:10 UTC (permalink / raw)
To: anthony; +Cc: kwolf, qemu-devel
From: Christian Brunner <chb@muc.de>
RBD is an block driver for the distributed file system Ceph
(http://ceph.newdream.net/). This driver uses librados (which is part
of the Ceph server) for direct access to the Ceph object store and is
running entirely in userspace (Yehuda also wrote a driver for the
linux kernel, that can be used to access rbd volumes as a block
device).
Signed-off-by: Yehuda Sadeh <yehuda@hq.newdream.net>
Signed-off-by: Christian Brunner <chb@muc.de>
Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
Makefile.objs | 1 +
block/rbd.c | 1059 +++++++++++++++++++++++++++++++++++++++++++++++++++++
block/rbd_types.h | 71 ++++
configure | 52 +++
4 files changed, 1183 insertions(+), 0 deletions(-)
create mode 100644 block/rbd.c
create mode 100644 block/rbd_types.h
diff --git a/Makefile.objs b/Makefile.objs
index 04625eb..5c56a07 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -24,6 +24,7 @@ block-nested-y += parallels.o nbd.o blkdebug.o sheepdog.o blkverify.o
block-nested-$(CONFIG_WIN32) += raw-win32.o
block-nested-$(CONFIG_POSIX) += raw-posix.o
block-nested-$(CONFIG_CURL) += curl.o
+block-nested-$(CONFIG_RBD) += rbd.o
block-obj-y += $(addprefix block/, $(block-nested-y))
diff --git a/block/rbd.c b/block/rbd.c
new file mode 100644
index 0000000..249a590
--- /dev/null
+++ b/block/rbd.c
@@ -0,0 +1,1059 @@
+/*
+ * QEMU Block driver for RADOS (Ceph)
+ *
+ * Copyright (C) 2010 Christian Brunner <chb@muc.de>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2. See
+ * the COPYING file in the top-level directory.
+ *
+ */
+
+#include "qemu-common.h"
+#include "qemu-error.h"
+
+#include "rbd_types.h"
+#include "block_int.h"
+
+#include <rados/librados.h>
+
+
+
+/*
+ * When specifying the image filename use:
+ *
+ * rbd:poolname/devicename
+ *
+ * poolname must be the name of an existing rados pool
+ *
+ * devicename is the basename for all objects used to
+ * emulate the raw device.
+ *
+ * Metadata information (image size, ...) is stored in an
+ * object with the name "devicename.rbd".
+ *
+ * The raw device is split into 4MB sized objects by default.
+ * The sequencenumber is encoded in a 12 byte long hex-string,
+ * and is attached to the devicename, separated by a dot.
+ * e.g. "devicename.1234567890ab"
+ *
+ */
+
+#define OBJ_MAX_SIZE (1UL << OBJ_DEFAULT_OBJ_ORDER)
+
+typedef struct RBDAIOCB {
+ BlockDriverAIOCB common;
+ QEMUBH *bh;
+ int ret;
+ QEMUIOVector *qiov;
+ char *bounce;
+ int write;
+ int64_t sector_num;
+ int aiocnt;
+ int error;
+ struct BDRVRBDState *s;
+ int cancelled;
+} RBDAIOCB;
+
+typedef struct RADOSCB {
+ int rcbid;
+ RBDAIOCB *acb;
+ struct BDRVRBDState *s;
+ int done;
+ int64_t segsize;
+ char *buf;
+ int ret;
+} RADOSCB;
+
+#define RBD_FD_READ 0
+#define RBD_FD_WRITE 1
+
+typedef struct BDRVRBDState {
+ int fds[2];
+ rados_pool_t pool;
+ rados_pool_t header_pool;
+ char name[RBD_MAX_OBJ_NAME_SIZE];
+ char block_name[RBD_MAX_BLOCK_NAME_SIZE];
+ uint64_t size;
+ uint64_t objsize;
+ int qemu_aio_count;
+ int event_reader_pos;
+ RADOSCB *event_rcb;
+} BDRVRBDState;
+
+typedef struct rbd_obj_header_ondisk RbdHeader1;
+
+static void rbd_aio_bh_cb(void *opaque);
+
+static int rbd_next_tok(char *dst, int dst_len,
+ char *src, char delim,
+ const char *name,
+ char **p)
+{
+ int l;
+ char *end;
+
+ *p = NULL;
+
+ if (delim != '\0') {
+ end = strchr(src, delim);
+ if (end) {
+ *p = end + 1;
+ *end = '\0';
+ }
+ }
+ l = strlen(src);
+ if (l >= dst_len) {
+ error_report("%s too long", name);
+ return -EINVAL;
+ } else if (l == 0) {
+ error_report("%s too short", name);
+ return -EINVAL;
+ }
+
+ pstrcpy(dst, dst_len, src);
+
+ return 0;
+}
+
+static int rbd_parsename(const char *filename,
+ char *pool, int pool_len,
+ char *snap, int snap_len,
+ char *name, int name_len)
+{
+ const char *start;
+ char *p, *buf;
+ int ret;
+
+ if (!strstart(filename, "rbd:", &start)) {
+ return -EINVAL;
+ }
+
+ buf = qemu_strdup(start);
+ p = buf;
+
+ ret = rbd_next_tok(pool, pool_len, p, '/', "pool name", &p);
+ if (ret < 0 || !p) {
+ ret = -EINVAL;
+ goto done;
+ }
+ ret = rbd_next_tok(name, name_len, p, '@', "object name", &p);
+ if (ret < 0) {
+ goto done;
+ }
+ if (!p) {
+ *snap = '\0';
+ goto done;
+ }
+
+ ret = rbd_next_tok(snap, snap_len, p, '\0', "snap name", &p);
+
+done:
+ qemu_free(buf);
+ return ret;
+}
+
+static int create_tmap_op(uint8_t op, const char *name, char **tmap_desc)
+{
+ uint32_t len = strlen(name);
+ uint32_t len_le = cpu_to_le32(len);
+ /* total_len = encoding op + name + empty buffer */
+ uint32_t total_len = 1 + (sizeof(uint32_t) + len) + sizeof(uint32_t);
+ uint8_t *desc = NULL;
+
+ desc = qemu_malloc(total_len);
+
+ *tmap_desc = (char *)desc;
+
+ *desc = op;
+ desc++;
+ memcpy(desc, &len_le, sizeof(len_le));
+ desc += sizeof(len_le);
+ memcpy(desc, name, len);
+ desc += len;
+ len = 0; /* no need for endian conversion for 0 */
+ memcpy(desc, &len, sizeof(len));
+ desc += sizeof(len);
+
+ return (char *)desc - *tmap_desc;
+}
+
+static void free_tmap_op(char *tmap_desc)
+{
+ qemu_free(tmap_desc);
+}
+
+static int rbd_register_image(rados_pool_t pool, const char *name)
+{
+ char *tmap_desc;
+ const char *dir = RBD_DIRECTORY;
+ int ret;
+
+ ret = create_tmap_op(CEPH_OSD_TMAP_SET, name, &tmap_desc);
+ if (ret < 0) {
+ return ret;
+ }
+
+ ret = rados_tmap_update(pool, dir, tmap_desc, ret);
+ free_tmap_op(tmap_desc);
+
+ return ret;
+}
+
+static int touch_rbd_info(rados_pool_t pool, const char *info_oid)
+{
+ int r = rados_write(pool, info_oid, 0, NULL, 0);
+ if (r < 0) {
+ return r;
+ }
+ return 0;
+}
+
+static int rbd_assign_bid(rados_pool_t pool, uint64_t *id)
+{
+ uint64_t out[1];
+ const char *info_oid = RBD_INFO;
+
+ *id = 0;
+
+ int r = touch_rbd_info(pool, info_oid);
+ if (r < 0) {
+ return r;
+ }
+
+ r = rados_exec(pool, info_oid, "rbd", "assign_bid", NULL,
+ 0, (char *)out, sizeof(out));
+ if (r < 0) {
+ return r;
+ }
+
+ le64_to_cpus(out);
+ *id = out[0];
+
+ return 0;
+}
+
+static int rbd_create(const char *filename, QEMUOptionParameter *options)
+{
+ int64_t bytes = 0;
+ int64_t objsize;
+ uint64_t size;
+ time_t mtime;
+ uint8_t obj_order = RBD_DEFAULT_OBJ_ORDER;
+ char pool[RBD_MAX_SEG_NAME_SIZE];
+ char n[RBD_MAX_SEG_NAME_SIZE];
+ char name[RBD_MAX_OBJ_NAME_SIZE];
+ char snap_buf[RBD_MAX_SEG_NAME_SIZE];
+ char *snap = NULL;
+ RbdHeader1 header;
+ rados_pool_t p;
+ uint64_t bid;
+ uint32_t hi, lo;
+ int ret;
+
+ if (rbd_parsename(filename,
+ pool, sizeof(pool),
+ snap_buf, sizeof(snap_buf),
+ name, sizeof(name)) < 0) {
+ return -EINVAL;
+ }
+ if (snap_buf[0] != '\0') {
+ snap = snap_buf;
+ }
+
+ snprintf(n, sizeof(n), "%s%s", name, RBD_SUFFIX);
+
+ /* Read out options */
+ while (options && options->name) {
+ if (!strcmp(options->name, BLOCK_OPT_SIZE)) {
+ bytes = options->value.n;
+ } else if (!strcmp(options->name, BLOCK_OPT_CLUSTER_SIZE)) {
+ if (options->value.n) {
+ objsize = options->value.n;
+ if ((objsize - 1) & objsize) { /* not a power of 2? */
+ error_report("obj size needs to be power of 2");
+ return -EINVAL;
+ }
+ if (objsize < 4096) {
+ error_report("obj size too small");
+ return -EINVAL;
+ }
+ obj_order = ffs(objsize) - 1;
+ }
+ }
+ options++;
+ }
+
+ memset(&header, 0, sizeof(header));
+ pstrcpy(header.text, sizeof(header.text), RBD_HEADER_TEXT);
+ pstrcpy(header.signature, sizeof(header.signature), RBD_HEADER_SIGNATURE);
+ pstrcpy(header.version, sizeof(header.version), RBD_HEADER_VERSION);
+ header.image_size = cpu_to_le64(bytes);
+ header.options.order = obj_order;
+ header.options.crypt_type = RBD_CRYPT_NONE;
+ header.options.comp_type = RBD_COMP_NONE;
+ header.snap_seq = 0;
+ header.snap_count = 0;
+
+ if (rados_initialize(0, NULL) < 0) {
+ error_report("error initializing");
+ return -EIO;
+ }
+
+ if (rados_open_pool(pool, &p)) {
+ error_report("error opening pool %s", pool);
+ rados_deinitialize();
+ return -EIO;
+ }
+
+ /* check for existing rbd header file */
+ ret = rados_stat(p, n, &size, &mtime);
+ if (ret == 0) {
+ ret=-EEXIST;
+ goto done;
+ }
+
+ ret = rbd_assign_bid(p, &bid);
+ if (ret < 0) {
+ error_report("failed assigning block id");
+ rados_deinitialize();
+ return -EIO;
+ }
+ hi = bid >> 32;
+ lo = bid & 0xFFFFFFFF;
+ snprintf(header.block_name, sizeof(header.block_name), "rb.%x.%x", hi, lo);
+
+ /* create header file */
+ ret = rados_write(p, n, 0, (const char *)&header, sizeof(header));
+ if (ret < 0) {
+ goto done;
+ }
+
+ ret = rbd_register_image(p, name);
+done:
+ rados_close_pool(p);
+ rados_deinitialize();
+
+ return ret;
+}
+
+/*
+ * This aio completion is being called from rbd_aio_event_reader() and
+ * runs in qemu context. It schedules a bh, but just in case the aio
+ * was not cancelled before.
+ */
+static void rbd_complete_aio(RADOSCB *rcb)
+{
+ RBDAIOCB *acb = rcb->acb;
+ int64_t r;
+
+ acb->aiocnt--;
+
+ if (acb->cancelled) {
+ if (!acb->aiocnt) {
+ qemu_vfree(acb->bounce);
+ qemu_aio_release(acb);
+ }
+ goto done;
+ }
+
+ r = rcb->ret;
+
+ if (acb->write) {
+ if (r < 0) {
+ acb->ret = r;
+ acb->error = 1;
+ } else if (!acb->error) {
+ acb->ret += rcb->segsize;
+ }
+ } else {
+ if (r == -ENOENT) {
+ memset(rcb->buf, 0, rcb->segsize);
+ if (!acb->error) {
+ acb->ret += rcb->segsize;
+ }
+ } else if (r < 0) {
+ memset(rcb->buf, 0, rcb->segsize);
+ acb->ret = r;
+ acb->error = 1;
+ } else if (r < rcb->segsize) {
+ memset(rcb->buf + r, 0, rcb->segsize - r);
+ if (!acb->error) {
+ acb->ret += rcb->segsize;
+ }
+ } else if (!acb->error) {
+ acb->ret += r;
+ }
+ }
+ /* Note that acb->bh can be NULL in case where the aio was cancelled */
+ if (!acb->aiocnt) {
+ acb->bh = qemu_bh_new(rbd_aio_bh_cb, acb);
+ qemu_bh_schedule(acb->bh);
+ }
+done:
+ qemu_free(rcb);
+}
+
+/*
+ * aio fd read handler. It runs in the qemu context and calls the
+ * completion handling of completed rados aio operations.
+ */
+static void rbd_aio_event_reader(void *opaque)
+{
+ BDRVRBDState *s = opaque;
+
+ ssize_t ret;
+
+ do {
+ char *p = (char *)&s->event_rcb;
+
+ /* now read the rcb pointer that was sent from a non qemu thread */
+ if ((ret = read(s->fds[RBD_FD_READ], p + s->event_reader_pos,
+ sizeof(s->event_rcb) - s->event_reader_pos)) > 0) {
+ if (ret > 0) {
+ s->event_reader_pos += ret;
+ if (s->event_reader_pos == sizeof(s->event_rcb)) {
+ s->event_reader_pos = 0;
+ rbd_complete_aio(s->event_rcb);
+ s->qemu_aio_count --;
+ }
+ }
+ }
+ } while (ret < 0 && errno == EINTR);
+}
+
+static int rbd_aio_flush_cb(void *opaque)
+{
+ BDRVRBDState *s = opaque;
+
+ return (s->qemu_aio_count > 0);
+}
+
+
+static int rbd_set_snapc(rados_pool_t pool, const char *snap, RbdHeader1 *header)
+{
+ uint32_t snap_count = le32_to_cpu(header->snap_count);
+ rados_snap_t *snaps = NULL;
+ rados_snap_t seq;
+ uint32_t i;
+ uint64_t snap_names_len = le64_to_cpu(header->snap_names_len);
+ int r;
+ rados_snap_t snapid = 0;
+
+ if (snap_count) {
+ const char *header_snap = (const char *)&header->snaps[snap_count];
+ const char *end = header_snap + snap_names_len;
+ snaps = qemu_malloc(sizeof(rados_snap_t) * header->snap_count);
+
+ for (i=0; i < snap_count; i++) {
+ snaps[i] = le64_to_cpu(header->snaps[i].id);
+
+ if (snap && strcmp(snap, header_snap) == 0) {
+ snapid = snaps[i];
+ }
+
+ header_snap += strlen(header_snap) + 1;
+ if (header_snap > end) {
+ error_report("bad header, snapshot list broken");
+ }
+ }
+ }
+
+ if (snap && !snapid) {
+ error_report("snapshot not found");
+ qemu_free(snaps);
+ return -ENOENT;
+ }
+ seq = le32_to_cpu(header->snap_seq);
+
+ r = rados_set_snap_context(pool, seq, snaps, snap_count);
+
+ rados_set_snap(pool, snapid);
+
+ qemu_free(snaps);
+
+ return r;
+}
+
+#define BUF_READ_START_LEN 4096
+
+static int rbd_read_header(BDRVRBDState *s, char **hbuf)
+{
+ char *buf = NULL;
+ char n[RBD_MAX_SEG_NAME_SIZE];
+ uint64_t len = BUF_READ_START_LEN;
+ int r;
+
+ snprintf(n, sizeof(n), "%s%s", s->name, RBD_SUFFIX);
+
+ buf = qemu_malloc(len);
+
+ r = rados_read(s->header_pool, n, 0, buf, len);
+ if (r < 0) {
+ goto failed;
+ }
+
+ if (r < len) {
+ goto done;
+ }
+
+ qemu_free(buf);
+ buf = qemu_malloc(len);
+
+ r = rados_stat(s->header_pool, n, &len, NULL);
+ if (r < 0) {
+ goto failed;
+ }
+
+ r = rados_read(s->header_pool, n, 0, buf, len);
+ if (r < 0) {
+ goto failed;
+ }
+
+done:
+ *hbuf = buf;
+ return 0;
+
+failed:
+ qemu_free(buf);
+ return r;
+}
+
+static int rbd_open(BlockDriverState *bs, const char *filename, int flags)
+{
+ BDRVRBDState *s = bs->opaque;
+ RbdHeader1 *header;
+ char pool[RBD_MAX_SEG_NAME_SIZE];
+ char snap_buf[RBD_MAX_SEG_NAME_SIZE];
+ char *snap = NULL;
+ char *hbuf = NULL;
+ int r;
+
+ if (rbd_parsename(filename, pool, sizeof(pool),
+ snap_buf, sizeof(snap_buf),
+ s->name, sizeof(s->name)) < 0) {
+ return -EINVAL;
+ }
+ if (snap_buf[0] != '\0') {
+ snap = snap_buf;
+ }
+
+ if ((r = rados_initialize(0, NULL)) < 0) {
+ error_report("error initializing");
+ return r;
+ }
+
+ if ((r = rados_open_pool(pool, &s->pool))) {
+ error_report("error opening pool %s", pool);
+ rados_deinitialize();
+ return r;
+ }
+
+ if ((r = rados_open_pool(pool, &s->header_pool))) {
+ error_report("error opening pool %s", pool);
+ rados_deinitialize();
+ return r;
+ }
+
+ if ((r = rbd_read_header(s, &hbuf)) < 0) {
+ error_report("error reading header from %s", s->name);
+ goto failed;
+ }
+
+ if (memcmp(hbuf + 64, RBD_HEADER_SIGNATURE, 4)) {
+ error_report("Invalid header signature");
+ r = -EMEDIUMTYPE;
+ goto failed;
+ }
+
+ if (memcmp(hbuf + 68, RBD_HEADER_VERSION, 8)) {
+ error_report("Unknown image version");
+ r = -EMEDIUMTYPE;
+ goto failed;
+ }
+
+ header = (RbdHeader1 *) hbuf;
+ s->size = le64_to_cpu(header->image_size);
+ s->objsize = 1ULL << header->options.order;
+ memcpy(s->block_name, header->block_name, sizeof(header->block_name));
+
+ r = rbd_set_snapc(s->pool, snap, header);
+ if (r < 0) {
+ error_report("failed setting snap context: %s", strerror(-r));
+ goto failed;
+ }
+
+ bs->read_only = (snap != NULL);
+
+ s->event_reader_pos = 0;
+ r = qemu_pipe(s->fds);
+ if (r < 0) {
+ error_report("error opening eventfd");
+ goto failed;
+ }
+ fcntl(s->fds[0], F_SETFL, O_NONBLOCK);
+ fcntl(s->fds[1], F_SETFL, O_NONBLOCK);
+ qemu_aio_set_fd_handler(s->fds[RBD_FD_READ], rbd_aio_event_reader, NULL,
+ rbd_aio_flush_cb, NULL, s);
+
+ qemu_free(hbuf);
+
+ return 0;
+
+failed:
+ qemu_free(hbuf);
+
+ rados_close_pool(s->header_pool);
+ rados_close_pool(s->pool);
+ rados_deinitialize();
+ return r;
+}
+
+static void rbd_close(BlockDriverState *bs)
+{
+ BDRVRBDState *s = bs->opaque;
+
+ close(s->fds[0]);
+ close(s->fds[1]);
+ qemu_aio_set_fd_handler(s->fds[RBD_FD_READ], NULL , NULL, NULL, NULL,
+ NULL);
+
+ rados_close_pool(s->header_pool);
+ rados_close_pool(s->pool);
+ rados_deinitialize();
+}
+
+/*
+ * Cancel aio. Since we don't reference acb in a non qemu threads,
+ * it is safe to access it here.
+ */
+static void rbd_aio_cancel(BlockDriverAIOCB *blockacb)
+{
+ RBDAIOCB *acb = (RBDAIOCB *) blockacb;
+ acb->cancelled = 1;
+}
+
+static AIOPool rbd_aio_pool = {
+ .aiocb_size = sizeof(RBDAIOCB),
+ .cancel = rbd_aio_cancel,
+};
+
+/*
+ * This is the callback function for rados_aio_read and _write
+ *
+ * Note: this function is being called from a non qemu thread so
+ * we need to be careful about what we do here. Generally we only
+ * write to the block notification pipe, and do the rest of the
+ * io completion handling from rbd_aio_event_reader() which
+ * runs in a qemu context.
+ */
+static void rbd_finish_aiocb(rados_completion_t c, RADOSCB *rcb)
+{
+ int ret;
+ rcb->ret = rados_aio_get_return_value(c);
+ rados_aio_release(c);
+ while (1) {
+ fd_set wfd;
+ int fd = rcb->s->fds[RBD_FD_WRITE];
+
+ /* send the rcb pointer to the qemu thread that is responsible
+ for the aio completion. Must do it in a qemu thread context */
+ ret = write(fd, (void *)&rcb, sizeof(rcb));
+ if (ret >= 0) {
+ break;
+ }
+ if (errno == EINTR) {
+ continue;
+ }
+ if (errno != EAGAIN) {
+ break;
+ }
+
+ FD_ZERO(&wfd);
+ FD_SET(fd, &wfd);
+ do {
+ ret = select(fd + 1, NULL, &wfd, NULL, NULL);
+ } while (ret < 0 && errno == EINTR);
+ }
+
+ if (ret < 0) {
+ error_report("failed writing to acb->s->fds\n");
+ qemu_free(rcb);
+ }
+}
+
+/* Callback when all queued rados_aio requests are complete */
+
+static void rbd_aio_bh_cb(void *opaque)
+{
+ RBDAIOCB *acb = opaque;
+
+ if (!acb->write) {
+ qemu_iovec_from_buffer(acb->qiov, acb->bounce, acb->qiov->size);
+ }
+ qemu_vfree(acb->bounce);
+ acb->common.cb(acb->common.opaque, (acb->ret > 0 ? 0 : acb->ret));
+ qemu_bh_delete(acb->bh);
+ acb->bh = NULL;
+
+ qemu_aio_release(acb);
+}
+
+static BlockDriverAIOCB *rbd_aio_rw_vector(BlockDriverState *bs,
+ int64_t sector_num,
+ QEMUIOVector *qiov,
+ int nb_sectors,
+ BlockDriverCompletionFunc *cb,
+ void *opaque, int write)
+{
+ RBDAIOCB *acb;
+ RADOSCB *rcb;
+ rados_completion_t c;
+ char n[RBD_MAX_SEG_NAME_SIZE];
+ int64_t segnr, segoffs, segsize, last_segnr;
+ int64_t off, size;
+ char *buf;
+
+ BDRVRBDState *s = bs->opaque;
+
+ acb = qemu_aio_get(&rbd_aio_pool, bs, cb, opaque);
+ acb->write = write;
+ acb->qiov = qiov;
+ acb->bounce = qemu_blockalign(bs, qiov->size);
+ acb->aiocnt = 0;
+ acb->ret = 0;
+ acb->error = 0;
+ acb->s = s;
+ acb->cancelled = 0;
+ acb->bh = NULL;
+
+ if (write) {
+ qemu_iovec_to_buffer(acb->qiov, acb->bounce);
+ }
+
+ buf = acb->bounce;
+
+ off = sector_num * BDRV_SECTOR_SIZE;
+ size = nb_sectors * BDRV_SECTOR_SIZE;
+ segnr = off / s->objsize;
+ segoffs = off % s->objsize;
+ segsize = s->objsize - segoffs;
+
+ last_segnr = ((off + size - 1) / s->objsize);
+ acb->aiocnt = (last_segnr - segnr) + 1;
+
+ s->qemu_aio_count += acb->aiocnt; /* All the RADOSCB */
+
+ while (size > 0) {
+ if (size < segsize) {
+ segsize = size;
+ }
+
+ snprintf(n, sizeof(n), "%s.%012" PRIx64, s->block_name,
+ segnr);
+
+ rcb = qemu_malloc(sizeof(RADOSCB));
+ rcb->done = 0;
+ rcb->acb = acb;
+ rcb->segsize = segsize;
+ rcb->buf = buf;
+ rcb->s = acb->s;
+
+ if (write) {
+ rados_aio_create_completion(rcb, NULL,
+ (rados_callback_t) rbd_finish_aiocb,
+ &c);
+ rados_aio_write(s->pool, n, segoffs, buf, segsize, c);
+ } else {
+ rados_aio_create_completion(rcb,
+ (rados_callback_t) rbd_finish_aiocb,
+ NULL, &c);
+ rados_aio_read(s->pool, n, segoffs, buf, segsize, c);
+ }
+
+ buf += segsize;
+ size -= segsize;
+ segoffs = 0;
+ segsize = s->objsize;
+ segnr++;
+ }
+
+ return &acb->common;
+}
+
+static BlockDriverAIOCB *rbd_aio_readv(BlockDriverState * bs,
+ int64_t sector_num, QEMUIOVector * qiov,
+ int nb_sectors,
+ BlockDriverCompletionFunc * cb,
+ void *opaque)
+{
+ return rbd_aio_rw_vector(bs, sector_num, qiov, nb_sectors, cb, opaque, 0);
+}
+
+static BlockDriverAIOCB *rbd_aio_writev(BlockDriverState * bs,
+ int64_t sector_num, QEMUIOVector * qiov,
+ int nb_sectors,
+ BlockDriverCompletionFunc * cb,
+ void *opaque)
+{
+ return rbd_aio_rw_vector(bs, sector_num, qiov, nb_sectors, cb, opaque, 1);
+}
+
+static int rbd_getinfo(BlockDriverState * bs, BlockDriverInfo * bdi)
+{
+ BDRVRBDState *s = bs->opaque;
+ bdi->cluster_size = s->objsize;
+ return 0;
+}
+
+static int64_t rbd_getlength(BlockDriverState * bs)
+{
+ BDRVRBDState *s = bs->opaque;
+
+ return s->size;
+}
+
+static int rbd_snap_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info)
+{
+ BDRVRBDState *s = bs->opaque;
+ char inbuf[512], outbuf[128];
+ uint64_t snap_id;
+ int r;
+ char *p = inbuf;
+ char *end = inbuf + sizeof(inbuf);
+ char n[RBD_MAX_SEG_NAME_SIZE];
+ char *hbuf = NULL;
+ RbdHeader1 *header;
+
+ if (sn_info->name[0] == '\0') {
+ return -EINVAL; /* we need a name for rbd snapshots */
+ }
+
+ /*
+ * rbd snapshots are using the name as the user controlled unique identifier
+ * we can't use the rbd snapid for that purpose, as it can't be set
+ */
+ if (sn_info->id_str[0] != '\0' &&
+ strcmp(sn_info->id_str, sn_info->name) != 0) {
+ return -EINVAL;
+ }
+
+ if (strlen(sn_info->name) >= sizeof(sn_info->id_str)) {
+ return -ERANGE;
+ }
+
+ r = rados_selfmanaged_snap_create(s->header_pool, &snap_id);
+ if (r < 0) {
+ error_report("failed to create snap id: %s", strerror(-r));
+ return r;
+ }
+
+ *(uint32_t *)p = strlen(sn_info->name);
+ cpu_to_le32s((uint32_t *)p);
+ p += sizeof(uint32_t);
+ strncpy(p, sn_info->name, end - p);
+ p += strlen(p);
+ if (p + sizeof(snap_id) > end) {
+ error_report("invalid input parameter");
+ return -EINVAL;
+ }
+
+ *(uint64_t *)p = snap_id;
+ cpu_to_le64s((uint64_t *)p);
+
+ snprintf(n, sizeof(n), "%s%s", s->name, RBD_SUFFIX);
+
+ r = rados_exec(s->header_pool, n, "rbd", "snap_add", inbuf,
+ sizeof(inbuf), outbuf, sizeof(outbuf));
+ if (r < 0) {
+ error_report("rbd.snap_add execution failed failed: %s", strerror(-r));
+ return r;
+ }
+
+ sprintf(sn_info->id_str, "%s", sn_info->name);
+
+ r = rbd_read_header(s, &hbuf);
+ if (r < 0) {
+ error_report("failed reading header: %s", strerror(-r));
+ return r;
+ }
+
+ header = (RbdHeader1 *) hbuf;
+ r = rbd_set_snapc(s->pool, sn_info->name, header);
+ if (r < 0) {
+ error_report("failed setting snap context: %s", strerror(-r));
+ goto failed;
+ }
+
+ return 0;
+
+failed:
+ qemu_free(header);
+ return r;
+}
+
+static int decode32(char **p, const char *end, uint32_t *v)
+{
+ if (*p + 4 > end) {
+ return -ERANGE;
+ }
+
+ *v = *(uint32_t *)(*p);
+ le32_to_cpus(v);
+ *p += 4;
+ return 0;
+}
+
+static int decode64(char **p, const char *end, uint64_t *v)
+{
+ if (*p + 8 > end) {
+ return -ERANGE;
+ }
+
+ *v = *(uint64_t *)(*p);
+ le64_to_cpus(v);
+ *p += 8;
+ return 0;
+}
+
+static int decode_str(char **p, const char *end, char **s)
+{
+ uint32_t len;
+ int r;
+
+ if ((r = decode32(p, end, &len)) < 0) {
+ return r;
+ }
+
+ *s = qemu_malloc(len + 1);
+ memcpy(*s, *p, len);
+ *p += len;
+ (*s)[len] = '\0';
+
+ return len;
+}
+
+static int rbd_snap_list(BlockDriverState *bs, QEMUSnapshotInfo **psn_tab)
+{
+ BDRVRBDState *s = bs->opaque;
+ char n[RBD_MAX_SEG_NAME_SIZE];
+ QEMUSnapshotInfo *sn_info, *sn_tab = NULL;
+ RbdHeader1 *header;
+ char *hbuf = NULL;
+ char *outbuf = NULL, *end, *buf;
+ uint64_t len;
+ uint64_t snap_seq;
+ uint32_t snap_count;
+ int r, i;
+
+ /* read header to estimate how much space we need to read the snap
+ * list */
+ if ((r = rbd_read_header(s, &hbuf)) < 0) {
+ goto done_err;
+ }
+ header = (RbdHeader1 *)hbuf;
+ len = le64_to_cpu(header->snap_names_len);
+ len += 1024; /* should have already been enough, but new snapshots might
+ already been created since we read the header. just allocate
+ a bit more, so that in most cases it'll suffice anyway */
+ qemu_free(hbuf);
+
+ snprintf(n, sizeof(n), "%s%s", s->name, RBD_SUFFIX);
+ while (1) {
+ qemu_free(outbuf);
+ outbuf = qemu_malloc(len);
+
+ r = rados_exec(s->header_pool, n, "rbd", "snap_list", NULL, 0,
+ outbuf, len);
+ if (r < 0) {
+ error_report("rbd.snap_list execution failed failed: %s", strerror(-r));
+ goto done_err;
+ }
+ if (r != len) {
+ break;
+ }
+
+ /* if we're here, we probably raced with some snaps creation */
+ len *= 2;
+ }
+ buf = outbuf;
+ end = buf + len;
+
+ if ((r = decode64(&buf, end, &snap_seq)) < 0) {
+ goto done_err;
+ }
+ if ((r = decode32(&buf, end, &snap_count)) < 0) {
+ goto done_err;
+ }
+
+ sn_tab = qemu_mallocz(snap_count * sizeof(QEMUSnapshotInfo));
+ for (i = 0; i < snap_count; i++) {
+ uint64_t id, image_size;
+ char *snap_name;
+
+ if ((r = decode64(&buf, end, &id)) < 0) {
+ goto done_err;
+ }
+ if ((r = decode64(&buf, end, &image_size)) < 0) {
+ goto done_err;
+ }
+ if ((r = decode_str(&buf, end, &snap_name)) < 0) {
+ goto done_err;
+ }
+
+ sn_info = sn_tab + i;
+ pstrcpy(sn_info->id_str, sizeof(sn_info->id_str), snap_name);
+ pstrcpy(sn_info->name, sizeof(sn_info->name), snap_name);
+ qemu_free(snap_name);
+
+ sn_info->vm_state_size = image_size;
+ sn_info->date_sec = 0;
+ sn_info->date_nsec = 0;
+ sn_info->vm_clock_nsec = 0;
+ }
+ *psn_tab = sn_tab;
+ qemu_free(outbuf);
+ return snap_count;
+done_err:
+ qemu_free(sn_tab);
+ qemu_free(outbuf);
+ return r;
+}
+
+static QEMUOptionParameter rbd_create_options[] = {
+ {
+ .name = BLOCK_OPT_SIZE,
+ .type = OPT_SIZE,
+ .help = "Virtual disk size"
+ },
+ {
+ .name = BLOCK_OPT_CLUSTER_SIZE,
+ .type = OPT_SIZE,
+ .help = "RBD object size"
+ },
+ {NULL}
+};
+
+static BlockDriver bdrv_rbd = {
+ .format_name = "rbd",
+ .instance_size = sizeof(BDRVRBDState),
+ .bdrv_file_open = rbd_open,
+ .bdrv_close = rbd_close,
+ .bdrv_create = rbd_create,
+ .bdrv_get_info = rbd_getinfo,
+ .create_options = rbd_create_options,
+ .bdrv_getlength = rbd_getlength,
+ .protocol_name = "rbd",
+
+ .bdrv_aio_readv = rbd_aio_readv,
+ .bdrv_aio_writev = rbd_aio_writev,
+
+ .bdrv_snapshot_create = rbd_snap_create,
+ .bdrv_snapshot_list = rbd_snap_list,
+};
+
+static void bdrv_rbd_init(void)
+{
+ bdrv_register(&bdrv_rbd);
+}
+
+block_init(bdrv_rbd_init);
diff --git a/block/rbd_types.h b/block/rbd_types.h
new file mode 100644
index 0000000..f4cca99
--- /dev/null
+++ b/block/rbd_types.h
@@ -0,0 +1,71 @@
+/*
+ * Ceph - scalable distributed file system
+ *
+ * Copyright (C) 2004-2010 Sage Weil <sage@newdream.net>
+ *
+ * This is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software
+ * Foundation. See file COPYING.LIB.
+ *
+ */
+
+#ifndef CEPH_RBD_TYPES_H
+#define CEPH_RBD_TYPES_H
+
+
+/*
+ * rbd image 'foo' consists of objects
+ * foo.rbd - image metadata
+ * foo.00000000
+ * foo.00000001
+ * ... - data
+ */
+
+#define RBD_SUFFIX ".rbd"
+#define RBD_DIRECTORY "rbd_directory"
+#define RBD_INFO "rbd_info"
+
+#define RBD_DEFAULT_OBJ_ORDER 22 /* 4MB */
+
+#define RBD_MAX_OBJ_NAME_SIZE 96
+#define RBD_MAX_BLOCK_NAME_SIZE 24
+#define RBD_MAX_SEG_NAME_SIZE 128
+
+#define RBD_COMP_NONE 0
+#define RBD_CRYPT_NONE 0
+
+#define RBD_HEADER_TEXT "<<< Rados Block Device Image >>>\n"
+#define RBD_HEADER_SIGNATURE "RBD"
+#define RBD_HEADER_VERSION "001.005"
+
+struct rbd_info {
+ uint64_t max_id;
+} __attribute__ ((packed));
+
+struct rbd_obj_snap_ondisk {
+ uint64_t id;
+ uint64_t image_size;
+} __attribute__((packed));
+
+struct rbd_obj_header_ondisk {
+ char text[40];
+ char block_name[RBD_MAX_BLOCK_NAME_SIZE];
+ char signature[4];
+ char version[8];
+ struct {
+ uint8_t order;
+ uint8_t crypt_type;
+ uint8_t comp_type;
+ uint8_t unused;
+ } __attribute__((packed)) options;
+ uint64_t image_size;
+ uint64_t snap_seq;
+ uint32_t snap_count;
+ uint32_t reserved;
+ uint64_t snap_names_len;
+ struct rbd_obj_snap_ondisk snaps[0];
+} __attribute__((packed));
+
+
+#endif
diff --git a/configure b/configure
index 2917874..62defc4 100755
--- a/configure
+++ b/configure
@@ -332,6 +332,7 @@ zero_malloc=""
trace_backend="nop"
trace_file="trace"
spice=""
+rbd=""
# OS specific
if check_define __linux__ ; then
@@ -741,6 +742,10 @@ for opt do
;;
--*dir)
;;
+ --disable-rbd) rbd="no"
+ ;;
+ --enable-rbd) rbd="yes"
+ ;;
*) echo "ERROR: unknown option $opt"; show_help="yes"
;;
esac
@@ -934,6 +939,7 @@ echo " --trace-file=NAME Full PATH,NAME of file to store traces"
echo " Default:trace-<pid>"
echo " --disable-spice disable spice"
echo " --enable-spice enable spice"
+echo " --enable-rbd enable building the rados block device (rbd)"
echo ""
echo "NOTE: The object files are built at the place where configure is launched"
exit 1
@@ -1746,6 +1752,48 @@ if test "$mingw32" != yes -a "$pthread" = no; then
fi
##########################################
+# rbd probe
+if test "$rbd" != "no" ; then
+ cat > $TMPC <<EOF
+#include <stdio.h>
+#include <rados/librados.h>
+int main(void) { rados_initialize(0, NULL); return 0; }
+EOF
+ rbd_libs="-lrados -lcrypto"
+ if compile_prog "" "$rbd_libs" ; then
+ librados_too_old=no
+ cat > $TMPC <<EOF
+#include <stdio.h>
+#include <rados/librados.h>
+#ifndef CEPH_OSD_TMAP_SET
+#error missing CEPH_OSD_TMAP_SET
+#endif
+int main(void) {
+ int (*func)(const rados_pool_t pool, uint64_t *snapid) = rados_selfmanaged_snap_create;
+ rados_initialize(0, NULL);
+ return 0;
+}
+EOF
+ if compile_prog "" "$rbd_libs" ; then
+ rbd=yes
+ libs_tools="$rbd_libs $libs_tools"
+ libs_softmmu="$rbd_libs $libs_softmmu"
+ else
+ rbd=no
+ librados_too_old=yes
+ fi
+ else
+ if test "$rbd" = "yes" ; then
+ feature_not_found "rados block device"
+ fi
+ rbd=no
+ fi
+ if test "$librados_too_old" = "yes" ; then
+ echo "-> Your librados version is too old - upgrade needed to have rbd support"
+ fi
+fi
+
+##########################################
# linux-aio probe
if test "$linux_aio" != "no" ; then
@@ -2354,6 +2402,7 @@ echo "vhost-net support $vhost_net"
echo "Trace backend $trace_backend"
echo "Trace output file $trace_file-<pid>"
echo "spice support $spice"
+echo "rbd support $rbd"
if test $sdl_too_old = "yes"; then
echo "-> Your SDL version is too old - please upgrade to have SDL support"
@@ -2627,6 +2676,9 @@ echo "CONFIG_UNAME_RELEASE=\"$uname_release\"" >> $config_host_mak
if test "$zero_malloc" = "yes" ; then
echo "CONFIG_ZERO_MALLOC=y" >> $config_host_mak
fi
+if test "$rbd" = "yes" ; then
+ echo "CONFIG_RBD=y" >> $config_host_mak
+fi
# USB host support
case "$usb" in
--
1.7.2.3
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [Qemu-devel] [PATCH 10/14] qemu-img: Deprecate obsolete -6 and -e options
2010-12-09 11:09 [Qemu-devel] [PULL 00/14] Block patches Kevin Wolf
` (8 preceding siblings ...)
2010-12-09 11:10 ` [Qemu-devel] [PATCH 09/14] ceph/rbd block driver for qemu-kvm Kevin Wolf
@ 2010-12-09 11:10 ` Kevin Wolf
2010-12-09 11:10 ` [Qemu-devel] [PATCH 11/14] qemu-option: Don't reinvent append_option_parameters() Kevin Wolf
` (5 subsequent siblings)
15 siblings, 0 replies; 28+ messages in thread
From: Kevin Wolf @ 2010-12-09 11:10 UTC (permalink / raw)
To: anthony; +Cc: kwolf, qemu-devel
From: Jes Sorensen <Jes.Sorensen@redhat.com>
If -6 or -e is specified, an error message is printed and we exit. It
does not print help() to avoid the error message getting lost in the
noise.
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
block_int.h | 1 -
qemu-img.c | 53 ++++++++++++++++++++++-------------------------------
2 files changed, 22 insertions(+), 32 deletions(-)
diff --git a/block_int.h b/block_int.h
index 3c3adb5..3ceed47 100644
--- a/block_int.h
+++ b/block_int.h
@@ -29,7 +29,6 @@
#include "qemu-queue.h"
#define BLOCK_FLAG_ENCRYPT 1
-#define BLOCK_FLAG_COMPRESS 2
#define BLOCK_FLAG_COMPAT6 4
#define BLOCK_OPT_SIZE "size"
diff --git a/qemu-img.c b/qemu-img.c
index 5b6e648..d146d8c 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -261,21 +261,9 @@ fail:
}
static int add_old_style_options(const char *fmt, QEMUOptionParameter *list,
- int flags, const char *base_filename, const char *base_fmt)
+ const char *base_filename,
+ const char *base_fmt)
{
- if (flags & BLOCK_FLAG_ENCRYPT) {
- if (set_option_parameter(list, BLOCK_OPT_ENCRYPT, "on")) {
- error("Encryption not supported for file format '%s'", fmt);
- return -1;
- }
- }
- if (flags & BLOCK_FLAG_COMPAT6) {
- if (set_option_parameter(list, BLOCK_OPT_COMPAT6, "on")) {
- error("VMDK version 6 not supported for file format '%s'", fmt);
- return -1;
- }
- }
-
if (base_filename) {
if (set_option_parameter(list, BLOCK_OPT_BACKING_FILE, base_filename)) {
error("Backing file not supported for file format '%s'", fmt);
@@ -293,7 +281,7 @@ static int add_old_style_options(const char *fmt, QEMUOptionParameter *list,
static int img_create(int argc, char **argv)
{
- int c, ret = 0, flags;
+ int c, ret = 0;
const char *fmt = "raw";
const char *base_fmt = NULL;
const char *filename;
@@ -302,7 +290,6 @@ static int img_create(int argc, char **argv)
QEMUOptionParameter *param = NULL, *create_options = NULL;
char *options = NULL;
- flags = 0;
for(;;) {
c = getopt(argc, argv, "F:b:f:he6o:");
if (c == -1) {
@@ -323,11 +310,13 @@ static int img_create(int argc, char **argv)
fmt = optarg;
break;
case 'e':
- flags |= BLOCK_FLAG_ENCRYPT;
- break;
+ error("qemu-img: option -e is deprecated, please use \'-o "
+ "encryption\' instead!");
+ return 1;
case '6':
- flags |= BLOCK_FLAG_COMPAT6;
- break;
+ error("qemu-img: option -6 is deprecated, please use \'-o "
+ "compat6\' instead!");
+ return 1;
case 'o':
options = optarg;
break;
@@ -385,7 +374,7 @@ static int img_create(int argc, char **argv)
}
/* Add old-style options to parameters */
- ret = add_old_style_options(fmt, param, flags, base_filename, base_fmt);
+ ret = add_old_style_options(fmt, param, base_filename, base_fmt);
if (ret < 0) {
goto out;
}
@@ -674,7 +663,7 @@ static int compare_sectors(const uint8_t *buf1, const uint8_t *buf2, int n,
static int img_convert(int argc, char **argv)
{
- int c, ret = 0, n, n1, bs_n, bs_i, flags, cluster_size, cluster_sectors;
+ int c, ret = 0, n, n1, bs_n, bs_i, compress, cluster_size, cluster_sectors;
const char *fmt, *out_fmt, *out_baseimg, *out_filename;
BlockDriver *drv, *proto_drv;
BlockDriverState **bs = NULL, *out_bs = NULL;
@@ -691,7 +680,7 @@ static int img_convert(int argc, char **argv)
fmt = NULL;
out_fmt = "raw";
out_baseimg = NULL;
- flags = 0;
+ compress = 0;
for(;;) {
c = getopt(argc, argv, "f:O:B:s:hce6o:");
if (c == -1) {
@@ -712,14 +701,16 @@ static int img_convert(int argc, char **argv)
out_baseimg = optarg;
break;
case 'c':
- flags |= BLOCK_FLAG_COMPRESS;
+ compress = 1;
break;
case 'e':
- flags |= BLOCK_FLAG_ENCRYPT;
- break;
+ error("qemu-img: option -e is deprecated, please use \'-o "
+ "encryption\' instead!");
+ return 1;
case '6':
- flags |= BLOCK_FLAG_COMPAT6;
- break;
+ error("qemu-img: option -6 is deprecated, please use \'-o "
+ "compat6\' instead!");
+ return 1;
case 'o':
options = optarg;
break;
@@ -806,7 +797,7 @@ static int img_convert(int argc, char **argv)
}
set_option_parameter_int(param, BLOCK_OPT_SIZE, total_sectors * 512);
- ret = add_old_style_options(out_fmt, param, flags, out_baseimg, NULL);
+ ret = add_old_style_options(out_fmt, param, out_baseimg, NULL);
if (ret < 0) {
goto out;
}
@@ -818,7 +809,7 @@ static int img_convert(int argc, char **argv)
}
/* Check if compression is supported */
- if (flags & BLOCK_FLAG_COMPRESS) {
+ if (compress) {
QEMUOptionParameter *encryption =
get_option_parameter(param, BLOCK_OPT_ENCRYPT);
@@ -860,7 +851,7 @@ static int img_convert(int argc, char **argv)
bdrv_get_geometry(bs[0], &bs_sectors);
buf = qemu_malloc(IO_BUF_SIZE);
- if (flags & BLOCK_FLAG_COMPRESS) {
+ if (compress) {
ret = bdrv_get_info(out_bs, &bdi);
if (ret < 0) {
error("could not get block driver info");
--
1.7.2.3
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [Qemu-devel] [PATCH 11/14] qemu-option: Don't reinvent append_option_parameters()
2010-12-09 11:09 [Qemu-devel] [PULL 00/14] Block patches Kevin Wolf
` (9 preceding siblings ...)
2010-12-09 11:10 ` [Qemu-devel] [PATCH 10/14] qemu-img: Deprecate obsolete -6 and -e options Kevin Wolf
@ 2010-12-09 11:10 ` Kevin Wolf
2010-12-09 11:10 ` [Qemu-devel] [PATCH 12/14] qemu-option: Fix parse_option_parameters() documentation typo Kevin Wolf
` (4 subsequent siblings)
15 siblings, 0 replies; 28+ messages in thread
From: Kevin Wolf @ 2010-12-09 11:10 UTC (permalink / raw)
To: anthony; +Cc: kwolf, qemu-devel
From: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
parse_option_parameters() may need to create a new option parameter list
from a template list. Use append_option_parameters() instead of
duplicating the code.
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
qemu-option.c | 9 +--------
1 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/qemu-option.c b/qemu-option.c
index 1f8f41a..e380fc1 100644
--- a/qemu-option.c
+++ b/qemu-option.c
@@ -416,20 +416,13 @@ QEMUOptionParameter *parse_option_parameters(const char *param,
char value[256];
char *param_delim, *value_delim;
char next_delim;
- size_t num_options;
if (list == NULL) {
return NULL;
}
if (dest == NULL) {
- // Count valid options
- num_options = count_option_parameters(list);
-
- // Create a copy of the option list to fill in values
- dest = qemu_mallocz((num_options + 1) * sizeof(QEMUOptionParameter));
- allocated = dest;
- memcpy(dest, list, (num_options + 1) * sizeof(QEMUOptionParameter));
+ dest = allocated = append_option_parameters(NULL, list);
}
while (*param) {
--
1.7.2.3
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [Qemu-devel] [PATCH 12/14] qemu-option: Fix parse_option_parameters() documentation typo
2010-12-09 11:09 [Qemu-devel] [PULL 00/14] Block patches Kevin Wolf
` (10 preceding siblings ...)
2010-12-09 11:10 ` [Qemu-devel] [PATCH 11/14] qemu-option: Don't reinvent append_option_parameters() Kevin Wolf
@ 2010-12-09 11:10 ` Kevin Wolf
2010-12-09 11:10 ` [Qemu-devel] [PATCH 13/14] qemu-img: Free option parameter lists in img_create() Kevin Wolf
` (3 subsequent siblings)
15 siblings, 0 replies; 28+ messages in thread
From: Kevin Wolf @ 2010-12-09 11:10 UTC (permalink / raw)
To: anthony; +Cc: kwolf, qemu-devel
From: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Yoda said, "list is the templace is". Fix this.
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
qemu-option.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/qemu-option.c b/qemu-option.c
index e380fc1..65db542 100644
--- a/qemu-option.c
+++ b/qemu-option.c
@@ -394,8 +394,8 @@ QEMUOptionParameter *append_option_parameters(QEMUOptionParameter *dest,
/*
* Parses a parameter string (param) into an option list (dest).
*
- * list is the templace is. If dest is NULL, a new copy of list is created for
- * it. If list is NULL, this function fails.
+ * list is the template option list. If dest is NULL, a new copy of list is
+ * created. If list is NULL, this function fails.
*
* A parameter string consists of one or more parameters, separated by commas.
* Each parameter consists of its name and possibly of a value. In the latter
--
1.7.2.3
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [Qemu-devel] [PATCH 13/14] qemu-img: Free option parameter lists in img_create()
2010-12-09 11:09 [Qemu-devel] [PULL 00/14] Block patches Kevin Wolf
` (11 preceding siblings ...)
2010-12-09 11:10 ` [Qemu-devel] [PATCH 12/14] qemu-option: Fix parse_option_parameters() documentation typo Kevin Wolf
@ 2010-12-09 11:10 ` Kevin Wolf
2010-12-09 11:10 ` [Qemu-devel] [PATCH 14/14] qemu-img: Fail creation if backing format is invalid Kevin Wolf
` (2 subsequent siblings)
15 siblings, 0 replies; 28+ messages in thread
From: Kevin Wolf @ 2010-12-09 11:10 UTC (permalink / raw)
To: anthony; +Cc: kwolf, qemu-devel
From: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Free option parameter lists in the img_create() error return path.
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
qemu-img.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index d146d8c..c5a173c 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -428,8 +428,6 @@ static int img_create(int argc, char **argv)
puts("");
ret = bdrv_create(drv, filename, param);
- free_option_parameters(create_options);
- free_option_parameters(param);
if (ret < 0) {
if (ret == -ENOTSUP) {
@@ -441,6 +439,8 @@ static int img_create(int argc, char **argv)
}
}
out:
+ free_option_parameters(create_options);
+ free_option_parameters(param);
if (ret) {
return 1;
}
--
1.7.2.3
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [Qemu-devel] [PATCH 14/14] qemu-img: Fail creation if backing format is invalid
2010-12-09 11:09 [Qemu-devel] [PULL 00/14] Block patches Kevin Wolf
` (12 preceding siblings ...)
2010-12-09 11:10 ` [Qemu-devel] [PATCH 13/14] qemu-img: Free option parameter lists in img_create() Kevin Wolf
@ 2010-12-09 11:10 ` Kevin Wolf
2010-12-15 15:56 ` [Qemu-devel] Re: [PULL 00/14] Block patches Kevin Wolf
2010-12-17 14:48 ` [Qemu-devel] " Anthony Liguori
15 siblings, 0 replies; 28+ messages in thread
From: Kevin Wolf @ 2010-12-09 11:10 UTC (permalink / raw)
To: anthony; +Cc: kwolf, qemu-devel
From: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
The qemu-img create command should check the backing format to ensure
only image files with valid backing formats are created. By checking in
qemu-img.c we can print a useful error message.
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
qemu-img.c | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index c5a173c..52282e3 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -288,6 +288,7 @@ static int img_create(int argc, char **argv)
const char *base_filename = NULL;
BlockDriver *drv, *proto_drv;
QEMUOptionParameter *param = NULL, *create_options = NULL;
+ QEMUOptionParameter *backing_fmt = NULL;
char *options = NULL;
for(;;) {
@@ -379,14 +380,22 @@ static int img_create(int argc, char **argv)
goto out;
}
+ backing_fmt = get_option_parameter(param, BLOCK_OPT_BACKING_FMT);
+ if (backing_fmt && backing_fmt->value.s) {
+ if (!bdrv_find_format(backing_fmt->value.s)) {
+ error("Unknown backing file format '%s'",
+ backing_fmt->value.s);
+ ret = -1;
+ goto out;
+ }
+ }
+
// The size for the image must always be specified, with one exception:
// If we are using a backing file, we can obtain the size from there
if (get_option_parameter(param, BLOCK_OPT_SIZE)->value.n == -1) {
QEMUOptionParameter *backing_file =
get_option_parameter(param, BLOCK_OPT_BACKING_FILE);
- QEMUOptionParameter *backing_fmt =
- get_option_parameter(param, BLOCK_OPT_BACKING_FMT);
if (backing_file && backing_file->value.s) {
BlockDriverState *bs;
@@ -395,14 +404,7 @@ static int img_create(int argc, char **argv)
char buf[32];
if (backing_fmt && backing_fmt->value.s) {
- if (bdrv_find_format(backing_fmt->value.s)) {
- fmt = backing_fmt->value.s;
- } else {
- error("Unknown backing file format '%s'",
- backing_fmt->value.s);
- ret = -1;
- goto out;
- }
+ fmt = backing_fmt->value.s;
}
bs = bdrv_new_open(backing_file->value.s, fmt, BDRV_O_FLAGS);
--
1.7.2.3
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [Qemu-devel] Re: [PULL 00/14] Block patches
2010-12-09 11:09 [Qemu-devel] [PULL 00/14] Block patches Kevin Wolf
` (13 preceding siblings ...)
2010-12-09 11:10 ` [Qemu-devel] [PATCH 14/14] qemu-img: Fail creation if backing format is invalid Kevin Wolf
@ 2010-12-15 15:56 ` Kevin Wolf
2010-12-17 14:48 ` [Qemu-devel] " Anthony Liguori
15 siblings, 0 replies; 28+ messages in thread
From: Kevin Wolf @ 2010-12-15 15:56 UTC (permalink / raw)
To: anthony; +Cc: Kevin Wolf, qemu-devel
Am 09.12.2010 12:09, schrieb Kevin Wolf:
> The following changes since commit 138b38b61bf92d4e9588acf934e532499c94e185:
>
> ppc: kvm: fix signedness warning (2010-12-08 21:30:19 +0100)
>
> are available in the git repository at:
> git://repo.or.cz/qemu/kevin.git for-anthony
>
> Christian Brunner (1):
> ceph/rbd block driver for qemu-kvm
>
> Jes Sorensen (8):
> Add missing tracing to qemu_mallocz()
> Use qemu_mallocz() instead of calloc() in img_convert()
> img_convert(): Only try to free bs[] entries if bs is valid.
> Consolidate printing of block driver options
> Fix formatting and missing braces in qemu-img.c
> Fail if detecting an unknown option
> Make error handling more consistent in img_create() and img_resize()
> qemu-img: Deprecate obsolete -6 and -e options
>
> Stefan Hajnoczi (5):
> block: Make bdrv_create_file() ':' handling consistent
> qemu-option: Don't reinvent append_option_parameters()
> qemu-option: Fix parse_option_parameters() documentation typo
> qemu-img: Free option parameter lists in img_create()
> qemu-img: Fail creation if backing format is invalid
>
> Makefile.objs | 1 +
> block.c | 2 +-
> block/rbd.c | 1059 +++++++++++++++++++++++++++++++++++++++++++++++++++++
> block/rbd_types.h | 71 ++++
> block_int.h | 1 -
> configure | 52 +++
> qemu-img.c | 247 ++++++++-----
> qemu-malloc.c | 5 +-
> qemu-option.c | 13 +-
> 9 files changed, 1344 insertions(+), 107 deletions(-)
> create mode 100644 block/rbd.c
> create mode 100644 block/rbd_types.h
Ping?
Kevin
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [Qemu-devel] [PULL 00/14] Block patches
2010-12-09 11:09 [Qemu-devel] [PULL 00/14] Block patches Kevin Wolf
` (14 preceding siblings ...)
2010-12-15 15:56 ` [Qemu-devel] Re: [PULL 00/14] Block patches Kevin Wolf
@ 2010-12-17 14:48 ` Anthony Liguori
15 siblings, 0 replies; 28+ messages in thread
From: Anthony Liguori @ 2010-12-17 14:48 UTC (permalink / raw)
To: Kevin Wolf; +Cc: qemu-devel
On 12/09/2010 05:09 AM, Kevin Wolf wrote:
> The following changes since commit 138b38b61bf92d4e9588acf934e532499c94e185:
>
> ppc: kvm: fix signedness warning (2010-12-08 21:30:19 +0100)
>
> are available in the git repository at:
> git://repo.or.cz/qemu/kevin.git for-anthony
>
> Christian Brunner (1):
> ceph/rbd block driver for qemu-kvm
>
Pulled. Thanks.
Regards,
Anthony Liguori
> Jes Sorensen (8):
> Add missing tracing to qemu_mallocz()
> Use qemu_mallocz() instead of calloc() in img_convert()
> img_convert(): Only try to free bs[] entries if bs is valid.
> Consolidate printing of block driver options
> Fix formatting and missing braces in qemu-img.c
> Fail if detecting an unknown option
> Make error handling more consistent in img_create() and img_resize()
> qemu-img: Deprecate obsolete -6 and -e options
>
> Stefan Hajnoczi (5):
> block: Make bdrv_create_file() ':' handling consistent
> qemu-option: Don't reinvent append_option_parameters()
> qemu-option: Fix parse_option_parameters() documentation typo
> qemu-img: Free option parameter lists in img_create()
> qemu-img: Fail creation if backing format is invalid
>
> Makefile.objs | 1 +
> block.c | 2 +-
> block/rbd.c | 1059 +++++++++++++++++++++++++++++++++++++++++++++++++++++
> block/rbd_types.h | 71 ++++
> block_int.h | 1 -
> configure | 52 +++
> qemu-img.c | 247 ++++++++-----
> qemu-malloc.c | 5 +-
> qemu-option.c | 13 +-
> 9 files changed, 1344 insertions(+), 107 deletions(-)
> create mode 100644 block/rbd.c
> create mode 100644 block/rbd_types.h
>
>
>
^ permalink raw reply [flat|nested] 28+ messages in thread
* [Qemu-devel] [PULL 00/14] Block patches
@ 2011-06-15 14:02 Kevin Wolf
2011-06-15 14:18 ` Anthony Liguori
0 siblings, 1 reply; 28+ messages in thread
From: Kevin Wolf @ 2011-06-15 14:02 UTC (permalink / raw)
To: anthony; +Cc: kwolf, qemu-devel
The following changes since commit 0b862cedf36d927818c50584ddd611b0370673df:
configure: Detect and don't try to use older libcurl (2011-06-13 21:16:27 +0200)
are available in the git repository at:
git://repo.or.cz/qemu/kevin.git for-anthony
Christoph Hellwig (3):
make dma_bdrv_io available to drivers
ide: allow other dma comands than read and write
ide: add TRIM support
Devin Nakamura (1):
Replaced tabs with spaces in block.h and block_int.h
Kevin Wolf (9):
qcow2: Avoid direct AIO callback
qcow: Avoid direct AIO callback
vdi: Avoid direct AIO callback
qcow2: Fix in-flight list after qcow2_cache_put failure
ide: Split error status from status register
ide: Fix ide_drive_pio_state_needed()
ide: Add forgotten VMSTATE_END_OF_LIST in subsection
ide: Clear error_status after restarting flush
Allow nested qemu_bh_poll() after BH deletion
Stefan Weil (1):
block/rbd: Remove unused local variable
async.c | 5 +-
block.h | 6 +-
block/qcow.c | 58 ++++++++++++++++++-
block/qcow2-cluster.c | 12 +++-
block/qcow2.c | 39 ++++++++++---
block/rbd.c | 4 -
block/vdi.c | 41 +++++++++++--
block_int.h | 4 +-
dma-helpers.c | 23 +++----
dma.h | 8 +++
hw/ide/core.c | 154 ++++++++++++++++++++++++++++++++++++++++++++-----
hw/ide/internal.h | 32 ++++++++++-
hw/ide/macio.c | 13 ++++-
hw/ide/pci.c | 88 +++++++++++++++++++++++++---
hw/ide/pci.h | 4 +
hw/ide/qdev.c | 5 ++
16 files changed, 423 insertions(+), 73 deletions(-)
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [Qemu-devel] [PULL 00/14] Block patches
2011-06-15 14:02 Kevin Wolf
@ 2011-06-15 14:18 ` Anthony Liguori
0 siblings, 0 replies; 28+ messages in thread
From: Anthony Liguori @ 2011-06-15 14:18 UTC (permalink / raw)
To: Kevin Wolf; +Cc: qemu-devel
On 06/15/2011 09:02 AM, Kevin Wolf wrote:
> The following changes since commit 0b862cedf36d927818c50584ddd611b0370673df:
>
> configure: Detect and don't try to use older libcurl (2011-06-13 21:16:27 +0200)
>
> are available in the git repository at:
> git://repo.or.cz/qemu/kevin.git for-anthony
Pulled. Thanks.
Regards,
Anthony Liguori
> Christoph Hellwig (3):
> make dma_bdrv_io available to drivers
> ide: allow other dma comands than read and write
> ide: add TRIM support
>
> Devin Nakamura (1):
> Replaced tabs with spaces in block.h and block_int.h
>
> Kevin Wolf (9):
> qcow2: Avoid direct AIO callback
> qcow: Avoid direct AIO callback
> vdi: Avoid direct AIO callback
> qcow2: Fix in-flight list after qcow2_cache_put failure
> ide: Split error status from status register
> ide: Fix ide_drive_pio_state_needed()
> ide: Add forgotten VMSTATE_END_OF_LIST in subsection
> ide: Clear error_status after restarting flush
> Allow nested qemu_bh_poll() after BH deletion
>
> Stefan Weil (1):
> block/rbd: Remove unused local variable
>
> async.c | 5 +-
> block.h | 6 +-
> block/qcow.c | 58 ++++++++++++++++++-
> block/qcow2-cluster.c | 12 +++-
> block/qcow2.c | 39 ++++++++++---
> block/rbd.c | 4 -
> block/vdi.c | 41 +++++++++++--
> block_int.h | 4 +-
> dma-helpers.c | 23 +++----
> dma.h | 8 +++
> hw/ide/core.c | 154 ++++++++++++++++++++++++++++++++++++++++++++-----
> hw/ide/internal.h | 32 ++++++++++-
> hw/ide/macio.c | 13 ++++-
> hw/ide/pci.c | 88 +++++++++++++++++++++++++---
> hw/ide/pci.h | 4 +
> hw/ide/qdev.c | 5 ++
> 16 files changed, 423 insertions(+), 73 deletions(-)
^ permalink raw reply [flat|nested] 28+ messages in thread
* [Qemu-devel] [PULL 00/14] Block patches
@ 2011-12-15 14:09 Kevin Wolf
2011-12-19 15:44 ` Anthony Liguori
0 siblings, 1 reply; 28+ messages in thread
From: Kevin Wolf @ 2011-12-15 14:09 UTC (permalink / raw)
To: anthony; +Cc: kwolf, qemu-devel
The following changes since commit 222f23f508a8d778f56eddef14752dfd26d225b4:
tcg/arm: remove fixed map code buffer restriction (2011-12-14 21:58:18 +0100)
are available in the git repository at:
git://repo.or.cz/qemu/kevin.git for-anthony
Avi Kivity (1):
coroutine: switch per-thread free pool to a global pool
Josh Durgin (1):
rbd: always set out parameter in qemu_rbd_snap_list
Kevin Wolf (3):
qemu-img rebase: Fix for undersized backing files
Documentation: Add qemu-img -t parameter in man page
qcow2: Allow >4 GB VM state
Li Zhi Hui (2):
block/qcow2.c: call qcow2_free_snapshots in the function of qcow2_close
block/cow: Return real error code
Paolo Bonzini (7):
block: bdrv_aio_* do not return NULL
block: simplify failure handling for bdrv_aio_multiwrite
block: qemu_aio_get does not return NULL
dma: the passed io_func does not return NULL
block: dma_bdrv_* does not return NULL
block: avoid useless checks on acb->bh
qiov: prevent double free or use-after-free
block-migration.c | 13 ---------
block.c | 56 +++-------------------------------------
block.h | 2 +-
block/blkverify.c | 24 ++++++-----------
block/cow.c | 44 +++++++++++++++++++++-----------
block/curl.c | 4 ---
block/qcow2-snapshot.c | 34 +++++++++++++++++++++++-
block/qcow2.c | 1 +
block/qcow2.h | 2 +-
block/qed-table.c | 22 +++++-----------
block/qed.c | 60 +++++++++++--------------------------------
block/rbd.c | 6 +---
block/vdi.c | 66 +++++++++++++----------------------------------
coroutine-ucontext.c | 30 +++++++++++----------
cutils.c | 3 ++
dma-helpers.c | 4 +--
docs/specs/qcow2.txt | 8 +++++-
hw/ide/atapi.c | 8 +-----
hw/ide/core.c | 13 +--------
hw/ide/macio.c | 11 +-------
hw/scsi-disk.c | 9 ------
hw/scsi-generic.c | 4 ---
hw/virtio-blk.c | 19 +++-----------
linux-aio.c | 2 -
posix-aio-compat.c | 4 ---
qemu-img-cmds.hx | 6 ++--
qemu-img.c | 42 ++++++++++++++++++++++++------
qemu-img.texi | 10 +++++--
qemu-io.c | 39 ++++++----------------------
savevm.c | 2 +-
trace-events | 2 -
31 files changed, 205 insertions(+), 345 deletions(-)
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [Qemu-devel] [PULL 00/14] Block patches
2011-12-15 14:09 Kevin Wolf
@ 2011-12-19 15:44 ` Anthony Liguori
0 siblings, 0 replies; 28+ messages in thread
From: Anthony Liguori @ 2011-12-19 15:44 UTC (permalink / raw)
To: Kevin Wolf; +Cc: qemu-devel
On 12/15/2011 08:09 AM, Kevin Wolf wrote:
> The following changes since commit 222f23f508a8d778f56eddef14752dfd26d225b4:
>
> tcg/arm: remove fixed map code buffer restriction (2011-12-14 21:58:18 +0100)
>
> are available in the git repository at:
> git://repo.or.cz/qemu/kevin.git for-anthony
Pulled. Thanks.
Regards,
Anthony Liguori
>
> Avi Kivity (1):
> coroutine: switch per-thread free pool to a global pool
>
> Josh Durgin (1):
> rbd: always set out parameter in qemu_rbd_snap_list
>
> Kevin Wolf (3):
> qemu-img rebase: Fix for undersized backing files
> Documentation: Add qemu-img -t parameter in man page
> qcow2: Allow>4 GB VM state
>
> Li Zhi Hui (2):
> block/qcow2.c: call qcow2_free_snapshots in the function of qcow2_close
> block/cow: Return real error code
>
> Paolo Bonzini (7):
> block: bdrv_aio_* do not return NULL
> block: simplify failure handling for bdrv_aio_multiwrite
> block: qemu_aio_get does not return NULL
> dma: the passed io_func does not return NULL
> block: dma_bdrv_* does not return NULL
> block: avoid useless checks on acb->bh
> qiov: prevent double free or use-after-free
>
> block-migration.c | 13 ---------
> block.c | 56 +++-------------------------------------
> block.h | 2 +-
> block/blkverify.c | 24 ++++++-----------
> block/cow.c | 44 +++++++++++++++++++++-----------
> block/curl.c | 4 ---
> block/qcow2-snapshot.c | 34 +++++++++++++++++++++++-
> block/qcow2.c | 1 +
> block/qcow2.h | 2 +-
> block/qed-table.c | 22 +++++-----------
> block/qed.c | 60 +++++++++++--------------------------------
> block/rbd.c | 6 +---
> block/vdi.c | 66 +++++++++++++----------------------------------
> coroutine-ucontext.c | 30 +++++++++++----------
> cutils.c | 3 ++
> dma-helpers.c | 4 +--
> docs/specs/qcow2.txt | 8 +++++-
> hw/ide/atapi.c | 8 +-----
> hw/ide/core.c | 13 +--------
> hw/ide/macio.c | 11 +-------
> hw/scsi-disk.c | 9 ------
> hw/scsi-generic.c | 4 ---
> hw/virtio-blk.c | 19 +++-----------
> linux-aio.c | 2 -
> posix-aio-compat.c | 4 ---
> qemu-img-cmds.hx | 6 ++--
> qemu-img.c | 42 ++++++++++++++++++++++++------
> qemu-img.texi | 10 +++++--
> qemu-io.c | 39 ++++++----------------------
> savevm.c | 2 +-
> trace-events | 2 -
> 31 files changed, 205 insertions(+), 345 deletions(-)
>
>
^ permalink raw reply [flat|nested] 28+ messages in thread
* [Qemu-devel] [PULL 00/14] Block patches
@ 2013-03-22 17:41 Kevin Wolf
0 siblings, 0 replies; 28+ messages in thread
From: Kevin Wolf @ 2013-03-22 17:41 UTC (permalink / raw)
To: anthony; +Cc: kwolf, qemu-devel
The following changes since commit afed26082219b49443193b4ac32d113bbcf967fd:
microblaze: Ignore non-cpu accesses to unmapped areas (2013-03-19 17:34:47 +0100)
are available in the git repository at:
git://repo.or.cz/qemu/kevin.git for-anthony
for you to fetch changes up to 681e7ad024d80123a1ae8e35f86fb1a7f03b1bc9:
nbd: Check against invalid option combinations (2013-03-22 17:51:32 +0100)
----------------------------------------------------------------
Kevin Wolf (12):
block: Add options QDict to bdrv_file_open() prototypes
block: Pass bdrv_file_open() options to block drivers
qemu-socket: Make socket_optslist public
nbd: Keep hostname and port separate
nbd: Remove unused functions
nbd: Accept -drive options for the network connection
block: Introduce .bdrv_parse_filename callback
block: Rename variable to avoid shadowing
block: Make find_image_format safe with NULL filename
block: Allow omitting the file name when using driver-specific options
nbd: Use default port if only host is specified
nbd: Check against invalid option combinations
Peter Lieven (2):
Revert "block: complete all IOs before .bdrv_truncate"
block: complete all IOs before resizing a device
block.c | 143 +++++++++++++++++++++++++++++++++++++++-------
block/blkdebug.c | 5 +-
block/blkverify.c | 5 +-
block/cow.c | 2 +-
block/curl.c | 3 +-
block/dmg.c | 13 ++++-
block/gluster.c | 2 +-
block/iscsi.c | 5 +-
block/nbd.c | 135 ++++++++++++++++++++++++++++++++-----------
block/qcow.c | 2 +-
block/qcow2.c | 2 +-
block/qed.c | 2 +-
block/raw-posix.c | 15 +++--
block/sheepdog.c | 7 ++-
block/vmdk.c | 2 +-
block/vvfat.c | 3 +-
blockdev.c | 13 ++++-
include/block/block.h | 3 +-
include/block/block_int.h | 7 ++-
include/block/nbd.h | 4 +-
include/qemu/sockets.h | 3 +
nbd.c | 13 +----
qemu-io.c | 2 +-
util/qemu-sockets.c | 30 +++++-----
24 files changed, 308 insertions(+), 113 deletions(-)
^ permalink raw reply [flat|nested] 28+ messages in thread
* [Qemu-devel] [PULL 00/14] Block patches
@ 2016-07-20 0:20 Jeff Cody
2016-07-20 17:51 ` Peter Maydell
0 siblings, 1 reply; 28+ messages in thread
From: Jeff Cody @ 2016-07-20 0:20 UTC (permalink / raw)
To: qemu-block; +Cc: peter.maydell, jcody, qemu-devel
The following changes since commit 5d3217340adcb6c4f0e4af5d2b865331eb2ff63d:
disas: Fix ATTRIBUTE_UNUSED define clash with ALSA headers (2016-07-19 16:40:39 +0100)
are available in the git repository at:
git@github.com:codyprime/qemu-kvm-jtc.git tags/block-pull-request
for you to fetch changes up to 6c7189bb29de9fa2202f613f3c6caf028f96f261:
block/gluster: add support for multiple gluster servers (2016-07-19 17:38:50 -0400)
----------------------------------------------------------------
Block pull for 2.7
----------------------------------------------------------------
Denis V. Lunev (9):
dirty-bitmap: operate with int64_t amount
mirror: make sectors_in_flight int64_t
mirror: create mirror_throttle helper
mirror: create mirror_dirty_init helper for mirror_run
block: remove extra condition in bdrv_can_write_zeroes_with_unmap
mirror: optimize dirty bitmap filling in mirror_run a bit
mirror: efficiently zero out target
mirror: improve performance of mirroring of empty disk
mirror: fix request throttling in drive-mirror
Prasanna Kumar Kalever (5):
block/gluster: rename [server, volname, image] -> [host, volume, path]
block/gluster: code cleanup
block/gluster: deprecate rdma support
block/gluster: using new qapi schema
block/gluster: add support for multiple gluster servers
block.c | 2 +-
block/dirty-bitmap.c | 6 +-
block/gluster.c | 631 +++++++++++++++++++++++++++++++++----------
block/mirror.c | 152 +++++++----
include/block/block_int.h | 2 +-
include/block/dirty-bitmap.h | 4 +-
qapi/block-core.json | 68 ++++-
7 files changed, 659 insertions(+), 206 deletions(-)
--
1.9.3
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [Qemu-devel] [PULL 00/14] Block patches
2016-07-20 0:20 Jeff Cody
@ 2016-07-20 17:51 ` Peter Maydell
0 siblings, 0 replies; 28+ messages in thread
From: Peter Maydell @ 2016-07-20 17:51 UTC (permalink / raw)
To: Jeff Cody; +Cc: Qemu-block, QEMU Developers
On 20 July 2016 at 01:20, Jeff Cody <jcody@redhat.com> wrote:
> The following changes since commit 5d3217340adcb6c4f0e4af5d2b865331eb2ff63d:
>
> disas: Fix ATTRIBUTE_UNUSED define clash with ALSA headers (2016-07-19 16:40:39 +0100)
>
> are available in the git repository at:
>
> git@github.com:codyprime/qemu-kvm-jtc.git tags/block-pull-request
>
> for you to fetch changes up to 6c7189bb29de9fa2202f613f3c6caf028f96f261:
>
> block/gluster: add support for multiple gluster servers (2016-07-19 17:38:50 -0400)
>
> ----------------------------------------------------------------
> Block pull for 2.7
> ----------------------------------------------------------------
Applied, thanks.
-- PMM
^ permalink raw reply [flat|nested] 28+ messages in thread
* [Qemu-devel] [PULL 00/14] Block patches
@ 2017-01-04 13:34 Stefan Hajnoczi
2017-01-05 13:57 ` Peter Maydell
0 siblings, 1 reply; 28+ messages in thread
From: Stefan Hajnoczi @ 2017-01-04 13:34 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell, Stefan Hajnoczi
The following changes since commit dbe2b65566e76d3c3a0c3358285c0336ac61e757:
Merge remote-tracking branch 'remotes/vivier/tags/m68k-for-2.9-pull-request' into staging (2016-12-28 17:11:11 +0000)
are available in the git repository at:
git://github.com/stefanha/qemu.git tags/block-pull-request
for you to fetch changes up to 5e5db49953e31689c1c70060870f0a7a6de26fcb:
iothread: add poll-grow and poll-shrink parameters (2017-01-03 16:38:50 +0000)
----------------------------------------------------------------
----------------------------------------------------------------
Stefan Hajnoczi (14):
HACKING: document #include order
aio: add flag to skip fds to aio_dispatch()
aio: add AioPollFn and io_poll() interface
aio: add polling mode to AioContext
virtio: poll virtqueues for new buffers
linux-aio: poll ring for completions
iothread: add polling parameters
virtio-blk: suppress virtqueue kick during processing
virtio-scsi: suppress virtqueue kick during processing
virtio: turn vq->notification into a nested counter
aio: add .io_poll_begin/end() callbacks
virtio: disable virtqueue notifications during polling
aio: self-tune polling time
iothread: add poll-grow and poll-shrink parameters
include/block/aio.h | 53 +++++++-
include/sysemu/iothread.h | 5 +
aio-posix.c | 308 +++++++++++++++++++++++++++++++++++++++-----
aio-win32.c | 32 ++++-
async.c | 21 ++-
block/curl.c | 8 +-
block/iscsi.c | 3 +-
block/linux-aio.c | 19 ++-
block/nbd-client.c | 8 +-
block/nfs.c | 7 +-
block/sheepdog.c | 26 ++--
block/ssh.c | 4 +-
block/win32-aio.c | 4 +-
hw/block/virtio-blk.c | 18 ++-
hw/scsi/virtio-scsi.c | 36 +++---
hw/virtio/virtio.c | 54 ++++++--
iohandler.c | 2 +-
iothread.c | 84 ++++++++++++
nbd/server.c | 9 +-
stubs/set-fd-handler.c | 1 +
tests/test-aio.c | 4 +-
util/event_notifier-posix.c | 2 +-
HACKING | 18 +++
trace-events | 6 +
24 files changed, 622 insertions(+), 110 deletions(-)
--
2.9.3
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [Qemu-devel] [PULL 00/14] Block patches
2017-01-04 13:34 Stefan Hajnoczi
@ 2017-01-05 13:57 ` Peter Maydell
0 siblings, 0 replies; 28+ messages in thread
From: Peter Maydell @ 2017-01-05 13:57 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: QEMU Developers
On 4 January 2017 at 13:34, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> The following changes since commit dbe2b65566e76d3c3a0c3358285c0336ac61e757:
>
> Merge remote-tracking branch 'remotes/vivier/tags/m68k-for-2.9-pull-request' into staging (2016-12-28 17:11:11 +0000)
>
> are available in the git repository at:
>
> git://github.com/stefanha/qemu.git tags/block-pull-request
>
> for you to fetch changes up to 5e5db49953e31689c1c70060870f0a7a6de26fcb:
>
> iothread: add poll-grow and poll-shrink parameters (2017-01-03 16:38:50 +0000)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------
Applied, thanks.
-- PMM
^ permalink raw reply [flat|nested] 28+ messages in thread
end of thread, other threads:[~2017-01-05 13:57 UTC | newest]
Thread overview: 28+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-09 11:09 [Qemu-devel] [PULL 00/14] Block patches Kevin Wolf
2010-12-09 11:09 ` [Qemu-devel] [PATCH 01/14] block: Make bdrv_create_file() ':' handling consistent Kevin Wolf
2010-12-09 11:09 ` [Qemu-devel] [PATCH 02/14] Add missing tracing to qemu_mallocz() Kevin Wolf
2010-12-09 11:09 ` [Qemu-devel] [PATCH 03/14] Use qemu_mallocz() instead of calloc() in img_convert() Kevin Wolf
2010-12-09 11:10 ` [Qemu-devel] [PATCH 04/14] img_convert(): Only try to free bs[] entries if bs is valid Kevin Wolf
2010-12-09 11:10 ` [Qemu-devel] [PATCH 05/14] Consolidate printing of block driver options Kevin Wolf
2010-12-09 11:10 ` [Qemu-devel] [PATCH 06/14] Fix formatting and missing braces in qemu-img.c Kevin Wolf
2010-12-09 11:10 ` [Qemu-devel] [PATCH 07/14] Fail if detecting an unknown option Kevin Wolf
2010-12-09 11:10 ` [Qemu-devel] [PATCH 08/14] Make error handling more consistent in img_create() and img_resize() Kevin Wolf
2010-12-09 11:10 ` [Qemu-devel] [PATCH 09/14] ceph/rbd block driver for qemu-kvm Kevin Wolf
2010-12-09 11:10 ` [Qemu-devel] [PATCH 10/14] qemu-img: Deprecate obsolete -6 and -e options Kevin Wolf
2010-12-09 11:10 ` [Qemu-devel] [PATCH 11/14] qemu-option: Don't reinvent append_option_parameters() Kevin Wolf
2010-12-09 11:10 ` [Qemu-devel] [PATCH 12/14] qemu-option: Fix parse_option_parameters() documentation typo Kevin Wolf
2010-12-09 11:10 ` [Qemu-devel] [PATCH 13/14] qemu-img: Free option parameter lists in img_create() Kevin Wolf
2010-12-09 11:10 ` [Qemu-devel] [PATCH 14/14] qemu-img: Fail creation if backing format is invalid Kevin Wolf
2010-12-15 15:56 ` [Qemu-devel] Re: [PULL 00/14] Block patches Kevin Wolf
2010-12-17 14:48 ` [Qemu-devel] " Anthony Liguori
-- strict thread matches above, loose matches on Subject: below --
2017-01-04 13:34 Stefan Hajnoczi
2017-01-05 13:57 ` Peter Maydell
2016-07-20 0:20 Jeff Cody
2016-07-20 17:51 ` Peter Maydell
2013-03-22 17:41 Kevin Wolf
2011-12-15 14:09 Kevin Wolf
2011-12-19 15:44 ` Anthony Liguori
2011-06-15 14:02 Kevin Wolf
2011-06-15 14:18 ` Anthony Liguori
2010-06-22 14:09 Kevin Wolf
2010-05-28 16:45 Kevin Wolf
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.