From: Jiri Denemark <jdenemar@redhat.com>
Date: Tue, 19 Feb 2013 13:57:46 +0000 (+0100)
Subject: qemu: Use atomic ops for driver->nactive
X-Git-Tag: v1.0.3-rc1~87
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5d6f636764399fd7dab9cbe07addd7b89a0bfc77;p=thirdparty%2Flibvirt.git

qemu: Use atomic ops for driver->nactive
---

diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
index 14f1427796..ea4f3937eb 100644
--- a/src/qemu/qemu_conf.h
+++ b/src/qemu/qemu_conf.h
@@ -168,7 +168,7 @@ struct _virQEMUDriver {
     virCgroupPtr cgroup;
 
     /* Atomic inc/dec only */
-    size_t nactive;
+    unsigned int nactive;
 
     /* Immutable pointers. Caller must provide locking */
     virStateInhibitCallback inhibitCallback;
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 4251c34fd6..67362afabb 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -69,6 +69,7 @@
 #include "virtime.h"
 #include "virnetdevtap.h"
 #include "virbitmap.h"
+#include "viratomic.h"
 
 #define VIR_FROM_THIS VIR_FROM_QEMU
 
@@ -3300,9 +3301,8 @@ qemuProcessReconnect(void *opaque)
             goto error;
     }
 
-    if (!driver->nactive && driver->inhibitCallback)
+    if (virAtomicIntInc(&driver->nactive) == 1 && driver->inhibitCallback)
         driver->inhibitCallback(true, driver->inhibitOpaque);
-    driver->nactive++;
 
 endjob:
     if (!qemuDomainObjEndJob(driver, obj))
@@ -3589,9 +3589,8 @@ int qemuProcessStart(virConnectPtr conn,
     qemuDomainSetFakeReboot(driver, vm, false);
     virDomainObjSetState(vm, VIR_DOMAIN_SHUTOFF, VIR_DOMAIN_SHUTOFF_UNKNOWN);
 
-    if (!driver->nactive && driver->inhibitCallback)
+    if (virAtomicIntInc(&driver->nactive) == 1 && driver->inhibitCallback)
         driver->inhibitCallback(true, driver->inhibitOpaque);
-    driver->nactive++;
 
     /* Run an early hook to set-up missing devices */
     if (virHookPresent(VIR_HOOK_DRIVER_QEMU)) {
@@ -4188,8 +4187,7 @@ void qemuProcessStop(virQEMUDriverPtr driver,
      */
     vm->def->id = -1;
 
-    driver->nactive--;
-    if (!driver->nactive && driver->inhibitCallback)
+    if (virAtomicIntDecAndTest(&driver->nactive) && driver->inhibitCallback)
         driver->inhibitCallback(false, driver->inhibitOpaque);
 
     if ((logfile = qemuDomainCreateLog(driver, vm, true)) < 0) {
@@ -4442,9 +4440,8 @@ int qemuProcessAttach(virConnectPtr conn ATTRIBUTE_UNUSED,
 
     vm->def->id = qemuDriverAllocateID(driver);
 
-    if (!driver->nactive && driver->inhibitCallback)
+    if (virAtomicIntInc(&driver->nactive) == 1 && driver->inhibitCallback)
         driver->inhibitCallback(true, driver->inhibitOpaque);
-    driver->nactive++;
 
     if (virFileMakePath(cfg->logDir) < 0) {
         virReportSystemError(errno,