On 09/20/2016 04:11 AM, Viktor Mihajlovski wrote:
> Adding a field to the domain's private vcpu object to hold the halted
> state information.
> Adding two functions in support of the halted state:
> - qemuDomainGetVcpuHalted: retrieve the halted state from a
> private vcpu object
> - qemuDomainRefreshVcpuHalted: obtain the per-vcpu halted states
> via qemu monitor and store the results in the private vcpu objects
>
> Signed-off-by: Viktor Mihajlovski <mihajlov@xxxxxxxxxxxxxxxxxx>
> Reviewed-by: Bjoern Walk <bwalk@xxxxxxxxxxxxxxxxxx>
> Reviewed-by: Hao QingFeng <haoqf@xxxxxxxxxxxxxxxxxx>
> Signed-off-by: Boris Fiuczynski <fiuczy@xxxxxxxxxxxxxxxxxx>
> ---
> src/qemu/qemu_domain.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++
> src/qemu/qemu_domain.h | 5 ++++
> 2 files changed, 74 insertions(+)
>
> diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
> index 3f16dbe..3fb9b4f 100644
> --- a/src/qemu/qemu_domain.c
> +++ b/src/qemu/qemu_domain.c
> @@ -5956,6 +5956,75 @@ qemuDomainRefreshVcpuInfo(virQEMUDriverPtr driver,
> return ret;
> }
>
> +/**
> + * qemuDomainGetVcpuHalted:
> + * @vm: domain object
> + * @vcpu: cpu id
> + *
> + * Returns the vCPU halted state.
> + */
> +bool
> +qemuDomainGetVcpuHalted(virDomainObjPtr vm,
> + unsigned int vcpuid)
> +{
> + virDomainVcpuDefPtr vcpu = virDomainDefGetVcpu(vm->def, vcpuid);
> + return QEMU_DOMAIN_VCPU_PRIVATE(vcpu)->halted;
> +}
> +
> +/**
> + * qemuDomainRefreshVcpuHalted:
> + * @driver: qemu driver data
> + * @vm: domain object
> + * @asyncJob: current asynchronous job type
> + *
> + * Updates vCPU halted state in the private data of @vm.
> + *
> + * Returns number of detected vCPUs on success, -1 on error and reports
> + * an appropriate error, -2 if the domain doesn't exist any more.
Neither of the callers checks -1 or -2, just < 0, so is this really
necessary?
> + */
> +int
> +qemuDomainRefreshVcpuHalted(virQEMUDriverPtr driver,
> + virDomainObjPtr vm,
> + int asyncJob)
> +{
> + virDomainVcpuDefPtr vcpu;
> + qemuMonitorCPUInfoPtr info = NULL;
> + size_t maxvcpus = virDomainDefGetVcpusMax(vm->def);
> + size_t i;
> + bool hotplug;
> + int rc;
> + int ret = -1;
> +
> + /* Not supported currently for TCG, see qemuDomainRefreshVcpuInfo */
> + if (vm->def->virtType == VIR_DOMAIN_VIRT_QEMU)
> + return 0;
Since the "default" is halted = true could we run into a situation where
"halted" (or "running (inactive)") is always set for TCG...
> +
> + hotplug = qemuDomainSupportsNewVcpuHotplug(vm);
> +
> + if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0)
> + return -1;
> +
> + rc = qemuMonitorGetCPUInfo(qemuDomainGetMonitor(vm), &info, maxvcpus, hotplug);
> +
> + if (qemuDomainObjExitMonitor(driver, vm) < 0) {
> + ret = -2;
I see no need to ret = -2;
> + goto cleanup;
> + }
> +
> + if (rc < 0)
> + goto cleanup;
> +
> + for (i = 0; i < maxvcpus; i++) {
> + vcpu = virDomainDefGetVcpu(vm->def, i);
> + QEMU_DOMAIN_VCPU_PRIVATE(vcpu)->halted = info[i].halted;
> + }
> +
> + ret = 0;
> +
> + cleanup:
> + qemuMonitorCPUInfoFree(info, maxvcpus);
> + return ret;
> +}
>
> bool
> qemuDomainSupportsNicdev(virDomainDefPtr def,
> diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
> index a1404d0..03e58c5 100644
> --- a/src/qemu/qemu_domain.h
> +++ b/src/qemu/qemu_domain.h
> @@ -317,6 +317,7 @@ struct _qemuDomainVcpuPrivate {
> pid_t tid; /* vcpu thread id */
> int enable_id; /* order in which the vcpus were enabled in qemu */
> char *alias;
> + bool halted; /* vcpu halted state */
Another less than necessary comment ;-)
John
>
> /* information for hotpluggable cpus */
> char *type;
> @@ -662,6 +663,10 @@ int qemuDomainRefreshVcpuInfo(virQEMUDriverPtr driver,
> virDomainObjPtr vm,
> int asyncJob,
> bool state);
> +bool qemuDomainGetVcpuHalted(virDomainObjPtr vm, unsigned int vcpu);
> +int qemuDomainRefreshVcpuHalted(virQEMUDriverPtr driver,
> + virDomainObjPtr vm,
> + int asyncJob);
>
> bool qemuDomainSupportsNicdev(virDomainDefPtr def,
> virDomainNetDefPtr net);
>
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list