File ccb7c7b2-qemu-remove-unused-caps.patch of Package libvirt.10106

Overview Repositories Revisions Requests Users Attributes Meta

File ccb7c7b2-qemu-remove-unused-caps.patch of Package libvirt.10106

commit ccb7c7b253ed330e037f8231a7d5efd58749c74a
Author: Cole Robinson <crobinso@redhat.com>
Date:   Mon Jul 10 17:30:03 2017 -0400

qemu: process: Remove unused qemuCaps
    
    After 426dc5eb2 qemuCaps and virDomainDefPtr are unused here,
    remove it from the call stack
    
    Reviewed-by: Andrea Bolognani <abologna@redhat.com>
    Signed-off-by: Cole Robinson <crobinso@redhat.com>

Index: libvirt-3.3.0/src/qemu/qemu_process.c
===================================================================
--- libvirt-3.3.0.orig/src/qemu/qemu_process.c
+++ libvirt-3.3.0/src/qemu/qemu_process.c
@@ -1860,9 +1860,7 @@ qemuProcessMonitorReportLogError(qemuMon
 
 
 static int
-qemuProcessLookupPTYs(virDomainDefPtr def ATTRIBUTE_UNUSED,
-                      virQEMUCapsPtr qemuCaps ATTRIBUTE_UNUSED,
-                      virDomainChrDefPtr *devices,
+qemuProcessLookupPTYs(virDomainChrDefPtr *devices,
                       int count,
                       virHashTablePtr info)
 {
@@ -1910,24 +1908,18 @@ qemuProcessLookupPTYs(virDomainDefPtr de
 
 static int
 qemuProcessFindCharDevicePTYsMonitor(virDomainObjPtr vm,
-                                     virQEMUCapsPtr qemuCaps,
                                      virHashTablePtr info)
 {
     size_t i = 0;
 
-    if (qemuProcessLookupPTYs(vm->def, qemuCaps,
-                              vm->def->serials, vm->def->nserials,
-                              info) < 0)
+    if (qemuProcessLookupPTYs(vm->def->serials, vm->def->nserials, info) < 0)
         return -1;
 
-    if (qemuProcessLookupPTYs(vm->def, qemuCaps,
-                              vm->def->parallels, vm->def->nparallels,
+    if (qemuProcessLookupPTYs(vm->def->parallels, vm->def->nparallels,
                               info) < 0)
         return -1;
 
-    if (qemuProcessLookupPTYs(vm->def, qemuCaps,
-                              vm->def->channels, vm->def->nchannels,
-                              info) < 0)
+    if (qemuProcessLookupPTYs(vm->def->channels, vm->def->nchannels, info) < 0)
         return -1;
     /* For historical reasons, console[0] can be just an alias
      * for serial[0]. That's why we need to update it as well. */
@@ -1945,8 +1937,7 @@ qemuProcessFindCharDevicePTYsMonitor(vir
         }
     }
 
-    if (qemuProcessLookupPTYs(vm->def, qemuCaps,
-                              vm->def->consoles + i, vm->def->nconsoles - i,
+    if (qemuProcessLookupPTYs(vm->def->consoles + i, vm->def->nconsoles - i,
                               info) < 0)
         return -1;
 
@@ -2094,7 +2085,6 @@ static int
 qemuProcessWaitForMonitor(virQEMUDriverPtr driver,
                           virDomainObjPtr vm,
                           int asyncJob,
-                          virQEMUCapsPtr qemuCaps,
                           qemuDomainLogContextPtr logCtxt)
 {
     int ret = -1;
@@ -2118,8 +2108,7 @@ qemuProcessWaitForMonitor(virQEMUDriverP
         ret = -1;
 
     if (ret == 0) {
-        if ((ret = qemuProcessFindCharDevicePTYsMonitor(vm, qemuCaps,
-                                                        info)) < 0)
+        if ((ret = qemuProcessFindCharDevicePTYsMonitor(vm, info)) < 0)
             goto cleanup;
 
         if ((ret = qemuProcessRefreshChannelVirtioState(driver, vm, info,
@@ -5775,7 +5764,7 @@ qemuProcessLaunch(virConnectPtr conn,
         goto cleanup;
 
     VIR_DEBUG("Waiting for monitor to show up");
-    if (qemuProcessWaitForMonitor(driver, vm, asyncJob, priv->qemuCaps, logCtxt) < 0)
+    if (qemuProcessWaitForMonitor(driver, vm, asyncJob, logCtxt) < 0)
         goto cleanup;
 
     if (qemuConnectAgent(driver, vm) < 0)
@@ -6619,7 +6608,7 @@ int qemuProcessAttach(virConnectPtr conn
     qemuDomainObjTaint(driver, vm, VIR_DOMAIN_TAINT_EXTERNAL_LAUNCH, logCtxt);
 
     VIR_DEBUG("Waiting for monitor to show up");
-    if (qemuProcessWaitForMonitor(driver, vm, QEMU_ASYNC_JOB_NONE, priv->qemuCaps, NULL) < 0)
+    if (qemuProcessWaitForMonitor(driver, vm, QEMU_ASYNC_JOB_NONE, NULL) < 0)
         goto error;
 
     if (qemuConnectAgent(driver, vm) < 0)

Places

File ccb7c7b2-qemu-remove-unused-caps.patch of Package libvirt.10106

Places