diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-10-04 11:01:39 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-10-04 11:01:39 +0100 |
| commit | d681127d37e192dcf6f15802236d1fbfaf15d682 (patch) | |
| tree | c920b16d392329aff2e2b6567c42e790ed1ecf8e /hw | |
| parent | c5d128ffeb5357df1ea3e6de0c13b3d6a09f6064 (diff) | |
| parent | c16fe84f07a9d3a04c11ce8a139e13a092b384c2 (diff) | |
| download | qemu-d681127d37e192dcf6f15802236d1fbfaf15d682.zip qemu-d681127d37e192dcf6f15802236d1fbfaf15d682.tar.gz qemu-d681127d37e192dcf6f15802236d1fbfaf15d682.tar.bz2 | |
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>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/smbios/smbios.c | 2 | ||||
| -rw-r--r-- | hw/xenpv/xen_domainbuild.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c index 9a6552a..3a96ced 100644 --- a/hw/smbios/smbios.c +++ b/hw/smbios/smbios.c @@ -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); diff --git a/hw/xenpv/xen_domainbuild.c b/hw/xenpv/xen_domainbuild.c index b439b0e..457a897 100644 --- a/hw/xenpv/xen_domainbuild.c +++ b/hw/xenpv/xen_domainbuild.c @@ -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"); |