diff mbox

[8/8] s390x/kvm: fix build against qemu_uuid

Message ID 1474976917-102710-9-git-send-email-borntraeger@de.ibm.com (mailing list archive)
State New, archived
Headers show

Commit Message

Christian Borntraeger Sept. 27, 2016, 11:48 a.m. UTC 
commit 9c5ce8db2e5c ("vl: Switch qemu_uuid to QemuUUID") changed most
users of qemu_uuid but not all. Fix a build error on s390/kvm.

Cc: Fam Zheng <famz@redhat.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
 target-s390x/kvm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Fam Zheng Sept. 27, 2016, 12:32 p.m. UTC | #1 
On Tue, 09/27 13:48, Christian Borntraeger wrote:
> commit 9c5ce8db2e5c ("vl: Switch qemu_uuid to QemuUUID") changed most
> users of qemu_uuid but not all. Fix a build error on s390/kvm.
> 
> Cc: Fam Zheng <famz@redhat.com>
> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
> ---
>  target-s390x/kvm.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
> index a95d3da..495905c 100644
> --- a/target-s390x/kvm.c
> +++ b/target-s390x/kvm.c
> @@ -1999,7 +1999,7 @@ static void insert_stsi_3_2_2(S390CPU *cpu, __u64 addr, uint8_t ar)
>          strcpy((char *)sysib.ext_names[0], "KVMguest");
>      }
>      /* Insert UUID */
> -    memcpy(sysib.vm[0].uuid, qemu_uuid, sizeof(sysib.vm[0].uuid));
> +    memcpy(sysib.vm[0].uuid, &qemu_uuid, sizeof(sysib.vm[0].uuid));
>  
>      s390_cpu_virt_mem_write(cpu, addr, ar, &sysib, sizeof(sysib));
>  }
> -- 
> 2.5.5
> 

Reviewed-by: Fam Zheng <famz@redhat.com>
diff mbox

Patch

diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
index a95d3da..495905c 100644
--- a/target-s390x/kvm.c
+++ b/target-s390x/kvm.c
@@ -1999,7 +1999,7 @@  static void insert_stsi_3_2_2(S390CPU *cpu, __u64 addr, uint8_t ar)
         strcpy((char *)sysib.ext_names[0], "KVMguest");
     }
     /* Insert UUID */
-    memcpy(sysib.vm[0].uuid, qemu_uuid, sizeof(sysib.vm[0].uuid));
+    memcpy(sysib.vm[0].uuid, &qemu_uuid, sizeof(sysib.vm[0].uuid));
 
     s390_cpu_virt_mem_write(cpu, addr, ar, &sysib, sizeof(sysib));
 }