Merge remote-tracking branch 'stefanha/trivial-patches' into staging

qemu-img.o: qemu-img-cmds.h

qemu-img.o qemu-tool.o qemu-nbd.o qemu-io.o cmd.o qemu-ga.o: $(GENERATED_HEADERS)

tools-obj-y = qemu-tool.o qemu-error.o $(oslib-obj-y) $(trace-obj-y) \

        $(block-obj-y) $(qobject-obj-y) $(version-obj-y) qemu-timer-common.o

tools-obj-y = qemu-tool.o $(oslib-obj-y) $(trace-obj-y) \

	qemu-timer-common.o cutils.o

qemu-img$(EXESUF): qemu-img.o $(tools-obj-y)

qemu-nbd$(EXESUF): qemu-nbd.o $(tools-obj-y)

qemu-io$(EXESUF): qemu-io.o cmd.o $(tools-obj-y)

qemu-img$(EXESUF): qemu-img.o $(tools-obj-y) $(block-obj-y)

qemu-nbd$(EXESUF): qemu-nbd.o $(tools-obj-y) $(block-obj-y)

qemu-io$(EXESUF): qemu-io.o cmd.o $(tools-obj-y) $(block-obj-y)

qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx

	$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"  GEN   $@")

check-qint.o check-qstring.o check-qdict.o check-qlist.o check-qfloat.o check-qjson.o test-coroutine.o: $(GENERATED_HEADERS)

CHECK_PROG_DEPS = $(oslib-obj-y) $(trace-obj-y) qemu-tool.o

check-qint: check-qint.o qint.o $(CHECK_PROG_DEPS)

check-qstring: check-qstring.o qstring.o $(CHECK_PROG_DEPS)

check-qdict: check-qdict.o qdict.o qfloat.o qint.o qstring.o qbool.o qlist.o $(CHECK_PROG_DEPS)

check-qlist: check-qlist.o qlist.o qint.o $(CHECK_PROG_DEPS)

check-qfloat: check-qfloat.o qfloat.o $(CHECK_PROG_DEPS)

check-qjson: check-qjson.o qfloat.o qint.o qdict.o qstring.o qlist.o qbool.o qjson.o json-streamer.o json-lexer.o json-parser.o error.o qerror.o qemu-error.o $(CHECK_PROG_DEPS)

test-coroutine: test-coroutine.o qemu-timer-common.o async.o $(coroutine-obj-y) $(CHECK_PROG_DEPS)

check-qint: check-qint.o qint.o $(tools-obj-y)

check-qstring: check-qstring.o qstring.o $(tools-obj-y)

check-qdict: check-qdict.o qdict.o qfloat.o qint.o qstring.o qbool.o qlist.o $(tools-obj-y)

check-qlist: check-qlist.o qlist.o qint.o $(tools-obj-y)

check-qfloat: check-qfloat.o qfloat.o $(tools-obj-y)

check-qjson: check-qjson.o $(qobject-obj-y) $(tools-obj-y)

test-coroutine: test-coroutine.o qemu-timer-common.o async.o $(coroutine-obj-y) $(tools-obj-y)

$(qapi-obj-y): $(GENERATED_HEADERS)

qapi-dir := qapi-generated

	$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py -m -o "." < $<, "  GEN   $@")

test-visitor.o: $(addprefix $(qapi-dir)/, test-qapi-types.c test-qapi-types.h test-qapi-visit.c test-qapi-visit.h) $(qapi-obj-y)

test-visitor: test-visitor.o qfloat.o qint.o qdict.o qstring.o qlist.o qbool.o $(qapi-obj-y) error.o osdep.o $(oslib-obj-y) qjson.o json-streamer.o json-lexer.o json-parser.o qerror.o qemu-error.o qemu-tool.o $(qapi-dir)/test-qapi-visit.o $(qapi-dir)/test-qapi-types.o

test-visitor: test-visitor.o $(qobject-obj-y) $(qapi-obj-y) $(tools-obj-y) $(qapi-dir)/test-qapi-visit.o $(qapi-dir)/test-qapi-types.o

test-qmp-commands.o: $(addprefix $(qapi-dir)/, test-qapi-types.c test-qapi-types.h test-qapi-visit.c test-qapi-visit.h test-qmp-marshal.c test-qmp-commands.h) $(qapi-obj-y)

test-qmp-commands: test-qmp-commands.o qfloat.o qint.o qdict.o qstring.o qlist.o qbool.o $(qapi-obj-y) error.o osdep.o $(oslib-obj-y) qjson.o json-streamer.o json-lexer.o json-parser.o qerror.o qemu-error.o qemu-tool.o $(qapi-dir)/test-qapi-visit.o $(qapi-dir)/test-qapi-types.o $(qapi-dir)/test-qmp-marshal.o module.o

test-qmp-commands: test-qmp-commands.o $(qobject-obj-y) $(qapi-obj-y) $(tools-obj-y) $(qapi-dir)/test-qapi-visit.o $(qapi-dir)/test-qapi-types.o $(qapi-dir)/test-qmp-marshal.o module.o

QGALIB_GEN=$(addprefix $(qapi-dir)/, qga-qapi-types.c qga-qapi-types.h qga-qapi-visit.c qga-qmp-marshal.c)

$(QGALIB_GEN): $(GENERATED_HEADERS)

$(qga-obj-y) qemu-ga.o: $(QGALIB_GEN)

qemu-ga$(EXESUF): qemu-ga.o $(qga-obj-y) $(qapi-obj-y) $(trace-obj-y) $(qobject-obj-y) $(version-obj-y) $(addprefix $(qapi-dir)/, qga-qapi-visit.o qga-qapi-types.o qga-qmp-marshal.o)

qemu-ga$(EXESUF): qemu-ga.o $(qga-obj-y) $(qapi-obj-y) $(tools-obj-y) $(qobject-obj-y) $(version-obj-y) $(addprefix $(qapi-dir)/, qga-qapi-visit.o qga-qapi-types.o qga-qmp-marshal.o)

QEMULIBS=libhw32 libhw64 libuser libdis libdis-user

# QObject

qobject-obj-y = qint.o qstring.o qdict.o qlist.o qfloat.o qbool.o

qobject-obj-y += qjson.o json-lexer.o json-streamer.o json-parser.o

qobject-obj-y += qerror.o error.o

qobject-obj-y += qerror.o error.o qemu-error.o

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

# oslib-obj-y is code depending on the OS (win32 vs posix)

block-obj-y = cutils.o cache-utils.o qemu-option.o module.o async.o

block-obj-y += nbd.o block.o aio.o aes.o qemu-config.o qemu-progress.o qemu-sockets.o

block-obj-y += $(coroutine-obj-y)

block-obj-y += $(coroutine-obj-y) $(qobject-obj-y) $(version-obj-y)

block-obj-$(CONFIG_POSIX) += posix-aio-compat.o

block-obj-$(CONFIG_LINUX_AIO) += linux-aio.o

common-obj-y += $(net-obj-y)

common-obj-y += $(qobject-obj-y)

common-obj-$(CONFIG_LINUX) += $(fsdev-obj-$(CONFIG_LINUX))

common-obj-y += readline.o console.o cursor.o qemu-error.o

common-obj-y += readline.o console.o cursor.o

common-obj-y += $(oslib-obj-y)

common-obj-$(CONFIG_WIN32) += os-win32.o

common-obj-$(CONFIG_POSIX) += os-posix.o

qga-nested-y = guest-agent-commands.o guest-agent-command-state.o

qga-obj-y = $(addprefix qga/, $(qga-nested-y))

qga-obj-y += qemu-ga.o qemu-tool.o qemu-error.o qemu-sockets.o module.o qemu-option.o cutils.o osdep.o

qga-obj-y += qemu-ga.o qemu-sockets.o module.o qemu-option.o

qga-obj-$(CONFIG_WIN32) += oslib-win32.o

qga-obj-$(CONFIG_POSIX) += oslib-posix.o

    if (ret < 0) {

        return ret;

    }

    ret = 0; /* ret should always be 0 or -errno */

    qed_header_le_to_cpu(&le_header, &s->header);

    if (s->header.magic != QED_MAGIC) {

    memcpy(buffer, &le_header, sizeof(le_header));

    buffer_len = sizeof(le_header);

    if (backing_file) {

        memcpy(buffer + buffer_len, backing_file, backing_file_len);

        buffer_len += backing_file_len;

    }

    /* Write new header */

    ret = bdrv_pwrite_sync(bs->file, 0, buffer, buffer_len);

static uint32_t vmdk_read_cid(BlockDriverState *bs, int parent)

{

    char desc[DESC_SIZE];

    uint32_t cid;

    uint32_t cid = 0xffffffff;

    const char *p_name, *cid_str;

    size_t cid_str_size;

    BDRVVmdkState *s = bs->opaque;

            bdrv_delete(bs);

            return -EINVAL;

        }

        filesize = bdrv_getlength(bs);

        parent_cid = vmdk_read_cid(bs, 0);

        bdrv_delete(bs);

        relative_path(parent_filename, sizeof(parent_filename),

    int retval;

    if (!basename) {

        g_free(dupname);

        return -1;

    }