Commit ffd455ae authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2016-09-20' into staging 



Block patches for 2.8

# gpg: Signature made Tue 20 Sep 2016 21:29:53 BST
# gpg:                using RSA key 0xF407DB0061D5CF40
# gpg: Good signature from "Max Reitz <mreitz@redhat.com>"
# Primary key fingerprint: 91BE B60A 30DB 3E88 57D1  1829 F407 DB00 61D5 CF40

* remotes/maxreitz/tags/pull-block-2016-09-20:
  iotest 055: refactor and speed up
  commit: get the overlay node before manipulating the backing chain
  blockdev: Modularize nfs block driver
  blockdev: Add dynamic module loading for block drivers
  blockdev: Add dynamic generation of module_block.h
  blockdev: prepare iSCSI block driver for dynamic loading
  qemu-img: add skip option to dd
  qemu-img: add the 'dd' subcommand

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents b98bbea2 819cec01

Makefile

+7 −3
Original line number Diff line number Diff line
@@ -76,6 +76,8 @@ GENERATED_HEADERS += trace/generated-ust-provider.h 
GENERATED_SOURCES += trace/generated-ust.c

endif



GENERATED_HEADERS += module_block.h



# Don't try to regenerate Makefile or configure

# We don't generate any of them

Makefile: ;
@@ -245,9 +247,6 @@ Makefile: $(version-obj-y) $(version-lobj-y) 
libqemustub.a: $(stub-obj-y)

libqemuutil.a: $(util-obj-y)



block-modules = $(foreach o,$(block-obj-m),"$(basename $(subst /,-,$o))",) NULL

util/module.o-cflags = -D'CONFIG_BLOCK_MODULES=$(block-modules)'



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



qemu-img.o: qemu-img-cmds.h
@@ -352,6 +351,11 @@ ivshmem-client$(EXESUF): $(ivshmem-client-obj-y) libqemuutil.a libqemustub.a 
ivshmem-server$(EXESUF): $(ivshmem-server-obj-y) libqemuutil.a libqemustub.a

	$(call LINK, $^)



module_block.h: $(SRC_PATH)/scripts/modules/module_block.py config-host.mak

	$(call quiet-command,$(PYTHON) $< $@ \

	$(addprefix $(SRC_PATH)/,$(patsubst %.mo,%.c,$(block-obj-m))), \

	"  GEN   $@")



clean:

# avoid old build problems by removing potentially incorrect old files

	rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h

block.c

+55 −7
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include "block/blockjob.h"

#include "block/nbd.h"

#include "qemu/error-report.h"

#include "module_block.h"

#include "qemu/module.h"

#include "qapi/qmp/qerror.h"

#include "qapi/qmp/qbool.h"
@@ -242,17 +243,40 @@ BlockDriverState *bdrv_new(void) 
    return bs;

}



BlockDriver *bdrv_find_format(const char *format_name)

static BlockDriver *bdrv_do_find_format(const char *format_name)

{

    BlockDriver *drv1;



    QLIST_FOREACH(drv1, &bdrv_drivers, list) {

        if (!strcmp(drv1->format_name, format_name)) {

            return drv1;

        }

    }



    return NULL;

}



BlockDriver *bdrv_find_format(const char *format_name)

{

    BlockDriver *drv1;

    int i;



    drv1 = bdrv_do_find_format(format_name);

    if (drv1) {

        return drv1;

    }



    /* The driver isn't registered, maybe we need to load a module */

    for (i = 0; i < (int)ARRAY_SIZE(block_driver_modules); ++i) {

        if (!strcmp(block_driver_modules[i].format_name, format_name)) {

            block_module_load_one(block_driver_modules[i].library_name);

            break;

        }

    }



    return bdrv_do_find_format(format_name);

}



static int bdrv_is_whitelisted(BlockDriver *drv, bool read_only)

{

    static const char *whitelist_rw[] = {
@@ -461,6 +485,19 @@ static BlockDriver *find_hdev_driver(const char *filename) 
    return drv;

}



static BlockDriver *bdrv_do_find_protocol(const char *protocol)

{

    BlockDriver *drv1;



    QLIST_FOREACH(drv1, &bdrv_drivers, list) {

        if (drv1->protocol_name && !strcmp(drv1->protocol_name, protocol)) {

            return drv1;

        }

    }



    return NULL;

}



BlockDriver *bdrv_find_protocol(const char *filename,

                                bool allow_protocol_prefix,

                                Error **errp)
@@ -469,6 +506,7 @@ BlockDriver *bdrv_find_protocol(const char *filename, 
    char protocol[128];

    int len;

    const char *p;

    int i;



    /* TODO Drivers without bdrv_file_open must be specified explicitly */
@@ -495,15 +533,25 @@ BlockDriver *bdrv_find_protocol(const char *filename, 
        len = sizeof(protocol) - 1;

    memcpy(protocol, filename, len);

    protocol[len] = '\0';

    QLIST_FOREACH(drv1, &bdrv_drivers, list) {

        if (drv1->protocol_name &&

            !strcmp(drv1->protocol_name, protocol)) {



    drv1 = bdrv_do_find_protocol(protocol);

    if (drv1) {

        return drv1;

    }



    for (i = 0; i < (int)ARRAY_SIZE(block_driver_modules); ++i) {

        if (block_driver_modules[i].protocol_name &&

            !strcmp(block_driver_modules[i].protocol_name, protocol)) {

            block_module_load_one(block_driver_modules[i].library_name);

            break;

        }

    }



    drv1 = bdrv_do_find_protocol(protocol);

    if (!drv1) {

        error_setg(errp, "Unknown protocol '%s'", protocol);

    return NULL;

    }

    return drv1;

}



/*

block/Makefile.objs

+2 −2
Original line number Diff line number Diff line 
block-obj-y += raw_bsd.o qcow.o vdi.o vmdk.o cloop.o bochs.o vpc.o vvfat.o

block-obj-y += raw_bsd.o qcow.o vdi.o vmdk.o cloop.o bochs.o vpc.o vvfat.o dmg.o

block-obj-y += qcow2.o qcow2-refcount.o qcow2-cluster.o qcow2-snapshot.o qcow2-cache.o

block-obj-y += qed.o qed-gencb.o qed-l2-cache.o qed-table.o qed-cluster.o

block-obj-y += qed-check.o
@@ -29,6 +29,7 @@ block-obj-y += crypto.o 


common-obj-y += stream.o



nfs.o-libs         := $(LIBNFS_LIBS)

iscsi.o-cflags     := $(LIBISCSI_CFLAGS)

iscsi.o-libs       := $(LIBISCSI_LIBS)

curl.o-cflags      := $(CURL_CFLAGS)
@@ -40,7 +41,6 @@ gluster.o-libs := $(GLUSTERFS_LIBS) 
ssh.o-cflags       := $(LIBSSH2_CFLAGS)

ssh.o-libs         := $(LIBSSH2_LIBS)

archipelago.o-libs := $(ARCHIPELAGO_LIBS)

block-obj-m        += dmg.o

dmg.o-libs         := $(BZIP2_LIBS)

qcow.o-libs        := -lz

linux-aio.o-libs   := -laio

block/commit.c

+1 −2
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static void commit_complete(BlockJob *job, void *opaque) 
    BlockDriverState *active = s->active;

    BlockDriverState *top = blk_bs(s->top);

    BlockDriverState *base = blk_bs(s->base);

    BlockDriverState *overlay_bs;

    BlockDriverState *overlay_bs = bdrv_find_overlay(active, top);

    int ret = data->ret;



    if (!block_job_is_cancelled(&s->common) && ret == 0) {
@@ -97,7 +97,6 @@ static void commit_complete(BlockJob *job, void *opaque) 
    if (s->base_flags != bdrv_get_flags(base)) {

        bdrv_reopen(base, s->base_flags, NULL);

    }

    overlay_bs = bdrv_find_overlay(active, top);

    if (overlay_bs && s->orig_overlay_flags != bdrv_get_flags(overlay_bs)) {

        bdrv_reopen(overlay_bs, s->orig_overlay_flags, NULL);

    }

block/iscsi.c

+0 −36
Original line number Diff line number Diff line
@@ -2010,45 +2010,9 @@ static BlockDriver bdrv_iscsi = { 
    .bdrv_attach_aio_context = iscsi_attach_aio_context,

};



static QemuOptsList qemu_iscsi_opts = {

    .name = "iscsi",

    .head = QTAILQ_HEAD_INITIALIZER(qemu_iscsi_opts.head),

    .desc = {

        {

            .name = "user",

            .type = QEMU_OPT_STRING,

            .help = "username for CHAP authentication to target",

        },{

            .name = "password",

            .type = QEMU_OPT_STRING,

            .help = "password for CHAP authentication to target",

        },{

            .name = "password-secret",

            .type = QEMU_OPT_STRING,

            .help = "ID of the secret providing password for CHAP "

                    "authentication to target",

        },{

            .name = "header-digest",

            .type = QEMU_OPT_STRING,

            .help = "HeaderDigest setting. "

                    "{CRC32C|CRC32C-NONE|NONE-CRC32C|NONE}",

        },{

            .name = "initiator-name",

            .type = QEMU_OPT_STRING,

            .help = "Initiator iqn name to use when connecting",

        },{

            .name = "timeout",

            .type = QEMU_OPT_NUMBER,

            .help = "Request timeout in seconds (default 0 = no timeout)",

        },

        { /* end of list */ }

    },

};



static void iscsi_block_init(void)

{

    bdrv_register(&bdrv_iscsi);

    qemu_add_opts(&qemu_iscsi_opts);

}



block_init(iscsi_block_init);