Merge pull request #21 from dohpaz42/segfault-error-str3

Segmentation Fault 11 When Accessing Exception Object
Merge remote-tracking branch 'upstream/master'

* upstream/master:
Change Domain::GetId so it only throws an exception when an actual error occurs
Instead of blanketly throwing an exception when virDomainGetId returns
-1, check to see if an actual error object exists in virGetLastError; if
it does, then throw the exception as normal, and if it doesn't then just
return null. This will allow the caller to handle a null domain id
without having to clutter up the code with try/catch blocks for
situations that might not be exceptional (i.e., the domain is simply not
running).
Merge pull request #22 from dohpaz42/domain-getid-noexception

Change Domain::GetId so it only throws an exception when an actual error occurs
Added #ifdef for VIR_DOMAIN_PMSUSPENDED to make available in node if it is defined in libvirt
Merge pull request #23 from dohpaz42/vir-domain-pmsuspended

Added #ifdef for VIR_DOMAIN_PMSUSPENDED
Merge branch 'master' of git://github.com/c4milo/node-libvirt

# Via Camilo Aguilar (3) and Kenneth Stanley (2)
* 'master' of git://github.com/c4milo/node-libvirt:
  Added #ifdef for VIR_DOMAIN_PMSUSPENDED to make available in node if it is defined in libvirt
  Change Domain::GetId so it only throws an exception when an actual error occurs Instead of blanketly throwing an exception when virDomainGetId returns -1, check to see if an actual error object exists in virGetLastError; if it does, then throw the exception as normal, and if it doesn't then just return null. This will allow the caller to handle a null domain id without having to clutter up the code with try/catch blocks for situations that might not be exceptional (i.e., the domain is simply not running).

Conflicts:
	src/domain.cc
Merge branch 'refs/heads/master' into exceptions

* refs/heads/master:
  Added #ifdef for VIR_DOMAIN_PMSUSPENDED to make available in node if it is defined in libvirt
  Change Domain::GetId so it only throws an exception when an actual error occurs Instead of blanketly throwing an exception when virDomainGetId returns -1, check to see if an actual error object exists in virGetLastError; if it does, then throw the exception as normal, and if it doesn't then just return null. This will allow the caller to handle a null domain id without having to clutter up the code with try/catch blocks for situations that might not be exceptional (i.e., the domain is simply not running).

Conflicts:
	src/domain.cc