Commit d681127d authored by Peter Maydell's avatar Peter Maydell
Browse files

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



# gpg: Signature made Sun 02 Oct 2016 02:49:58 BST
# gpg:                using RSA key 0xCA35624C6A9171C6
# gpg: Good signature from "Fam Zheng <famz@redhat.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: 5003 7CB7 9706 0F76 F021  AD56 CA35 624C 6A91 71C6

* remotes/famz/tags/for-upstream:
  docker: Build in a clean directory
  smbios: fix uuid copy
  xenpv: Fix qemu_uuid compiling error

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents c5d128ff c16fe84f

hw/smbios/smbios.c

+1 −1
Original line number Diff line number Diff line
@@ -486,7 +486,7 @@ static void smbios_build_type_0_table(void) 
 */

static void smbios_encode_uuid(struct smbios_uuid *uuid, QemuUUID *in)

{

    memcpy(uuid, &in, 16);

    memcpy(uuid, in, 16);

    if (smbios_uuid_encoded) {

        uuid->time_low = bswap32(uuid->time_low);

        uuid->time_mid = bswap16(uuid->time_mid);

hw/xenpv/xen_domainbuild.c

+1 −1
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ int xen_domain_build_pv(const char *kernel, const char *ramdisk, 
    unsigned long xenstore_mfn = 0, console_mfn = 0;

    int rc;



    memcpy(uuid, qemu_uuid, sizeof(uuid));

    memcpy(uuid, &qemu_uuid, sizeof(uuid));

    rc = xen_domain_create(xen_xc, ssidref, uuid, flags, &xen_domid);

    if (rc < 0) {

        fprintf(stderr, "xen: xc_domain_create() failed\n");

tests/docker/common.rc

+3 −0
Original line number Diff line number Diff line
@@ -11,6 +11,9 @@ 
# or (at your option) any later version. See the COPYING file in

# the top-level directory.



BUILD_DIR=/var/tmp/qemu-build

mkdir $BUILD_DIR



requires()

{

    for c in $@; do

tests/docker/test-clang

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 


requires clang



cd "$BUILD_DIR"



OPTS="--enable-debug --cxx=clang++ --cc=clang --host-cc=clang"

# -fsanitize=undefined is broken on Fedora 23, skip it for now

# See also: https://bugzilla.redhat.com/show_bug.cgi?id=1263834

tests/docker/test-full

+2 −0
Original line number Diff line number Diff line
@@ -13,5 +13,7 @@ 


. common.rc



cd "$BUILD_DIR"



build_qemu

make check $MAKEFLAGS