openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

qemu: remove ignore_value for qemuDomainObjExitMonitor 

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Ján Tomko 2021-11-24 13:12:40 +01:00
parent 57d665b390
commit c3e79a9008
8 changed files with 35 additions and 35 deletions

4
src/qemu/qemu_backup.c
View File

@ -132,7 +132,7 @@ qemuBackupDiskDataCleanupOne(virDomainObj *vm,
if (dd->added) { if (dd->added) {
qemuDomainObjEnterMonitor(priv->driver, vm); qemuDomainObjEnterMonitor(priv->driver, vm);
qemuBlockStorageSourceAttachRollback(priv->mon, dd->crdata->srcdata[0]); qemuBlockStorageSourceAttachRollback(priv->mon, dd->crdata->srcdata[0]);
ignore_value(qemuDomainObjExitMonitor(priv->driver, vm)); qemuDomainObjExitMonitor(priv->driver, vm);
} }
if (dd->created) { if (dd->created) {
@ -935,7 +935,7 @@ qemuBackupBegin(virDomainObj *vm,
ignore_value(qemuMonitorDelObject(priv->mon, tlsAlias, false)); ignore_value(qemuMonitorDelObject(priv->mon, tlsAlias, false));
if (tlsSecretAlias) if (tlsSecretAlias)
ignore_value(qemuMonitorDelObject(priv->mon, tlsSecretAlias, false)); ignore_value(qemuMonitorDelObject(priv->mon, tlsSecretAlias, false));
ignore_value(qemuDomainObjExitMonitor(priv->driver, vm)); qemuDomainObjExitMonitor(priv->driver, vm);
} }
if (ret < 0 && !job_started && priv->backup) if (ret < 0 && !job_started && priv->backup)

2
src/qemu/qemu_block.c
View File

@ -2906,7 +2906,7 @@ qemuBlockStorageSourceCreate(virDomainObj *vm,
qemuDomainObjEnterMonitorAsync(priv->driver, vm, asyncJob) == 0) { qemuDomainObjEnterMonitorAsync(priv->driver, vm, asyncJob) == 0) {
qemuBlockStorageSourceAttachRollback(priv->mon, data); qemuBlockStorageSourceAttachRollback(priv->mon, data);
ignore_value(qemuDomainObjExitMonitor(priv->driver, vm)); qemuDomainObjExitMonitor(priv->driver, vm);
} }
return ret; return ret;

2
src/qemu/qemu_domain.c
View File

@ -6968,7 +6968,7 @@ qemuDomainSnapshotDiscard(virQEMUDriver *driver,
qemuDomainObjEnterMonitor(driver, vm); qemuDomainObjEnterMonitor(driver, vm);
/* we continue on even in the face of error */ /* we continue on even in the face of error */
qemuMonitorDeleteSnapshot(priv->mon, snap->def->name); qemuMonitorDeleteSnapshot(priv->mon, snap->def->name);
ignore_value(qemuDomainObjExitMonitor(driver, vm)); qemuDomainObjExitMonitor(driver, vm);
} }
} }

18
src/qemu/qemu_driver.c
View File

@ -3123,7 +3123,7 @@ qemuDumpToFd(virQEMUDriver *driver,
_("unsupported dumpformat '%s' " _("unsupported dumpformat '%s' "
"for this QEMU binary"), "for this QEMU binary"),
dumpformat); dumpformat);
ignore_value(qemuDomainObjExitMonitor(driver, vm)); qemuDomainObjExitMonitor(driver, vm);
return -1; return -1;
} }
} }
@ -3422,7 +3422,7 @@ qemuDomainScreenshot(virDomainPtr dom,
qemuDomainObjEnterMonitor(driver, vm); qemuDomainObjEnterMonitor(driver, vm);
if (qemuMonitorScreendump(priv->mon, videoAlias, screen, tmp) < 0) { if (qemuMonitorScreendump(priv->mon, videoAlias, screen, tmp) < 0) {
ignore_value(qemuDomainObjExitMonitor(driver, vm)); qemuDomainObjExitMonitor(driver, vm);
goto endjob; goto endjob;
} }
qemuDomainObjExitMonitor(driver, vm); qemuDomainObjExitMonitor(driver, vm);
@ -5305,7 +5305,7 @@ qemuDomainHotplugAddIOThread(virQEMUDriver *driver,
if (qemuMonitorDelObject(priv->mon, alias, true) < 0) if (qemuMonitorDelObject(priv->mon, alias, true) < 0)
VIR_WARN("deletion of iothread object %d of domain %s failed when cleanup", VIR_WARN("deletion of iothread object %d of domain %s failed when cleanup",
iothread_id, vm->def->name); iothread_id, vm->def->name);
ignore_value(qemuDomainObjExitMonitor(driver, vm)); qemuDomainObjExitMonitor(driver, vm);
} }
} }
@ -5320,7 +5320,7 @@ qemuDomainHotplugAddIOThread(virQEMUDriver *driver,
return ret; return ret;
exit_monitor: exit_monitor:
ignore_value(qemuDomainObjExitMonitor(driver, vm)); qemuDomainObjExitMonitor(driver, vm);
goto cleanup; goto cleanup;
} }
@ -5408,7 +5408,7 @@ qemuDomainHotplugDelIOThread(virQEMUDriver *driver,
return ret; return ret;
exit_monitor: exit_monitor:
ignore_value(qemuDomainObjExitMonitor(driver, vm)); qemuDomainObjExitMonitor(driver, vm);
goto cleanup; goto cleanup;
} }
@ -9910,7 +9910,7 @@ qemuDomainBlockResize(virDomainPtr dom,
qemuDomainObjEnterMonitor(driver, vm); qemuDomainObjEnterMonitor(driver, vm);
if (qemuMonitorBlockResize(priv->mon, device, nodename, size) < 0) { if (qemuMonitorBlockResize(priv->mon, device, nodename, size) < 0) {
ignore_value(qemuDomainObjExitMonitor(driver, vm)); qemuDomainObjExitMonitor(driver, vm);
goto endjob; goto endjob;
} }
qemuDomainObjExitMonitor(driver, vm); qemuDomainObjExitMonitor(driver, vm);
@ -10799,12 +10799,12 @@ qemuDomainMemoryPeek(virDomainPtr dom,
qemuDomainObjEnterMonitor(driver, vm); qemuDomainObjEnterMonitor(driver, vm);
if (flags == VIR_MEMORY_VIRTUAL) { if (flags == VIR_MEMORY_VIRTUAL) {
if (qemuMonitorSaveVirtualMemory(priv->mon, offset, size, tmp) < 0) { if (qemuMonitorSaveVirtualMemory(priv->mon, offset, size, tmp) < 0) {
ignore_value(qemuDomainObjExitMonitor(driver, vm)); qemuDomainObjExitMonitor(driver, vm);
goto endjob; goto endjob;
} }
} else { } else {
if (qemuMonitorSavePhysicalMemory(priv->mon, offset, size, tmp) < 0) { if (qemuMonitorSavePhysicalMemory(priv->mon, offset, size, tmp) < 0) {
ignore_value(qemuDomainObjExitMonitor(driver, vm)); qemuDomainObjExitMonitor(driver, vm);
goto endjob; goto endjob;
} }
} }
@ -15187,7 +15187,7 @@ qemuDomainBlockCopyCommon(virDomainObj *vm,
qemuBlockStorageSourceChainDetach(priv->mon, data); qemuBlockStorageSourceChainDetach(priv->mon, data);
if (crdata) if (crdata)
qemuBlockStorageSourceAttachRollback(priv->mon, crdata->srcdata[0]); qemuBlockStorageSourceAttachRollback(priv->mon, crdata->srcdata[0]);
ignore_value(qemuDomainObjExitMonitor(driver, vm)); qemuDomainObjExitMonitor(driver, vm);
} }
if (need_revoke) if (need_revoke)
qemuDomainStorageSourceChainAccessRevoke(driver, vm, mirror); qemuDomainStorageSourceChainAccessRevoke(driver, vm, mirror);

26
src/qemu/qemu_hotplug.c
View File

@ -1440,7 +1440,7 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver,
if (qemuMonitorAddFileHandleToSet(priv->mon, vdpafd, -1, if (qemuMonitorAddFileHandleToSet(priv->mon, vdpafd, -1,
net->data.vdpa.devicepath, net->data.vdpa.devicepath,
&fdinfo) < 0) { &fdinfo) < 0) {
ignore_value(qemuDomainObjExitMonitor(driver, vm)); qemuDomainObjExitMonitor(driver, vm);
goto cleanup; goto cleanup;
} }
vdpafdName = g_strdup_printf("/dev/fdset/%d", fdinfo.fdset); vdpafdName = g_strdup_printf("/dev/fdset/%d", fdinfo.fdset);
@ -1450,13 +1450,13 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver,
tapfdName, tapfdSize, tapfdName, tapfdSize,
vhostfdName, vhostfdSize, vhostfdName, vhostfdSize,
slirpfdName, vdpafdName))) { slirpfdName, vdpafdName))) {
ignore_value(qemuDomainObjExitMonitor(driver, vm)); qemuDomainObjExitMonitor(driver, vm);
goto cleanup; goto cleanup;
} }
if (actualType == VIR_DOMAIN_NET_TYPE_VHOSTUSER) { if (actualType == VIR_DOMAIN_NET_TYPE_VHOSTUSER) {
if (qemuHotplugChardevAttach(priv->mon, charDevAlias, net->data.vhostuser) < 0) { if (qemuHotplugChardevAttach(priv->mon, charDevAlias, net->data.vhostuser) < 0) {
ignore_value(qemuDomainObjExitMonitor(driver, vm)); qemuDomainObjExitMonitor(driver, vm);
virDomainAuditNet(vm, NULL, net, "attach", false); virDomainAuditNet(vm, NULL, net, "attach", false);
goto cleanup; goto cleanup;
} }
@ -1467,7 +1467,7 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver,
tapfd, tapfdName, tapfdSize, tapfd, tapfdName, tapfdSize,
vhostfd, vhostfdName, vhostfdSize, vhostfd, vhostfdName, vhostfdSize,
slirpfd, slirpfdName) < 0) { slirpfd, slirpfdName) < 0) {
ignore_value(qemuDomainObjExitMonitor(driver, vm)); qemuDomainObjExitMonitor(driver, vm);
virDomainAuditNet(vm, NULL, net, "attach", false); virDomainAuditNet(vm, NULL, net, "attach", false);
goto try_remove; goto try_remove;
} }
@ -1486,14 +1486,14 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver,
qemuDomainObjEnterMonitor(driver, vm); qemuDomainObjEnterMonitor(driver, vm);
if (qemuDomainAttachExtensionDevice(priv->mon, &net->info) < 0) { if (qemuDomainAttachExtensionDevice(priv->mon, &net->info) < 0) {
ignore_value(qemuDomainObjExitMonitor(driver, vm)); qemuDomainObjExitMonitor(driver, vm);
virDomainAuditNet(vm, NULL, net, "attach", false); virDomainAuditNet(vm, NULL, net, "attach", false);
goto try_remove; goto try_remove;
} }
if (qemuMonitorAddDeviceProps(priv->mon, &nicprops) < 0) { if (qemuMonitorAddDeviceProps(priv->mon, &nicprops) < 0) {
ignore_value(qemuDomainDetachExtensionDevice(priv->mon, &net->info)); ignore_value(qemuDomainDetachExtensionDevice(priv->mon, &net->info));
ignore_value(qemuDomainObjExitMonitor(driver, vm)); qemuDomainObjExitMonitor(driver, vm);
virDomainAuditNet(vm, NULL, net, "attach", false); virDomainAuditNet(vm, NULL, net, "attach", false);
goto try_remove; goto try_remove;
} }
@ -1508,7 +1508,7 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver,
qemuDomainObjEnterMonitor(driver, vm); qemuDomainObjEnterMonitor(driver, vm);
if (qemuMonitorSetLink(priv->mon, net->info.alias, VIR_DOMAIN_NET_INTERFACE_LINK_STATE_DOWN) < 0) { if (qemuMonitorSetLink(priv->mon, net->info.alias, VIR_DOMAIN_NET_INTERFACE_LINK_STATE_DOWN) < 0) {
ignore_value(qemuDomainObjExitMonitor(driver, vm)); qemuDomainObjExitMonitor(driver, vm);
virDomainAuditNet(vm, NULL, net, "attach", false); virDomainAuditNet(vm, NULL, net, "attach", false);
goto try_remove; goto try_remove;
} }
@ -1607,7 +1607,7 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver,
qemuMonitorRemoveNetdev(priv->mon, netdev_name) < 0) qemuMonitorRemoveNetdev(priv->mon, netdev_name) < 0)
VIR_WARN("Failed to remove network backend for netdev %s", VIR_WARN("Failed to remove network backend for netdev %s",
netdev_name); netdev_name);
ignore_value(qemuDomainObjExitMonitor(driver, vm)); qemuDomainObjExitMonitor(driver, vm);
virErrorRestore(&originalError); virErrorRestore(&originalError);
goto cleanup; goto cleanup;
} }
@ -1766,7 +1766,7 @@ qemuDomainDelTLSObjects(virQEMUDriver *driver,
if (secAlias) if (secAlias)
ignore_value(qemuMonitorDelObject(priv->mon, secAlias, false)); ignore_value(qemuMonitorDelObject(priv->mon, secAlias, false));
ignore_value(qemuDomainObjExitMonitor(driver, vm)); qemuDomainObjExitMonitor(driver, vm);
cleanup: cleanup:
virErrorRestore(&orig_err); virErrorRestore(&orig_err);
@ -1803,7 +1803,7 @@ qemuDomainAddTLSObjects(virQEMUDriver *driver,
error: error:
virErrorPreserveLast(&orig_err); virErrorPreserveLast(&orig_err);
ignore_value(qemuDomainObjExitMonitor(driver, vm)); qemuDomainObjExitMonitor(driver, vm);
virErrorRestore(&orig_err); virErrorRestore(&orig_err);
qemuDomainDelTLSObjects(driver, vm, asyncJob, secAlias, NULL); qemuDomainDelTLSObjects(driver, vm, asyncJob, secAlias, NULL);
@ -1985,7 +1985,7 @@ int qemuDomainAttachRedirdevDevice(virQEMUDriver *driver,
/* detach associated chardev on error */ /* detach associated chardev on error */
if (chardevAdded) if (chardevAdded)
ignore_value(qemuMonitorDetachCharDev(priv->mon, charAlias)); ignore_value(qemuMonitorDetachCharDev(priv->mon, charAlias));
ignore_value(qemuDomainObjExitMonitor(driver, vm)); qemuDomainObjExitMonitor(driver, vm);
virErrorRestore(&orig_err); virErrorRestore(&orig_err);
qemuDomainDelTLSObjects(driver, vm, QEMU_ASYNC_JOB_NONE, qemuDomainDelTLSObjects(driver, vm, QEMU_ASYNC_JOB_NONE,
secAlias, tlsAlias); secAlias, tlsAlias);
@ -2260,7 +2260,7 @@ int qemuDomainAttachChrDevice(virQEMUDriver *driver,
/* detach associated chardev on error */ /* detach associated chardev on error */
if (chardevAttached) if (chardevAttached)
qemuMonitorDetachCharDev(priv->mon, charAlias); qemuMonitorDetachCharDev(priv->mon, charAlias);
ignore_value(qemuDomainObjExitMonitor(driver, vm)); qemuDomainObjExitMonitor(driver, vm);
virErrorRestore(&orig_err); virErrorRestore(&orig_err);
qemuDomainDelTLSObjects(driver, vm, QEMU_ASYNC_JOB_NONE, qemuDomainDelTLSObjects(driver, vm, QEMU_ASYNC_JOB_NONE,
@ -2684,7 +2684,7 @@ qemuDomainAttachHostSCSIDevice(virQEMUDriver *driver,
exit_monitor: exit_monitor:
virErrorPreserveLast(&orig_err); virErrorPreserveLast(&orig_err);
qemuBlockStorageSourceAttachRollback(priv->mon, data); qemuBlockStorageSourceAttachRollback(priv->mon, data);
ignore_value(qemuDomainObjExitMonitor(driver, vm)); qemuDomainObjExitMonitor(driver, vm);
virErrorRestore(&orig_err); virErrorRestore(&orig_err);
virDomainAuditHostdev(vm, hostdev, "attach", false); virDomainAuditHostdev(vm, hostdev, "attach", false);

14
src/qemu/qemu_migration.c
View File

@ -529,7 +529,7 @@ qemuMigrationDstStartNBDServer(virQEMUDriver *driver,
return ret; return ret;
exit_monitor: exit_monitor:
ignore_value(qemuDomainObjExitMonitor(driver, vm)); qemuDomainObjExitMonitor(driver, vm);
goto cleanup; goto cleanup;
} }
@ -4368,7 +4368,7 @@ qemuMigrationSrcRun(virQEMUDriver *driver,
qemuDomainObjEnterMonitorAsync(driver, vm, qemuDomainObjEnterMonitorAsync(driver, vm,
QEMU_ASYNC_JOB_MIGRATION_OUT) == 0) { QEMU_ASYNC_JOB_MIGRATION_OUT) == 0) {
qemuMonitorMigrateCancel(priv->mon); qemuMonitorMigrateCancel(priv->mon);
ignore_value(qemuDomainObjExitMonitor(driver, vm)); qemuDomainObjExitMonitor(driver, vm);
} }
/* cancel any outstanding NBD jobs */ /* cancel any outstanding NBD jobs */
@ -4389,7 +4389,7 @@ qemuMigrationSrcRun(virQEMUDriver *driver,
goto cleanup; goto cleanup;
exit_monitor: exit_monitor:
ignore_value(qemuDomainObjExitMonitor(driver, vm)); qemuDomainObjExitMonitor(driver, vm);
goto error; goto error;
} }
@ -5970,11 +5970,11 @@ qemuMigrationSrcToFile(virQEMUDriver *driver, virDomainObj *vm,
if (virSetCloseExec(pipeFD[1]) < 0) { if (virSetCloseExec(pipeFD[1]) < 0) {
virReportSystemError(errno, "%s", virReportSystemError(errno, "%s",
_("Unable to set cloexec flag")); _("Unable to set cloexec flag"));
ignore_value(qemuDomainObjExitMonitor(driver, vm)); qemuDomainObjExitMonitor(driver, vm);
goto cleanup; goto cleanup;
} }
if (virCommandRunAsync(compressor, NULL) < 0) { if (virCommandRunAsync(compressor, NULL) < 0) {
ignore_value(qemuDomainObjExitMonitor(driver, vm)); qemuDomainObjExitMonitor(driver, vm);
goto cleanup; goto cleanup;
} }
rc = qemuMonitorMigrateToFd(priv->mon, rc = qemuMonitorMigrateToFd(priv->mon,
@ -5997,7 +5997,7 @@ qemuMigrationSrcToFile(virQEMUDriver *driver, virDomainObj *vm,
if (virDomainObjIsActive(vm) && if (virDomainObjIsActive(vm) &&
qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) == 0) { qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) == 0) {
qemuMonitorMigrateCancel(priv->mon); qemuMonitorMigrateCancel(priv->mon);
ignore_value(qemuDomainObjExitMonitor(driver, vm)); qemuDomainObjExitMonitor(driver, vm);
} }
} }
goto cleanup; goto cleanup;
@ -6024,7 +6024,7 @@ qemuMigrationSrcToFile(virQEMUDriver *driver, virDomainObj *vm,
} else { } else {
if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) == 0) { if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) == 0) {
qemuMonitorSetMigrationSpeed(priv->mon, saveMigBandwidth); qemuMonitorSetMigrationSpeed(priv->mon, saveMigBandwidth);
ignore_value(qemuDomainObjExitMonitor(driver, vm)); qemuDomainObjExitMonitor(driver, vm);
} }
} }
priv->migMaxBandwidth = saveMigBandwidth; priv->migMaxBandwidth = saveMigBandwidth;

2
src/qemu/qemu_process.c
View File

@ -3195,7 +3195,7 @@ qemuProcessUpdateVideoRamSize(virQEMUDriver *driver,
return ret; return ret;
error: error:
ignore_value(qemuDomainObjExitMonitor(driver, vm)); qemuDomainObjExitMonitor(driver, vm);
return -1; return -1;
} }

2
src/qemu/qemu_snapshot.c
View File

@ -883,7 +883,7 @@ qemuSnapshotDiskCleanup(qemuSnapshotDiskData *data,
qemuBlockStorageSourceAttachRollback(qemuDomainGetMonitor(vm), qemuBlockStorageSourceAttachRollback(qemuDomainGetMonitor(vm),
data[i].crdata->srcdata[0]); data[i].crdata->srcdata[0]);
ignore_value(qemuDomainObjExitMonitor(driver, vm)); qemuDomainObjExitMonitor(driver, vm);
} }
} }