| Message ID | 1474968011-29382-1-git-send-email-famz@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 09/27/2016 04:20 AM, Fam Zheng wrote: > 9c5ce8db2 switched the type of qemu_uuid and this should have followed. > Fix it. > > Signed-off-by: Fam Zheng <famz@redhat.com> > --- > hw/xenpv/xen_domainbuild.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Reviewed-by: Eric Blake <eblake@redhat.com> > > 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"); >
On Tue, 27 Sep 2016, Eric Blake wrote: > On 09/27/2016 04:20 AM, Fam Zheng wrote: > > 9c5ce8db2 switched the type of qemu_uuid and this should have followed. > > Fix it. > > > > Signed-off-by: Fam Zheng <famz@redhat.com> > > --- > > hw/xenpv/xen_domainbuild.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > Reviewed-by: Eric Blake <eblake@redhat.com> Acked-by: Stefano Stabellini <sstabellini@kernel.org> > > > > 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"); > > > > -- > Eric Blake eblake redhat com +1-919-301-3266 > Libvirt virtualization library http://libvirt.org > >
On Wed, 09/28 17:03, Stefano Stabellini wrote: > On Tue, 27 Sep 2016, Eric Blake wrote: > > On 09/27/2016 04:20 AM, Fam Zheng wrote: > > > 9c5ce8db2 switched the type of qemu_uuid and this should have followed. > > > Fix it. > > > > > > Signed-off-by: Fam Zheng <famz@redhat.com> > > > --- > > > hw/xenpv/xen_domainbuild.c | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > Reviewed-by: Eric Blake <eblake@redhat.com> > > Acked-by: Stefano Stabellini <sstabellini@kernel.org> Queued for next pull request, thanks. Fam
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");
9c5ce8db2 switched the type of qemu_uuid and this should have followed. Fix it. Signed-off-by: Fam Zheng <famz@redhat.com> --- hw/xenpv/xen_domainbuild.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)