Proxmox-Port/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2025-08-15 05:06:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

-----BEGIN PGP SIGNATURE-----

Browse Source 
Version: GnuPG v2
 
 iQEcBAABCAAGBQJX8GfGAAoJEMo1YkxqkXHGFGQH/27Zjku3/aImefu+BkpYt3Zn
 xbSqnPPpmqZqJmjf5JNIJm3YP9wYMk0BrSzitUox/1SAGR/2FoAc78ODVVUgisJD
 NmJI4yHxow4KmqHpjoQ5lZEeWZOPg+KhNEtVOf+QuedrrSpsQCoe5AEPSQKP9Ngg
 OoxMj/Iu+RZawl7QFizqAvHNkfS9Km02P56BnXsh02Ie1QeckPE/lTj1J1HTI5it
 vlQk7GXCoAhbXnlzKPXN1iiPL+7G7QJZ9INF28l1JWX8chO4XK7yqywfjPtL5Ej8
 PeZM18kSXrpnSffktnfTlUfa3Ancle7bN+BnkY5Ws7E1njX2WkxyIRfV1V9krHU=
 =6JV5
 -----END PGP SIGNATURE-----

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: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2016-10-04 11:01:39 +01:00
commit d681127d37
7 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/smbios/smbios.c
View File

@ -486,7 +486,7 @@ static void smbios_build_type_0_table(void)
*/ */
static void smbios_encode_uuid(struct smbios_uuid *uuid, QemuUUID *in) static void smbios_encode_uuid(struct smbios_uuid *uuid, QemuUUID *in)
{ {
memcpy(uuid, &in, 16); memcpy(uuid, in, 16);
if (smbios_uuid_encoded) { if (smbios_uuid_encoded) {
uuid->time_low = bswap32(uuid->time_low); uuid->time_low = bswap32(uuid->time_low);
uuid->time_mid = bswap16(uuid->time_mid); uuid->time_mid = bswap16(uuid->time_mid);

2
hw/xenpv/xen_domainbuild.c
View File

@ -232,7 +232,7 @@ int xen_domain_build_pv(const char *kernel, const char *ramdisk,
unsigned long xenstore_mfn = 0, console_mfn = 0; unsigned long xenstore_mfn = 0, console_mfn = 0;
int rc; 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); rc = xen_domain_create(xen_xc, ssidref, uuid, flags, &xen_domid);
if (rc < 0) { if (rc < 0) {
fprintf(stderr, "xen: xc_domain_create() failed\n"); fprintf(stderr, "xen: xc_domain_create() failed\n");

3
tests/docker/common.rc
View File

@ -11,6 +11,9 @@
# or (at your option) any later version. See the COPYING file in # or (at your option) any later version. See the COPYING file in
# the top-level directory. # the top-level directory.
BUILD_DIR=/var/tmp/qemu-build
mkdir $BUILD_DIR
requires() requires()
{ {
for c in $@; do for c in $@; do

2
tests/docker/test-clang
View File

@ -15,6 +15,8 @@
requires clang requires clang
cd "$BUILD_DIR"
OPTS="--enable-debug --cxx=clang++ --cc=clang --host-cc=clang" OPTS="--enable-debug --cxx=clang++ --cc=clang --host-cc=clang"
# -fsanitize=undefined is broken on Fedora 23, skip it for now # -fsanitize=undefined is broken on Fedora 23, skip it for now
# See also: https://bugzilla.redhat.com/show_bug.cgi?id=1263834 # See also: https://bugzilla.redhat.com/show_bug.cgi?id=1263834

2
tests/docker/test-full
View File

@ -13,5 +13,7 @@
. common.rc . common.rc
cd "$BUILD_DIR"
build_qemu build_qemu
make check $MAKEFLAGS make check $MAKEFLAGS

2
tests/docker/test-mingw
View File

@ -15,6 +15,8 @@
requires mingw dtc requires mingw dtc
cd "$BUILD_DIR"
for prefix in x86_64-w64-mingw32- i686-w64-mingw32-; do for prefix in x86_64-w64-mingw32- i686-w64-mingw32-; do
TARGET_LIST=x86_64-softmmu,aarch64-softmmu \ TARGET_LIST=x86_64-softmmu,aarch64-softmmu \
build_qemu --cross-prefix=$prefix \ build_qemu --cross-prefix=$prefix \

2
tests/docker/test-quick
View File

@ -13,6 +13,8 @@
. common.rc . common.rc
cd "$BUILD_DIR"
DEF_TARGET_LIST="x86_64-softmmu,aarch64-softmmu" DEF_TARGET_LIST="x86_64-softmmu,aarch64-softmmu"
TARGET_LIST=${TARGET_LIST:-$DEF_TARGET_LIST} \ TARGET_LIST=${TARGET_LIST:-$DEF_TARGET_LIST} \
build_qemu build_qemu