From 788d9cfdf2863cb500468b55e0e8577574460d5b Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@redhat.com>
Date: Mon, 21 Feb 2011 09:47:35 -0300
Subject: [PATCH 1/8] Revert "qemu: drive_init: Don't try to read passwords before monitor setup"

RH-Author: Markus Armbruster <armbru@redhat.com>
Message-id: <1298281662-2327-2-git-send-email-armbru@redhat.com>
Patchwork-id: 18532
O-Subject: [PATCH RHEL5.7 qemu-kvm 1/8] Revert "qemu: drive_init: Don't try to
	read passwords before monitor setup"
Bugzilla: 644706
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
RH-Acked-by: Jes Sorensen <Jes.Sorensen@redhat.com>

This reverts commit d85affe545cc867935ca6b560da0b9f8290fc183.

Conflicts:

	qemu/vl.c

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 qemu/vl.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 qemu/vl.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/qemu/vl.c b/qemu/vl.c
index 9af38dc..17e05ff 100644
--- a/qemu/vl.c
+++ b/qemu/vl.c
@@ -2779,7 +2779,7 @@ int drive_init(struct drive_opt *arg, int snapshot,
 
 int drive_open(DriveInfo drive)
 {
-    if (bdrv_open2(drive.bdrv, drive.file, drive.bdrv_flags, drive.drv) < 0) {
+    if (bdrv_open2(drive.bdrv, drive.file, drive.bdrv_flags, drive.drv) < 0 || qemu_key_check(drive.bdrv, drive.file)) {
         fprintf(stderr, "qemu: could not open disk image %s\n",
                         drive.file);
         return -1;
-- 
1.7.4.rc1.16.gd2f15e