aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbalrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>2007-04-30 01:34:31 +0000
committerbalrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>2007-04-30 01:34:31 +0000
commit2bac601963afc6777692777c2e19666b589e85cd (patch)
treeab5e84692a25800c883b14eb4f7b06ee06fffc7f
parentc1713132e07955819477a87a0ce830358e77a147 (diff)
downloadqemu-2bac601963afc6777692777c2e19666b589e85cd.zip
qemu-2bac601963afc6777692777c2e19666b589e85cd.tar.gz
qemu-2bac601963afc6777692777c2e19666b589e85cd.tar.bz2
Remove repeated code and enable encrypted SD cards and USB sticks images.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2750 c046a42c-6fe2-441c-8c8c-71466251a162
-rw-r--r--hw/usb-msd.c2
-rw-r--r--monitor.c12
-rw-r--r--vl.c38
-rw-r--r--vl.h2
4 files changed, 29 insertions, 25 deletions
diff --git a/hw/usb-msd.c b/hw/usb-msd.c
index 251bd64..08fc5c3 100644
--- a/hw/usb-msd.c
+++ b/hw/usb-msd.c
@@ -522,6 +522,8 @@ USBDevice *usb_msd_init(const char *filename)
bdrv = bdrv_new("usb");
if (bdrv_open(bdrv, filename, 0) < 0)
goto fail;
+ if (qemu_key_check(bdrv, filename))
+ goto fail;
s->bs = bdrv;
s->dev.speed = USB_SPEED_FULL;
diff --git a/monitor.c b/monitor.c
index ed03b34..9f76c09 100644
--- a/monitor.c
+++ b/monitor.c
@@ -386,8 +386,6 @@ static void do_eject(int force, const char *filename)
static void do_change(const char *device, const char *filename)
{
BlockDriverState *bs;
- int i;
- char password[256];
bs = bdrv_find(device);
if (!bs) {
@@ -397,15 +395,7 @@ static void do_change(const char *device, const char *filename)
if (eject_device(bs, 0) < 0)
return;
bdrv_open(bs, filename, 0);
- if (bdrv_is_encrypted(bs)) {
- term_printf("%s is encrypted.\n", device);
- for(i = 0; i < 3; i++) {
- monitor_readline("Password: ", 1, password, sizeof(password));
- if (bdrv_set_key(bs, password) == 0)
- break;
- term_printf("invalid password\n");
- }
- }
+ qemu_key_check(bs, filename);
}
static void do_screen_dump(const char *filename)
diff --git a/vl.c b/vl.c
index 8707a1f..bb36281 100644
--- a/vl.c
+++ b/vl.c
@@ -6714,6 +6714,24 @@ static uint8_t *signal_stack;
/* password input */
+int qemu_key_check(BlockDriverState *bs, const char *name)
+{
+ char password[256];
+ int i;
+
+ if (!bdrv_is_encrypted(bs))
+ return 0;
+
+ term_printf("%s is encrypted.\n", name);
+ for(i = 0; i < 3; i++) {
+ monitor_readline("Password: ", 1, password, sizeof(password));
+ if (bdrv_set_key(bs, password) == 0)
+ return 0;
+ term_printf("invalid password\n");
+ }
+ return -EPERM;
+}
+
static BlockDriverState *get_bdrv(int index)
{
BlockDriverState *bs;
@@ -6731,21 +6749,12 @@ static BlockDriverState *get_bdrv(int index)
static void read_passwords(void)
{
BlockDriverState *bs;
- int i, j;
- char password[256];
+ int i;
for(i = 0; i < 6; i++) {
bs = get_bdrv(i);
- if (bs && bdrv_is_encrypted(bs)) {
- term_printf("%s is encrypted.\n", bdrv_get_device_name(bs));
- for(j = 0; j < 3; j++) {
- monitor_readline("Password: ",
- 1, password, sizeof(password));
- if (bdrv_set_key(bs, password) == 0)
- break;
- term_printf("invalid password\n");
- }
- }
+ if (bs)
+ qemu_key_check(bs, bdrv_get_device_name(bs));
}
}
@@ -7622,7 +7631,7 @@ int main(int argc, char **argv)
}
}
- /* Open the virtual parallel flash bloc devices */
+ /* Open the virtual parallel flash block devices */
for(i = 0; i < MAX_PFLASH; i++) {
if (pflash_filename[i]) {
if (!pflash_table[i]) {
@@ -7648,7 +7657,8 @@ int main(int argc, char **argv)
snapshot ? BDRV_O_SNAPSHOT : 0) < 0) {
fprintf(stderr, "qemu: could not open SD card image %s\n",
sd_filename);
- }
+ } else
+ qemu_key_check(bs, sd_filename);
}
register_savevm("timer", 0, 2, timer_save, timer_load, NULL);
diff --git a/vl.h b/vl.h
index 3b12d37..7bc3eba 100644
--- a/vl.h
+++ b/vl.h
@@ -632,6 +632,8 @@ void qemu_aio_wait_start(void);
void qemu_aio_wait(void);
void qemu_aio_wait_end(void);
+int qemu_key_check(BlockDriverState *bs, const char *name);
+
/* Ensure contents are flushed to disk. */
void bdrv_flush(BlockDriverState *bs);