[libvirt] [PATCH] qemu: Reverse condition in qemuDomainCheckDiskPresence

[Eric Blake]

On 03/14/2012 05:38 AM, Michal Privoznik wrote:
> With current code, we pass true iff domain is cold booting. However,
> if disk is inaccessible and startupPolicy for that disk is set to
> 'requisite' we have to fail iff cold booting.
> ---
>  src/qemu/qemu_domain.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)

ACK.

> 
> diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
> index f8b7c96..625c595 100644
> --- a/src/qemu/qemu_domain.c
> +++ b/src/qemu/qemu_domain.c
> @@ -1703,7 +1703,7 @@ qemuDomainSetFakeReboot(struct qemud_driver *driver,
>  int
>  qemuDomainCheckDiskPresence(struct qemud_driver *driver,
>                              virDomainObjPtr vm,
> -                            bool start_with_state)
> +                            bool cold_boot)
>  {
>      int ret = -1;
>      int i;
> @@ -1738,7 +1738,7 @@ qemuDomainCheckDiskPresence(struct qemud_driver *driver,
>                  break;
>  
>              case VIR_DOMAIN_STARTUP_POLICY_REQUISITE:
> -                if (!start_with_state) {
> +                if (cold_boot) {
>                      virReportSystemError(errno,
>                                           _("cannot access file '%s'"),
>                                           disk->src);

-- 
Eric Blake   eblake at redhat.com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 620 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20120314/3ccd69b3/attachment-0001.sig>