Commit 039e285e authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-pull-request' into staging 



Trivial fixes (20191112)
ivshmem-server, error messages (numa, qom) and
Makefile (bios-microvm) fixes

# gpg: Signature made Tue 12 Nov 2019 10:04:03 GMT
# gpg:                using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg:                issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier2/tags/trivial-branch-pull-request:
  ivshmem-server: Terminate also on SIGINT
  ivshmem-server: Clean up shmem on shutdown
  numa: Add missing \n to error message
  qom: Fix error message in object_class_property_add()
  Makefile: install bios-microvm like other binary blobs

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents b0f2855b 5c62979e

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -773,7 +773,7 @@ de-ch es fo fr-ca hu ja mk pt sl tr \ 
bepo    cz



ifdef INSTALL_BLOBS

BLOBS=bios.bin bios-256k.bin sgabios.bin vgabios.bin vgabios-cirrus.bin \

BLOBS=bios.bin bios-256k.bin bios-microvm.bin sgabios.bin vgabios.bin vgabios-cirrus.bin \

vgabios-stdvga.bin vgabios-vmware.bin vgabios-qxl.bin vgabios-virtio.bin \

vgabios-ramfb.bin vgabios-bochs-display.bin vgabios-ati.bin \

ppc_rom.bin openbios-sparc32 openbios-sparc64 openbios-ppc QEMU,tcx.bin QEMU,cgthree.bin \

contrib/ivshmem-server/ivshmem-server.c

+6 −0
Original line number Diff line number Diff line
@@ -353,6 +353,9 @@ ivshmem_server_start(IvshmemServer *server) 
err_close_sock:

    close(sock_fd);

err_close_shm:

    if (server->use_shm_open) {

        shm_unlink(server->shm_path);

    }

    close(shm_fd);

    return -1;

}
@@ -370,6 +373,9 @@ ivshmem_server_close(IvshmemServer *server) 
    }



    unlink(server->unix_sock_path);

    if (server->use_shm_open) {

        shm_unlink(server->shm_path);

    }

    close(server->sock_fd);

    close(server->shm_fd);

    server->sock_fd = -1;

contrib/ivshmem-server/main.c

+3 −2
Original line number Diff line number Diff line
@@ -223,8 +223,9 @@ main(int argc, char *argv[]) 
    sa_quit.sa_handler = ivshmem_server_quit_cb;

    sa_quit.sa_flags = 0;

    if (sigemptyset(&sa_quit.sa_mask) == -1 ||

        sigaction(SIGTERM, &sa_quit, 0) == -1) {

        perror("failed to add SIGTERM handler; sigaction");

        sigaction(SIGTERM, &sa_quit, 0) == -1 ||

        sigaction(SIGINT, &sa_quit, 0) == -1) {

        perror("failed to add signal handler; sigaction");

        goto err;

    }

hw/core/numa.c

+1 −1
Original line number Diff line number Diff line
@@ -503,7 +503,7 @@ static void allocate_system_memory_nonnuma(MemoryRegion *mr, Object *owner, 
            warn_report("falling back to regular RAM allocation");

            error_printf("This is deprecated. Make sure that -mem-path "

                         " specified path has sufficient resources to allocate"

                         " -m specified RAM amount");

                         " -m specified RAM amount\n");

            /* Legacy behavior: if allocation failed, fall back to

             * regular RAM allocation.

             */

qom/object.c

+4 −6
Original line number Diff line number Diff line
@@ -1106,9 +1106,8 @@ object_property_add(Object *obj, const char *name, const char *type, 
    }



    if (object_property_find(obj, name, NULL) != NULL) {

        error_setg(errp, "attempt to add duplicate property '%s'"

                   " to object (type '%s')", name,

                   object_get_typename(obj));

        error_setg(errp, "attempt to add duplicate property '%s' to object (type '%s')",

                   name, object_get_typename(obj));

        return NULL;

    }
@@ -1139,9 +1138,8 @@ object_class_property_add(ObjectClass *klass, 
    ObjectProperty *prop;



    if (object_class_property_find(klass, name, NULL) != NULL) {

        error_setg(errp, "attempt to add duplicate property '%s'"

                   " to object (type '%s')", name,

                   object_class_get_name(klass));

        error_setg(errp, "attempt to add duplicate property '%s' to class (type '%s')",

                   name, object_class_get_name(klass));

        return NULL;

    }