Commit 648db196 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2020-04-29' into staging 



Miscellaneous patches for 2020-04-29

# gpg: Signature made Wed 29 Apr 2020 07:42:52 BST
# gpg:                using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg:                issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-misc-2020-04-29: (32 commits)
  qemu-option: pass NULL rather than 0 to the id of qemu_opts_set()
  libqos: Give get_machine_allocator() internal linkage
  fuzz: Simplify how we compute available machines and types
  Makefile: Drop unused, broken target recurse-fuzz
  smbus: Fix spd_data_generate() for number of banks > 2
  bamboo, sam460ex: Tidy up error message for unsupported RAM size
  smbus: Fix spd_data_generate() error API violation
  sam460ex: Suppress useless warning on -m 32 and -m 64
  qga: Fix qmp_guest_suspend_{disk, ram}() error handling
  qga: Fix qmp_guest_get_memory_blocks() error handling
  tests/test-logging: Fix test for -dfilter 0..0xffffffffffffffff
  migration/colo: Fix qmp_xen_colo_do_checkpoint() error handling
  io: Fix qio_channel_socket_close() error handling
  xen/pt: Fix flawed conversion to realize()
  virtio-net: Fix duplex=... and speed=... error handling
  bochs-display: Fix vgamem=SIZE error handling
  fdc: Fix fallback=auto error handling
  arm/virt: Fix virt_machine_device_plug_cb() error API violation
  cpus: Proper range-checking for -icount shift=N
  cpus: Fix configure_icount() error API violation
  ...

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

Makefile

+0 −1
Original line number Diff line number Diff line
@@ -582,7 +582,6 @@ $(ROM_DIRS_RULES): 


.PHONY: recurse-all recurse-clean recurse-install

recurse-all: $(addsuffix /all, $(TARGET_DIRS) $(ROM_DIRS))

recurse-fuzz: $(addsuffix /fuzz, $(TARGET_DIRS) $(ROM_DIRS))

recurse-clean: $(addsuffix /clean, $(TARGET_DIRS) $(ROM_DIRS))

recurse-install: $(addsuffix /install, $(TARGET_DIRS))

$(addsuffix /install, $(TARGET_DIRS)): all

backends/cryptodev-builtin.c

+2 −8
Original line number Diff line number Diff line
@@ -282,12 +282,7 @@ static int cryptodev_builtin_sym_close_session( 
    CryptoDevBackendBuiltin *builtin =

                      CRYPTODEV_BACKEND_BUILTIN(backend);



    if (session_id >= MAX_NUM_SESSIONS ||

              builtin->sessions[session_id] == NULL) {

        error_setg(errp, "Cannot find a valid session id: %" PRIu64 "",

                      session_id);

        return -1;

    }

    assert(session_id < MAX_NUM_SESSIONS && builtin->sessions[session_id]);



    qcrypto_cipher_free(builtin->sessions[session_id]->cipher);

    g_free(builtin->sessions[session_id]);
@@ -356,8 +351,7 @@ static void cryptodev_builtin_cleanup( 


    for (i = 0; i < MAX_NUM_SESSIONS; i++) {

        if (builtin->sessions[i] != NULL) {

            cryptodev_builtin_sym_close_session(

                    backend, i, 0, errp);

            cryptodev_builtin_sym_close_session(backend, i, 0, &error_abort);

        }

    }

block/file-posix.c

+4 −1
Original line number Diff line number Diff line
@@ -2691,10 +2691,13 @@ static void check_cache_dropped(BlockDriverState *bs, Error **errp) 
        vec_end = DIV_ROUND_UP(length, page_size);

        for (i = 0; i < vec_end; i++) {

            if (vec[i] & 0x1) {

                error_setg(errp, "page cache still in use!");

                break;

            }

        }

        if (i < vec_end) {

            error_setg(errp, "page cache still in use!");

            break;

        }

    }



    if (window) {

block/replication.c

+2 −2
Original line number Diff line number Diff line
@@ -172,8 +172,8 @@ static void replication_child_perm(BlockDriverState *bs, BdrvChild *c, 
    if ((bs->open_flags & (BDRV_O_INACTIVE | BDRV_O_RDWR)) == BDRV_O_RDWR) {

        *nperm |= BLK_PERM_WRITE;

    }

    *nshared = BLK_PERM_CONSISTENT_READ \

               | BLK_PERM_WRITE \

    *nshared = BLK_PERM_CONSISTENT_READ

               | BLK_PERM_WRITE

               | BLK_PERM_WRITE_UNCHANGED;

    return;

}

block/vhdx.c

+4 −4
Original line number Diff line number Diff line
@@ -2206,20 +2206,20 @@ static QemuOptsList vhdx_create_opts = { 
           .name = VHDX_BLOCK_OPT_BLOCK_SIZE,

           .type = QEMU_OPT_SIZE,

           .def_value_str = stringify(0),

           .help = "Block Size; min 1MB, max 256MB. " \

           .help = "Block Size; min 1MB, max 256MB. "

                   "0 means auto-calculate based on image size."

       },

       {

           .name = BLOCK_OPT_SUBFMT,

           .type = QEMU_OPT_STRING,

           .help = "VHDX format type, can be either 'dynamic' or 'fixed'. "\

           .help = "VHDX format type, can be either 'dynamic' or 'fixed'. "

                   "Default is 'dynamic'."

       },

       {

           .name = VHDX_BLOCK_OPT_ZERO,

           .type = QEMU_OPT_BOOL,

           .help = "Force use of payload blocks of type 'ZERO'. "\

                   "Non-standard, but default.  Do not set to 'off' when "\

           .help = "Force use of payload blocks of type 'ZERO'. "

                   "Non-standard, but default.  Do not set to 'off' when "

                   "using 'qemu-img convert' with subformat=dynamic."

       },

       { NULL }