Message ID | 1483452256-2879-9-git-send-email-boris.ostrovsky@oracle.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Tue, Jan 03, 2017 at 09:04:12AM -0500, Boris Ostrovsky wrote: > Currently HVM guests that use upstream qemu do not update xenstore's > availability entry for VCPUs. While it is not strictly necessary for > hotplug to work, xenstore ends up not reflecting actual status of > VCPUs. We should fix this. > > Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com> Acked-by: Wei Liu <wei.liu2@citrix.com> > --- > tools/libxl/libxl.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c > index 6fd4fe1..bbbb3de 100644 > --- a/tools/libxl/libxl.c > +++ b/tools/libxl/libxl.c > @@ -5148,7 +5148,6 @@ int libxl_set_vcpuonline(libxl_ctx *ctx, uint32_t domid, libxl_bitmap *cpumap) > switch (libxl__device_model_version_running(gc, domid)) { > case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: > case LIBXL_DEVICE_MODEL_VERSION_NONE: > - rc = libxl__set_vcpuonline_xenstore(gc, domid, cpumap, &info); > break; > case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: > rc = libxl__set_vcpuonline_qmp(gc, domid, cpumap, &info); > @@ -5158,11 +5157,14 @@ int libxl_set_vcpuonline(libxl_ctx *ctx, uint32_t domid, libxl_bitmap *cpumap) > } > break; > case LIBXL_DOMAIN_TYPE_PV: > - rc = libxl__set_vcpuonline_xenstore(gc, domid, cpumap, &info); > break; > default: > rc = ERROR_INVAL; > } > + > + if (!rc) > + rc = libxl__set_vcpuonline_xenstore(gc, domid, cpumap, &info); > + > out: > libxl_dominfo_dispose(&info); > GC_FREE; > -- > 2.7.4 >
diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 6fd4fe1..bbbb3de 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -5148,7 +5148,6 @@ int libxl_set_vcpuonline(libxl_ctx *ctx, uint32_t domid, libxl_bitmap *cpumap) switch (libxl__device_model_version_running(gc, domid)) { case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: case LIBXL_DEVICE_MODEL_VERSION_NONE: - rc = libxl__set_vcpuonline_xenstore(gc, domid, cpumap, &info); break; case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: rc = libxl__set_vcpuonline_qmp(gc, domid, cpumap, &info); @@ -5158,11 +5157,14 @@ int libxl_set_vcpuonline(libxl_ctx *ctx, uint32_t domid, libxl_bitmap *cpumap) } break; case LIBXL_DOMAIN_TYPE_PV: - rc = libxl__set_vcpuonline_xenstore(gc, domid, cpumap, &info); break; default: rc = ERROR_INVAL; } + + if (!rc) + rc = libxl__set_vcpuonline_xenstore(gc, domid, cpumap, &info); + out: libxl_dominfo_dispose(&info); GC_FREE;
Currently HVM guests that use upstream qemu do not update xenstore's availability entry for VCPUs. While it is not strictly necessary for hotplug to work, xenstore ends up not reflecting actual status of VCPUs. We should fix this. Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com> --- tools/libxl/libxl.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)