External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-26 06:25:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename qemudMonitorSendCont to qemuMonitorStartCPUs

Browse Source 
* src/qemu/qemu_monitor.c, src/qemu/qemu_monitor.h: Rename
  Rename qemudMonitorSendCont to qemuMonitorStartCPUs
* src/qemu/qemu_driver.c: Update callers for new name
This commit is contained in:
Daniel P. Berrange 2009-09-23 12:10:58 +01:00
parent 3aee261527
commit 4734a4227f
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/qemu/qemu_driver.c
View File

@ -1262,7 +1262,7 @@ qemudInitCpus(virConnectPtr conn,
if (migrateFrom == NULL) { if (migrateFrom == NULL) {
/* Allow the CPUS to start executing */ /* Allow the CPUS to start executing */
if (qemudMonitorSendCont(conn, vm) < 0) { if (qemuMonitorStartCPUs(conn, vm) < 0) {
if (virGetLastError() == NULL) if (virGetLastError() == NULL)
qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
"%s", _("resume operation failed")); "%s", _("resume operation failed"));
@ -1275,7 +1275,7 @@ qemudInitCpus(virConnectPtr conn,
static int static int
qemudInitPasswords(struct qemud_driver *driver, qemuInitPasswords(struct qemud_driver *driver,
virDomainObjPtr vm) { virDomainObjPtr vm) {
int ret = 0; int ret = 0;
@ -2136,7 +2136,7 @@ static int qemudStartVMDaemon(virConnectPtr conn,
if ((qemudWaitForMonitor(conn, driver, vm, pos) < 0) || if ((qemudWaitForMonitor(conn, driver, vm, pos) < 0) ||
(qemuDetectVcpuPIDs(conn, vm) < 0) || (qemuDetectVcpuPIDs(conn, vm) < 0) ||
(qemudInitCpus(conn, vm, migrateFrom) < 0) || (qemudInitCpus(conn, vm, migrateFrom) < 0) ||
(qemudInitPasswords(driver, vm) < 0) || (qemuInitPasswords(driver, vm) < 0) ||
(qemudDomainSetMemoryBalloon(conn, vm, vm->def->memory) < 0) || (qemudDomainSetMemoryBalloon(conn, vm, vm->def->memory) < 0) ||
(virDomainSaveStatus(conn, driver->stateDir, vm) < 0)) { (virDomainSaveStatus(conn, driver->stateDir, vm) < 0)) {
qemudShutdownVMDaemon(conn, driver, vm); qemudShutdownVMDaemon(conn, driver, vm);
@ -2819,7 +2819,7 @@ static int qemudDomainResume(virDomainPtr dom) {
goto cleanup; goto cleanup;
} }
if (vm->state == VIR_DOMAIN_PAUSED) { if (vm->state == VIR_DOMAIN_PAUSED) {
if (qemudMonitorSendCont(dom->conn, vm) < 0) { if (qemuMonitorStartCPUs(dom->conn, vm) < 0) {
if (virGetLastError() == NULL) if (virGetLastError() == NULL)
qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED, qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED,
"%s", _("resume operation failed")); "%s", _("resume operation failed"));
@ -3579,7 +3579,7 @@ cleanup:
will support synchronous operations so we always get here after will support synchronous operations so we always get here after
the migration is complete. */ the migration is complete. */
if (resume && paused) { if (resume && paused) {
if (qemudMonitorSendCont(dom->conn, vm) < 0) { if (qemuMonitorStartCPUs(dom->conn, vm) < 0) {
if (virGetLastError() == NULL) if (virGetLastError() == NULL)
qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED, qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED,
"%s", _("resuming after dump failed")); "%s", _("resuming after dump failed"));
@ -4095,7 +4095,7 @@ static int qemudDomainRestore(virConnectPtr conn,
/* If it was running before, resume it now. */ /* If it was running before, resume it now. */
if (header.was_running) { if (header.was_running) {
if (qemudMonitorSendCont(conn, vm) < 0) { if (qemuMonitorStartCPUs(conn, vm) < 0) {
if (virGetLastError() == NULL) if (virGetLastError() == NULL)
qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED, qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED,
"%s", _("failed to resume domain")); "%s", _("failed to resume domain"));
@ -6828,7 +6828,7 @@ qemudDomainMigratePerform (virDomainPtr dom,
cleanup: cleanup:
if (paused) { if (paused) {
/* we got here through some sort of failure; start the domain again */ /* we got here through some sort of failure; start the domain again */
if (qemudMonitorSendCont(dom->conn, vm) < 0) { if (qemuMonitorStartCPUs(dom->conn, vm) < 0) {
/* Hm, we already know we are in error here. We don't want to /* Hm, we already know we are in error here. We don't want to
* overwrite the previous error, though, so we just throw something * overwrite the previous error, though, so we just throw something
* to the logs and hope for the best * to the logs and hope for the best
@ -6884,7 +6884,7 @@ qemudDomainMigrateFinish2 (virConnectPtr dconn,
* >= 0.10.6 to work properly. This isn't strictly necessary on * >= 0.10.6 to work properly. This isn't strictly necessary on
* older qemu's, but it also doesn't hurt anything there * older qemu's, but it also doesn't hurt anything there
*/ */
if (qemudMonitorSendCont(dconn, vm) < 0) { if (qemuMonitorStartCPUs(dconn, vm) < 0) {
if (virGetLastError() == NULL) if (virGetLastError() == NULL)
qemudReportError(dconn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, qemudReportError(dconn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
"%s", _("resume operation failed")); "%s", _("resume operation failed"));

2
src/qemu/qemu_monitor_text.c
View File

@ -424,7 +424,7 @@ qemudMonitorSendVolumePassphrase(const virDomainObjPtr vm,
} }
int int
qemudMonitorSendCont(virConnectPtr conn, qemuMonitorStartCPUs(virConnectPtr conn,
const virDomainObjPtr vm) { const virDomainObjPtr vm) {
char *reply; char *reply;

2
src/qemu/qemu_monitor_text.h
View File

@ -65,7 +65,7 @@ int qemudMonitorCommandExtra(const virDomainObjPtr vm,
/* Formal APIs for each required monitor command */ /* Formal APIs for each required monitor command */
int qemudMonitorSendCont(virConnectPtr conn, int qemuMonitorStartCPUs(virConnectPtr conn,
const virDomainObjPtr vm); const virDomainObjPtr vm);
int qemuMonitorGetCPUInfo(const virDomainObjPtr vm, int qemuMonitorGetCPUInfo(const virDomainObjPtr vm,