From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1HSJbX-0005eb-Ph for qemu-devel@nongnu.org; Fri, 16 Mar 2007 17:04:51 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1HSJbT-0005dy-RG for qemu-devel@nongnu.org; Fri, 16 Mar 2007 17:04:51 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1HSJbT-0005dv-ME for qemu-devel@nongnu.org; Fri, 16 Mar 2007 16:04:47 -0500 Received: from wr-out-0506.google.com ([64.233.184.224]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1HSJaH-0007sN-US for qemu-devel@nongnu.org; Fri, 16 Mar 2007 17:03:35 -0400 Received: by wr-out-0506.google.com with SMTP id q50so694690wrq for ; Fri, 16 Mar 2007 14:03:22 -0700 (PDT) Message-ID: Date: Fri, 16 Mar 2007 22:03:21 +0100 From: "andrzej zaborowski" Sender: balrogg@gmail.com MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_99098_23172948.1174079001241" Subject: [Qemu-devel] [PATCH] Remove repeated code, enable encrypted SD and USB sticks. Reply-To: balrogg@gmail.com, qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org ------=_Part_99098_23172948.1174079001241 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline Move the code that asks user for password for encrypted images, to one places instead of having one copy in vl.c and a second one in monitor.c. Make qemu use it for USB-mass-storage and SD cards too. I posted this change earlier but without SD support. Apply this on top of "[PATCH] SecureDigital card emulation". Cheers, Andrew ------=_Part_99098_23172948.1174079001241 Content-Type: text/plain; name=0005-Remove-repeated-code-enable-encrypted-SD-and-USB-sticks.txt; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: base64 X-Attachment-Id: f_ezd6cg2h Content-Disposition: attachment; filename="0005-Remove-repeated-code-enable-encrypted-SD-and-USB-sticks.txt" RnJvbSBlOGU1MDQ5OWViNGQxZTJjZGEzY2FkMzI2NWNmOGY5MjVkZmU1MjBkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbmRyemVqIFphYm9yb3dza2kgPGJhbHJvZ0B6YWJvci5vcmc+ CkRhdGU6IEZyaSwgMTYgTWFyIDIwMDcgMTY6MDU6NDYgKzAxMDAKU3ViamVjdDogW1BBVENIXSBS ZW1vdmUgcmVwZWF0ZWQgY29kZSwgZW5hYmxlIGVuY3J5cHRlZCBTRCBhbmQgVVNCIHN0aWNrcy4K Ci0tLQogaHcvc2QuYyAgICAgIHwgICAgMiArKwogaHcvdXNiLW1zZC5jIHwgICAgMiArKwogbW9u aXRvci5jICAgIHwgICAxMiArLS0tLS0tLS0tLS0KIHZsLmMgICAgICAgICB8ICAgMzMgKysrKysr KysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tCiB2bC5oICAgICAgICAgfCAgICAyICsrCiA1IGZp bGVzIGNoYW5nZWQsIDI4IGluc2VydGlvbnMoKyksIDIzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL2h3L3NkLmMgYi9ody9zZC5jCmluZGV4IDM3YWNjZGUuLmY5MTA1NGEgMTAwNjQ0Ci0tLSBh L2h3L3NkLmMKKysrIGIvaHcvc2QuYwpAQCAtNDE2LDYgKzQxNiw4IEBAIHN0cnVjdCBzZF9zdGF0 ZV9zICpzZF9pbml0KCkKICAgICAgICAgICAgICAgICAgICAgICAgIHNuYXBzaG90ID8gQkRSVl9P X1NOQVBTSE9UIDogMCkgPCAwKQogICAgICAgICAgICAgZnByaW50ZihzdGRlcnIsICIlczogQ291 bGRuJ3Qgb3BlbiAlc1xuIiwKICAgICAgICAgICAgICAgICAgICAgX19GVU5DVElPTl9fLCBzZF9m aWxlbmFtZSk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIHFlbXVfa2V5X2NoZWNrKGJzLCBz ZF9maWxlbmFtZSk7CiAgICAgfQogCiAgICAgc2QgPSAoc3RydWN0IHNkX3N0YXRlX3MgKikgcWVt dV9tYWxsb2N6KHNpemVvZihzdHJ1Y3Qgc2Rfc3RhdGVfcykpOwpkaWZmIC0tZ2l0IGEvaHcvdXNi LW1zZC5jIGIvaHcvdXNiLW1zZC5jCmluZGV4IDQ1MzBhMWMuLjQ2YWEyMzQgMTAwNjQ0Ci0tLSBh L2h3L3VzYi1tc2QuYworKysgYi9ody91c2ItbXNkLmMKQEAgLTUyMiw2ICs1MjIsOCBAQCBVU0JE ZXZpY2UgKnVzYl9tc2RfaW5pdChjb25zdCBjaGFyICpmaWxlbmFtZSkKICAgICBiZHJ2ID0gYmRy dl9uZXcoInVzYiIpOwogICAgIGlmIChiZHJ2X29wZW4oYmRydiwgZmlsZW5hbWUsIDApIDwgMCkK ICAgICAgICAgZ290byBmYWlsOworICAgIGlmIChxZW11X2tleV9jaGVjayhiZHJ2LCBmaWxlbmFt ZSkpCisgICAgICAgIGdvdG8gZmFpbDsKICAgICBzLT5icyA9IGJkcnY7CiAKICAgICBzLT5kZXYu c3BlZWQgPSBVU0JfU1BFRURfRlVMTDsKZGlmZiAtLWdpdCBhL21vbml0b3IuYyBiL21vbml0b3Iu YwppbmRleCA5NDNiMjViLi4zZjMxOTA0IDEwMDY0NAotLS0gYS9tb25pdG9yLmMKKysrIGIvbW9u aXRvci5jCkBAIC0zODAsOCArMzgwLDYgQEAgc3RhdGljIHZvaWQgZG9fZWplY3QoaW50IGZvcmNl LCBjb25zdCBjaGFyICpmaWxlbmFtZSkKIHN0YXRpYyB2b2lkIGRvX2NoYW5nZShjb25zdCBjaGFy ICpkZXZpY2UsIGNvbnN0IGNoYXIgKmZpbGVuYW1lKQogewogICAgIEJsb2NrRHJpdmVyU3RhdGUg KmJzOwotICAgIGludCBpOwotICAgIGNoYXIgcGFzc3dvcmRbMjU2XTsKIAogICAgIGJzID0gYmRy dl9maW5kKGRldmljZSk7CiAgICAgaWYgKCFicykgewpAQCAtMzkxLDE1ICszODksNyBAQCBzdGF0 aWMgdm9pZCBkb19jaGFuZ2UoY29uc3QgY2hhciAqZGV2aWNlLCBjb25zdCBjaGFyICpmaWxlbmFt ZSkKICAgICBpZiAoZWplY3RfZGV2aWNlKGJzLCAwKSA8IDApCiAgICAgICAgIHJldHVybjsKICAg ICBiZHJ2X29wZW4oYnMsIGZpbGVuYW1lLCAwKTsKLSAgICBpZiAoYmRydl9pc19lbmNyeXB0ZWQo YnMpKSB7Ci0gICAgICAgIHRlcm1fcHJpbnRmKCIlcyBpcyBlbmNyeXB0ZWQuXG4iLCBkZXZpY2Up OwotICAgICAgICBmb3IoaSA9IDA7IGkgPCAzOyBpKyspIHsKLSAgICAgICAgICAgIG1vbml0b3Jf cmVhZGxpbmUoIlBhc3N3b3JkOiAiLCAxLCBwYXNzd29yZCwgc2l6ZW9mKHBhc3N3b3JkKSk7Ci0g ICAgICAgICAgICBpZiAoYmRydl9zZXRfa2V5KGJzLCBwYXNzd29yZCkgPT0gMCkKLSAgICAgICAg ICAgICAgICBicmVhazsKLSAgICAgICAgICAgIHRlcm1fcHJpbnRmKCJpbnZhbGlkIHBhc3N3b3Jk XG4iKTsKLSAgICAgICAgfQotICAgIH0KKyAgICBxZW11X2tleV9jaGVjayhicywgZmlsZW5hbWUp OwogfQogCiBzdGF0aWMgdm9pZCBkb19zY3JlZW5fZHVtcChjb25zdCBjaGFyICpmaWxlbmFtZSkK ZGlmZiAtLWdpdCBhL3ZsLmMgYi92bC5jCmluZGV4IGU1YjUzZDIuLmEyMmVmOTUgMTAwNjQ0Ci0t LSBhL3ZsLmMKKysrIGIvdmwuYwpAQCAtNjcwNSw2ICs2NzA1LDI0IEBAIHN0YXRpYyB1aW50OF90 ICpzaWduYWxfc3RhY2s7CiAKIC8qIHBhc3N3b3JkIGlucHV0ICovCiAKK2ludCBxZW11X2tleV9j aGVjayhCbG9ja0RyaXZlclN0YXRlICpicywgY29uc3QgY2hhciAqbmFtZSkKK3sKKyAgICBjaGFy IHBhc3N3b3JkWzI1Nl07CisgICAgaW50IGk7CisKKyAgICBpZiAoIWJkcnZfaXNfZW5jcnlwdGVk KGJzKSkKKyAgICAgICAgcmV0dXJuIDA7CisKKyAgICB0ZXJtX3ByaW50ZigiJXMgaXMgZW5jcnlw dGVkLlxuIiwgbmFtZSk7CisgICAgZm9yKGkgPSAwOyBpIDwgMzsgaSsrKSB7CisgICAgICAgIG1v bml0b3JfcmVhZGxpbmUoIlBhc3N3b3JkOiAiLCAxLCBwYXNzd29yZCwgc2l6ZW9mKHBhc3N3b3Jk KSk7CisgICAgICAgIGlmIChiZHJ2X3NldF9rZXkoYnMsIHBhc3N3b3JkKSA9PSAwKQorICAgICAg ICAgICAgcmV0dXJuIDA7CisgICAgICAgIHRlcm1fcHJpbnRmKCJpbnZhbGlkIHBhc3N3b3JkXG4i KTsKKyAgICB9CisgICAgcmV0dXJuIC1FUEVSTTsKK30KKwogc3RhdGljIEJsb2NrRHJpdmVyU3Rh dGUgKmdldF9iZHJ2KGludCBpbmRleCkKIHsKICAgICBCbG9ja0RyaXZlclN0YXRlICpiczsKQEAg LTY3MjIsMjEgKzY3NDAsMTIgQEAgc3RhdGljIEJsb2NrRHJpdmVyU3RhdGUgKmdldF9iZHJ2KGlu dCBpbmRleCkKIHN0YXRpYyB2b2lkIHJlYWRfcGFzc3dvcmRzKHZvaWQpCiB7CiAgICAgQmxvY2tE cml2ZXJTdGF0ZSAqYnM7Ci0gICAgaW50IGksIGo7Ci0gICAgY2hhciBwYXNzd29yZFsyNTZdOwor ICAgIGludCBpOwogCiAgICAgZm9yKGkgPSAwOyBpIDwgNjsgaSsrKSB7CiAgICAgICAgIGJzID0g Z2V0X2JkcnYoaSk7Ci0gICAgICAgIGlmIChicyAmJiBiZHJ2X2lzX2VuY3J5cHRlZChicykpIHsK LSAgICAgICAgICAgIHRlcm1fcHJpbnRmKCIlcyBpcyBlbmNyeXB0ZWQuXG4iLCBiZHJ2X2dldF9k ZXZpY2VfbmFtZShicykpOwotICAgICAgICAgICAgZm9yKGogPSAwOyBqIDwgMzsgaisrKSB7Ci0g ICAgICAgICAgICAgICAgbW9uaXRvcl9yZWFkbGluZSgiUGFzc3dvcmQ6ICIsIAotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgMSwgcGFzc3dvcmQsIHNpemVvZihwYXNzd29yZCkpOwot ICAgICAgICAgICAgICAgIGlmIChiZHJ2X3NldF9rZXkoYnMsIHBhc3N3b3JkKSA9PSAwKQotICAg ICAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgICAgICB0ZXJtX3ByaW50ZigiaW52 YWxpZCBwYXNzd29yZFxuIik7Ci0gICAgICAgICAgICB9Ci0gICAgICAgIH0KKyAgICAgICAgaWYg KGJzKQorICAgICAgICAgICAgcWVtdV9rZXlfY2hlY2soYnMsIGJkcnZfZ2V0X2RldmljZV9uYW1l KGJzKSk7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS92bC5oIGIvdmwuaAppbmRleCBjZmFmYzA4 Li40NTNlNzhkIDEwMDY0NAotLS0gYS92bC5oCisrKyBiL3ZsLmgKQEAgLTYzMiw2ICs2MzIsOCBA QCB2b2lkIHFlbXVfYWlvX3dhaXRfc3RhcnQodm9pZCk7CiB2b2lkIHFlbXVfYWlvX3dhaXQodm9p ZCk7CiB2b2lkIHFlbXVfYWlvX3dhaXRfZW5kKHZvaWQpOwogCitpbnQgcWVtdV9rZXlfY2hlY2so QmxvY2tEcml2ZXJTdGF0ZSAqYnMsIGNvbnN0IGNoYXIgKm5hbWUpOworCiAvKiBFbnN1cmUgY29u dGVudHMgYXJlIGZsdXNoZWQgdG8gZGlzay4gICovCiB2b2lkIGJkcnZfZmx1c2goQmxvY2tEcml2 ZXJTdGF0ZSAqYnMpOwogCi0tIAoxLjQuNC4zCgo= ------=_Part_99098_23172948.1174079001241--