Re: [libvirt] [PATCH V2 11/13] libxl: use job functions in device attach and detach functions

2014-02-19 Thread Daniel P. Berrange 
On Wed, Feb 12, 2014 at 06:56:25PM -0700, Jim Fehlig wrote:
 These operations aren't necessarily time consuming, but need to
 wait in the queue of modify jobs.
 
 Signed-off-by: Jim Fehlig jfeh...@suse.com
 ---
 
 V2: Check libxlDomainObjEndJob() return value
 
  src/libxl/libxl_driver.c | 42 --
  1 file changed, 28 insertions(+), 14 deletions(-)

ACK

Daniel
-- 
|: http://berrange.com  -o-http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org  -o- http://virt-manager.org :|
|: http://autobuild.org   -o- http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org   -o-   http://live.gnome.org/gtk-vnc :|

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [PATCH V2 11/13] libxl: use job functions in device attach and detach functions

2014-02-12 Thread Jim Fehlig 
These operations aren't necessarily time consuming, but need to
wait in the queue of modify jobs.

Signed-off-by: Jim Fehlig jfeh...@suse.com
---

V2: Check libxlDomainObjEndJob() return value

 src/libxl/libxl_driver.c | 42 --
 1 file changed, 28 insertions(+), 14 deletions(-)

diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index 1f3ea51..f19d551 100644
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -3423,6 +3423,9 @@ libxlDomainAttachDeviceFlags(virDomainPtr dom, const char 
*xml,
 if (virDomainAttachDeviceFlagsEnsureACL(dom-conn, vm-def, flags)  0)
 goto cleanup;
 
+if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY)  0)
+goto cleanup;
+
 if (virDomainObjIsActive(vm)) {
 if (flags == VIR_DOMAIN_DEVICE_MODIFY_CURRENT)
 flags |= VIR_DOMAIN_DEVICE_MODIFY_LIVE;
@@ -3433,14 +3436,14 @@ libxlDomainAttachDeviceFlags(virDomainPtr dom, const 
char *xml,
 if (flags  VIR_DOMAIN_DEVICE_MODIFY_LIVE) {
 virReportError(VIR_ERR_OPERATION_INVALID,
%s, _(Domain is not running));
-goto cleanup;
+goto endjob;
 }
 }
 
 if ((flags  VIR_DOMAIN_DEVICE_MODIFY_CONFIG)  !vm-persistent) {
  virReportError(VIR_ERR_OPERATION_INVALID,
 %s, _(cannot modify device on transient domain));
- goto cleanup;
+ goto endjob;
 }
 
 priv = vm-privateData;
@@ -3449,15 +3452,15 @@ libxlDomainAttachDeviceFlags(virDomainPtr dom, const 
char *xml,
 if (!(dev = virDomainDeviceDefParse(xml, vm-def,
 cfg-caps, driver-xmlopt,
 VIR_DOMAIN_XML_INACTIVE)))
-goto cleanup;
+goto endjob;
 
 /* Make a copy for updated domain. */
 if (!(vmdef = virDomainObjCopyPersistentDef(vm, cfg-caps,
 driver-xmlopt)))
-goto cleanup;
+goto endjob;
 
 if ((ret = libxlDomainAttachDeviceConfig(vmdef, dev))  0)
-goto cleanup;
+goto endjob;
 } else {
 ret = 0;
 }
@@ -3468,10 +3471,10 @@ libxlDomainAttachDeviceFlags(virDomainPtr dom, const 
char *xml,
 if (!(dev = virDomainDeviceDefParse(xml, vm-def,
 cfg-caps, driver-xmlopt,
 VIR_DOMAIN_XML_INACTIVE)))
-goto cleanup;
+goto endjob;
 
 if ((ret = libxlDomainAttachDeviceLive(priv, vm, dev))  0)
-goto cleanup;
+goto endjob;
 
 /*
  * update domain status forcibly because the domain status may be
@@ -3490,6 +3493,10 @@ libxlDomainAttachDeviceFlags(virDomainPtr dom, const 
char *xml,
 }
 }
 
+endjob:
+if (!libxlDomainObjEndJob(driver, vm))
+vm = NULL;
+
 cleanup:
 virDomainDefFree(vmdef);
 virDomainDeviceDefFree(dev);
@@ -3527,6 +3534,9 @@ libxlDomainDetachDeviceFlags(virDomainPtr dom, const char 
*xml,
 if (virDomainDetachDeviceFlagsEnsureACL(dom-conn, vm-def, flags)  0)
 goto cleanup;
 
+if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY)  0)
+goto cleanup;
+
 if (virDomainObjIsActive(vm)) {
 if (flags == VIR_DOMAIN_DEVICE_MODIFY_CURRENT)
 flags |= VIR_DOMAIN_DEVICE_MODIFY_LIVE;
@@ -3537,14 +3547,14 @@ libxlDomainDetachDeviceFlags(virDomainPtr dom, const 
char *xml,
 if (flags  VIR_DOMAIN_DEVICE_MODIFY_LIVE) {
 virReportError(VIR_ERR_OPERATION_INVALID,
%s, _(Domain is not running));
-goto cleanup;
+goto endjob;
 }
 }
 
 if ((flags  VIR_DOMAIN_DEVICE_MODIFY_CONFIG)  !vm-persistent) {
  virReportError(VIR_ERR_OPERATION_INVALID,
 %s, _(cannot modify device on transient domain));
- goto cleanup;
+ goto endjob;
 }
 
 priv = vm-privateData;
@@ -3553,15 +3563,15 @@ libxlDomainDetachDeviceFlags(virDomainPtr dom, const 
char *xml,
 if (!(dev = virDomainDeviceDefParse(xml, vm-def,
 cfg-caps, driver-xmlopt,
 VIR_DOMAIN_XML_INACTIVE)))
-goto cleanup;
+goto endjob;
 
 /* Make a copy for updated domain. */
 if (!(vmdef = virDomainObjCopyPersistentDef(vm, cfg-caps,
 driver-xmlopt)))
-goto cleanup;
+goto endjob;
 
 if ((ret = libxlDomainDetachDeviceConfig(vmdef, dev))  0)
-goto cleanup;
+goto endjob;
 } else {
 ret = 0;
 }
@@ -3572,10 +3582,10 @@ libxlDomainDetachDeviceFlags(virDomainPtr dom, const 
char *xml,
 if (!(dev = virDomainDeviceDefParse(xml, vm-def,