[libvirt] [PATCH] qemu: Only build devstr when needs (attach PCI controller)
- qemudDomainAttachPciControllerDevice: Don't build "devstr"
if "-device" of qemu is not available, as "devstr" will only
be used by "qemuMonitorAddDevice", which depends on "-device"
argument of qemu is supported.
- "qemudDomainSaveImageOpen": Fix indent problem.
* src/qemu/qemu_driver.c
---
src/qemu/qemu_driver.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 54e9dcb..4ef186f 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -6844,10 +6844,10 @@ static int qemudDomainSaveImageClose(int fd, pid_t read_pid, int
*status)
static int ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4) ATTRIBUTE_NONNULL(5)
qemudDomainSaveImageOpen(struct qemud_driver *driver,
- const char *path,
- virDomainDefPtr *ret_def,
- struct qemud_save_header *ret_header,
- pid_t *ret_read_pid)
+ const char *path,
+ virDomainDefPtr *ret_def,
+ struct qemud_save_header *ret_header,
+ pid_t *ret_read_pid)
{
int fd;
pid_t read_pid = -1;
@@ -7902,11 +7902,11 @@ static int qemudDomainAttachPciControllerDevice(struct
qemud_driver *driver,
goto cleanup;
if (qemuAssignDeviceControllerAlias(controller) < 0)
goto cleanup;
- }
- if (!(devstr = qemuBuildControllerDevStr(controller))) {
- virReportOOMError();
- goto cleanup;
+ if (!(devstr = qemuBuildControllerDevStr(controller))) {
+ virReportOOMError();
+ goto cleanup;
+ }
}
if (VIR_REALLOC_N(vm->def->controllers, vm->def->ncontrollers+1) < 0)
{
--
1.7.3.2