Commit 1a4dab84 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging 



Block layer patches

# gpg: Signature made Wed 25 Nov 2015 13:33:14 GMT using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"

* remotes/kevin/tags/for-upstream:
  qemu-iotests: Add -nographic when starting QEMU in 119 and 120
  block/qapi: Plug memory leak on query-block error path
  raw-posix.c: Make GetBSDPath() handle caching options
  nand: fix flash erase when oob is in memory
  test-aio: Fix event notifier cleanup
  tests/Makefile: Add more dependencies for test-timed-average

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents e85dda80 8c34d891

block/qapi.c

+3 −5
Original line number Diff line number Diff line
@@ -436,7 +436,9 @@ BlockInfoList *qmp_query_block(Error **errp) 
        bdrv_query_info(blk, &info->value, &local_err);

        if (local_err) {

            error_propagate(errp, local_err);

            goto err;

            g_free(info);

            qapi_free_BlockInfoList(head);

            return NULL;

        }



        *p_next = info;
@@ -444,10 +446,6 @@ BlockInfoList *qmp_query_block(Error **errp) 
    }



    return head;



 err:

    qapi_free_BlockInfoList(head);

    return NULL;

}



BlockStatsList *qmp_query_blockstats(bool has_query_nodes,

block/raw-posix.c

+9 −6
Original line number Diff line number Diff line
@@ -1976,8 +1976,8 @@ BlockDriver bdrv_file = { 


#if defined(__APPLE__) && defined(__MACH__)

static kern_return_t FindEjectableCDMedia( io_iterator_t *mediaIterator );

static kern_return_t GetBSDPath( io_iterator_t mediaIterator, char *bsdPath, CFIndex maxPathSize );



static kern_return_t GetBSDPath(io_iterator_t mediaIterator, char *bsdPath,

                                CFIndex maxPathSize, int flags);

kern_return_t FindEjectableCDMedia( io_iterator_t *mediaIterator )

{

    kern_return_t       kernResult;
@@ -2004,7 +2004,8 @@ kern_return_t FindEjectableCDMedia( io_iterator_t *mediaIterator ) 
    return kernResult;

}



kern_return_t GetBSDPath( io_iterator_t mediaIterator, char *bsdPath, CFIndex maxPathSize )

kern_return_t GetBSDPath(io_iterator_t mediaIterator, char *bsdPath,

                         CFIndex maxPathSize, int flags)

{

    io_object_t     nextMedia;

    kern_return_t   kernResult = KERN_FAILURE;
@@ -2017,7 +2018,9 @@ kern_return_t GetBSDPath( io_iterator_t mediaIterator, char *bsdPath, CFIndex ma 
        if ( bsdPathAsCFString ) {

            size_t devPathLength;

            strcpy( bsdPath, _PATH_DEV );

            if (flags & BDRV_O_NOCACHE) {

                strcat(bsdPath, "r");

            }

            devPathLength = strlen( bsdPath );

            if ( CFStringGetCString( bsdPathAsCFString, bsdPath + devPathLength, maxPathSize - devPathLength, kCFStringEncodingASCII ) ) {

                kernResult = KERN_SUCCESS;
@@ -2129,8 +2132,8 @@ static int hdev_open(BlockDriverState *bs, QDict *options, int flags, 
        int fd;



        kernResult = FindEjectableCDMedia( &mediaIterator );

        kernResult = GetBSDPath( mediaIterator, bsdPath, sizeof( bsdPath ) );



        kernResult = GetBSDPath(mediaIterator, bsdPath, sizeof(bsdPath),

                                flags);

        if ( bsdPath[ 0 ] != '\0' ) {

            strcat(bsdPath,"s0");

            /* some CDs don't have a partition 0 */

hw/block/nand.c

+1 −1
Original line number Diff line number Diff line
@@ -712,7 +712,7 @@ static void glue(nand_blk_erase_, PAGE_SIZE)(NANDFlashState *s) 
        memset(s->storage + (PAGE(addr) << OOB_SHIFT),

                        0xff, OOB_SIZE << s->erase_shift);

        i = SECTOR(addr);

        page = SECTOR(addr + (ADDR_SHIFT + s->erase_shift));

        page = SECTOR(addr + (1 << (ADDR_SHIFT + s->erase_shift)));

        for (; i < page; i ++)

            if (blk_write(s->blk, i, iobuf, 1) < 0) {

                printf("%s: write error in sector %" PRIu64 "\n", __func__, i);

tests/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -415,8 +415,7 @@ tests/test-vmstate$(EXESUF): tests/test-vmstate.o \ 
        migration/qemu-file-unix.o qjson.o \

	$(test-qom-obj-y)

tests/test-timed-average$(EXESUF): tests/test-timed-average.o qemu-timer.o \

	libqemuutil.a stubs/clock-warp.o stubs/cpu-get-icount.o \

	stubs/notify-event.o stubs/replay.o

	$(test-util-obj-y)



tests/test-qapi-types.c tests/test-qapi-types.h :\

$(SRC_PATH)/tests/qapi-schema/qapi-schema-test.json $(SRC_PATH)/scripts/qapi-types.py $(qapi-py)

tests/qemu-iotests/119

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ echo "{'execute': 'qmp_capabilities'} 
      {'execute': 'human-monitor-command',

       'arguments': {'command-line': 'qemu-io drv \"read -P 0 0 64k\"'}}

      {'execute': 'quit'}" \

    | $QEMU -drive id=drv,if=none,file="$TEST_IMG",driver=nbd \

    | $QEMU -nographic -drive id=drv,if=none,file="$TEST_IMG",driver=nbd \

            -qmp stdio -nodefaults \

    | _filter_qmp | _filter_qemu_io