qemu: dump: Fix formatting of function headers and code inline

Also drop a comment with obvious content.
This commit is contained in:
Peter Krempa 2014-09-09 17:14:36 +02:00
parent e22c5c57ee
commit 736ea71bf6

View File

@ -3605,10 +3605,12 @@ getCompressionType(virQEMUDriverPtr driver)
return ret; return ret;
} }
static int qemuDomainCoreDumpWithFormat(virDomainPtr dom,
const char *path, static int
unsigned int dumpformat, qemuDomainCoreDumpWithFormat(virDomainPtr dom,
unsigned int flags) const char *path,
unsigned int dumpformat,
unsigned int flags)
{ {
virQEMUDriverPtr driver = dom->conn->privateData; virQEMUDriverPtr driver = dom->conn->privateData;
virDomainObjPtr vm; virDomainObjPtr vm;
@ -3670,13 +3672,8 @@ static int qemuDomainCoreDumpWithFormat(virDomainPtr dom,
event = virDomainEventLifecycleNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED,
VIR_DOMAIN_EVENT_STOPPED_CRASHED); VIR_DOMAIN_EVENT_STOPPED_CRASHED);
} } else if (((resume && paused) || (flags & VIR_DUMP_RESET)) &&
virDomainObjIsActive(vm)) {
/* Since the monitor is always attached to a pty for libvirt, it
will support synchronous operations so we always get here after
the migration is complete. */
else if (((resume && paused) || (flags & VIR_DUMP_RESET)) &&
virDomainObjIsActive(vm)) {
if ((ret == 0) && (flags & VIR_DUMP_RESET)) { if ((ret == 0) && (flags & VIR_DUMP_RESET)) {
priv = vm->privateData; priv = vm->privateData;
qemuDomainObjEnterMonitor(driver, vm); qemuDomainObjEnterMonitor(driver, vm);
@ -3711,14 +3708,18 @@ static int qemuDomainCoreDumpWithFormat(virDomainPtr dom,
return ret; return ret;
} }
static int qemuDomainCoreDump(virDomainPtr dom,
const char *path, static int
unsigned int flags) qemuDomainCoreDump(virDomainPtr dom,
const char *path,
unsigned int flags)
{ {
return qemuDomainCoreDumpWithFormat(dom, path, return qemuDomainCoreDumpWithFormat(dom, path,
VIR_DOMAIN_CORE_DUMP_FORMAT_RAW, flags); VIR_DOMAIN_CORE_DUMP_FORMAT_RAW,
flags);
} }
static char * static char *
qemuDomainScreenshot(virDomainPtr dom, qemuDomainScreenshot(virDomainPtr dom,
virStreamPtr st, virStreamPtr st,