NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Rename stdin_{fd,path} in qemuProcessStart

Browse Source 
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
Jiri Denemark
2015-10-30 11:43:30 +01:00
parent 2c4ba8b4f3
commit da863c2ad1
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/qemu/qemu_process.c
View File

@@ -4248,8 +4248,8 @@ int qemuProcessStart(virConnectPtr conn,
virDomainObjPtr vm, virDomainObjPtr vm,
qemuDomainAsyncJob asyncJob, qemuDomainAsyncJob asyncJob,
const char *migrateFrom, const char *migrateFrom,
int stdin_fd, int migrateFd,
const char *stdin_path, const char *migratePath,
virDomainSnapshotObjPtr snapshot, virDomainSnapshotObjPtr snapshot,
virNetDevVPortProfileOp vmop, virNetDevVPortProfileOp vmop,
unsigned int flags) unsigned int flags)
@@ -4274,10 +4274,10 @@ int qemuProcessStart(virConnectPtr conn,
char *tmppath = NULL; char *tmppath = NULL;
qemuProcessIncomingDefPtr incoming = NULL; qemuProcessIncomingDefPtr incoming = NULL;
VIR_DEBUG("vm=%p name=%s id=%d asyncJob=%d migrateFrom=%s stdin_fd=%d " VIR_DEBUG("vm=%p name=%s id=%d asyncJob=%d migrateFrom=%s migrateFd=%d "
"stdin_path=%s snapshot=%p vmop=%d flags=0x%x", "migratePath=%s snapshot=%p vmop=%d flags=0x%x",
vm, vm->def->name, vm->def->id, asyncJob, NULLSTR(migrateFrom), vm, vm->def->name, vm->def->id, asyncJob, NULLSTR(migrateFrom),
stdin_fd, NULLSTR(stdin_path), snapshot, vmop, flags); migrateFd, NULLSTR(migratePath), snapshot, vmop, flags);
/* Okay, these are just internal flags, /* Okay, these are just internal flags,
* but doesn't hurt to check */ * but doesn't hurt to check */
@@ -4602,7 +4602,7 @@ int qemuProcessStart(virConnectPtr conn,
if (migrateFrom) { if (migrateFrom) {
incoming = qemuProcessIncomingDefNew(priv->qemuCaps, migrateFrom, incoming = qemuProcessIncomingDefNew(priv->qemuCaps, migrateFrom,
stdin_fd, stdin_path); migrateFd, migratePath);
if (!incoming) if (!incoming)
goto error; goto error;
} }
@@ -4786,7 +4786,7 @@ int qemuProcessStart(virConnectPtr conn,
VIR_DEBUG("Setting domain security labels"); VIR_DEBUG("Setting domain security labels");
if (virSecurityManagerSetAllLabel(driver->securityManager, if (virSecurityManagerSetAllLabel(driver->securityManager,
vm->def, stdin_path) < 0) vm->def, migratePath) < 0)
goto error; goto error;
/* Security manager labeled all devices, therefore /* Security manager labeled all devices, therefore
@@ -4795,7 +4795,7 @@ int qemuProcessStart(virConnectPtr conn,
* (hidden under qemuProcessStop) we need to restore labels. */ * (hidden under qemuProcessStop) we need to restore labels. */
stop_flags &= ~VIR_QEMU_PROCESS_STOP_NO_RELABEL; stop_flags &= ~VIR_QEMU_PROCESS_STOP_NO_RELABEL;
if (stdin_fd != -1) { if (migrateFd != -1) {
/* if there's an fd to migrate from, and it's a pipe, put the /* if there's an fd to migrate from, and it's a pipe, put the
* proper security label on it * proper security label on it
*/ */
@@ -4803,13 +4803,13 @@ int qemuProcessStart(virConnectPtr conn,
VIR_DEBUG("setting security label on pipe used for migration"); VIR_DEBUG("setting security label on pipe used for migration");
if (fstat(stdin_fd, &stdin_sb) < 0) { if (fstat(migrateFd, &stdin_sb) < 0) {
virReportSystemError(errno, virReportSystemError(errno,
_("cannot stat fd %d"), stdin_fd); _("cannot stat fd %d"), migrateFd);
goto error; goto error;
} }
if (S_ISFIFO(stdin_sb.st_mode) && if (S_ISFIFO(stdin_sb.st_mode) &&
virSecurityManagerSetImageFDLabel(driver->securityManager, vm->def, stdin_fd) < 0) virSecurityManagerSetImageFDLabel(driver->securityManager, vm->def, migrateFd) < 0)
goto error; goto error;
} }