Commit 4191d0eb authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging 



Block pull request

# gpg: Signature made Fri 14 Mar 2014 16:12:14 GMT using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/block-pull-request:
  qemu-iotests: remove 085 and 087 from 'quick' group
  qemu-iotests: add 083 NBD client disconnect tests
  tests: add nbd-fault-injector.py utility
  nbd: close socket if connection breaks
  block: Explicitly specify 'unsigned long long' for VHDX 64-bit constants
  blockdev: Refuse to open encrypted image unless paused

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 03d51428 46dea416

block.c

+8 −1
Original line number Diff line number Diff line
@@ -1388,12 +1388,19 @@ done: 
        ret = -EINVAL;

        goto close_and_fail;

    }

    QDECREF(options);



    if (!bdrv_key_required(bs)) {

        bdrv_dev_change_media_cb(bs, true);

    } else if (!runstate_check(RUN_STATE_PRELAUNCH)

               && !runstate_check(RUN_STATE_INMIGRATE)

               && !runstate_check(RUN_STATE_PAUSED)) { /* HACK */

        error_setg(errp,

                   "Guest must be stopped for opening of encrypted image");

        ret = -EBUSY;

        goto close_and_fail;

    }



    QDECREF(options);

    *pbs = bs;

    return 0;

block/nbd-client.c

+18 −15
Original line number Diff line number Diff line
@@ -43,6 +43,17 @@ static void nbd_recv_coroutines_enter_all(NbdClientSession *s) 
    }

}



static void nbd_teardown_connection(NbdClientSession *client)

{

    /* finish any pending coroutines */

    shutdown(client->sock, 2);

    nbd_recv_coroutines_enter_all(client);



    qemu_aio_set_fd_handler(client->sock, NULL, NULL, NULL);

    closesocket(client->sock);

    client->sock = -1;

}



static void nbd_reply_ready(void *opaque)

{

    NbdClientSession *s = opaque;
@@ -78,7 +89,7 @@ static void nbd_reply_ready(void *opaque) 
    }



fail:

    nbd_recv_coroutines_enter_all(s);

    nbd_teardown_connection(s);

}



static void nbd_restart_write(void *opaque)
@@ -324,7 +335,7 @@ int nbd_client_session_co_discard(NbdClientSession *client, int64_t sector_num, 


}



static void nbd_teardown_connection(NbdClientSession *client)

void nbd_client_session_close(NbdClientSession *client)

{

    struct nbd_request request = {

        .type = NBD_CMD_DISC,
@@ -332,22 +343,14 @@ static void nbd_teardown_connection(NbdClientSession *client) 
        .len = 0

    };



    nbd_send_request(client->sock, &request);



    /* finish any pending coroutines */

    shutdown(client->sock, 2);

    nbd_recv_coroutines_enter_all(client);



    qemu_aio_set_fd_handler(client->sock, NULL, NULL, NULL);

    closesocket(client->sock);

    client->sock = -1;

}



void nbd_client_session_close(NbdClientSession *client)

{

    if (!client->bs) {

        return;

    }

    if (client->sock == -1) {

        return;

    }



    nbd_send_request(client->sock, &request);



    nbd_teardown_connection(client);

    client->bs = NULL;

block/vhdx.h

+3 −3
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 
/* These structures are ones that are defined in the VHDX specification

 * document */



#define VHDX_FILE_SIGNATURE 0x656C696678646876  /* "vhdxfile" in ASCII */

#define VHDX_FILE_SIGNATURE 0x656C696678646876ULL  /* "vhdxfile" in ASCII */

typedef struct VHDXFileIdentifier {

    uint64_t    signature;              /* "vhdxfile" in ASCII */

    uint16_t    creator[256];           /* optional; utf-16 string to identify
@@ -238,7 +238,7 @@ typedef struct QEMU_PACKED VHDXLogDataSector { 
/* upper 44 bits are the file offset in 1MB units lower 3 bits are the state

   other bits are reserved */

#define VHDX_BAT_STATE_BIT_MASK 0x07

#define VHDX_BAT_FILE_OFF_MASK  0xFFFFFFFFFFF00000 /* upper 44 bits */

#define VHDX_BAT_FILE_OFF_MASK  0xFFFFFFFFFFF00000ULL /* upper 44 bits */

typedef uint64_t VHDXBatEntry;



/* ---- METADATA REGION STRUCTURES ---- */
@@ -247,7 +247,7 @@ typedef uint64_t VHDXBatEntry; 
#define VHDX_METADATA_MAX_ENTRIES 2047  /* not including the header */

#define VHDX_METADATA_TABLE_MAX_SIZE \

    (VHDX_METADATA_ENTRY_SIZE * (VHDX_METADATA_MAX_ENTRIES+1))

#define VHDX_METADATA_SIGNATURE 0x617461646174656D  /* "metadata" in ASCII */

#define VHDX_METADATA_SIGNATURE 0x617461646174656DULL  /* "metadata" in ASCII */

typedef struct QEMU_PACKED VHDXMetadataTableHeader {

    uint64_t    signature;              /* "metadata" in ASCII */

    uint16_t    reserved;

stubs/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ stub-obj-y += mon-set-error.o 
stub-obj-y += pci-drive-hot-add.o

stub-obj-y += qtest.o

stub-obj-y += reset.o

stub-obj-y += runstate-check.o

stub-obj-y += set-fd-handler.o

stub-obj-y += slirp.o

stub-obj-y += sysbus.o

stubs/runstate-check.c

0 → 100644
+6 −0
Original line number Diff line number Diff line 
#include "sysemu/sysemu.h"



bool runstate_check(RunState state)

{

    return state == RUN_STATE_PRELAUNCH;

}