From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id C1F2B1FF15C for ; Fri, 25 Jul 2025 12:50:17 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 53ED01580E; Fri, 25 Jul 2025 12:51:18 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Fri, 25 Jul 2025 12:50:55 +0200 Message-ID: <20250725105109.54093-9-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250725105109.54093-1-f.ebner@proxmox.com> References: <20250725105109.54093-1-f.ebner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1753440669342 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.026 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH qemu-server v2 8/8] image convert: re-use generate_drive_blockdev() X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" VGhpcyBhdm9pZHMgaGF2aW5nIHRoZSBoYW5kbGluZyBmb3IgJ2Rpc2NhcmQtbm8tdW5yZWYnIGlu IHR3byBwbGFjZXMuCgpJbiB0aGUgdGVzdHMsIHJlbmFtZSB0aGUgcmVsZXZhbnQgdGFyZ2V0IGlt YWdlcyB3aXRoIGEgJy10YXJnZXQnCnN1ZmZpeCB0byB0ZXN0IGZvciB0aGVtIGluIHRoZSBtb2Nr ZWQgdm9sdW1lX3NuYXBzaG90X2luZm8oKSBoZWxwZXIuCgpTdWdnZXN0ZWQtYnk6IEZhYmlhbiBH csO8bmJpY2hsZXIgPGYuZ3J1ZW5iaWNobGVyQHByb3htb3guY29tPgpTaWduZWQtb2ZmLWJ5OiBG aW9uYSBFYm5lciA8Zi5lYm5lckBwcm94bW94LmNvbT4KLS0tCgpTZWVtcyBxdWl0ZSBjb21wbGV4 IG5vdyBmb3IgdGhlIGdpdmVuIHVzZS1jYXNlLCBidXQgY291bGQgYmUgaW1wcm92ZWQKYW5kIHVz ZWQgYXMgYSBiYXNpcyBmb3IgdXNpbmcgdGFyZ2V0LWltYWdlLW9wdHMgZm9yIGFsbCB0YXJnZXQg aW1hZ2VzCmluIHRoZSBmdXR1cmUuCgpOZXcgaW4gdjIuCgogc3JjL1BWRS9RZW11U2VydmVyL1Fl bXVJbWFnZS5wbSAgICAgICAgfCA2NCArKysrKysrKysrKysrKysrKysrKysrKy0tLQogc3JjL3Rl c3QvcnVuX3FlbXVfaW1nX2NvbnZlcnRfdGVzdHMucGwgfCAyMSArKysrKystLS0KIDIgZmlsZXMg Y2hhbmdlZCwgNzMgaW5zZXJ0aW9ucygrKSwgMTIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv c3JjL1BWRS9RZW11U2VydmVyL1FlbXVJbWFnZS5wbSBiL3NyYy9QVkUvUWVtdVNlcnZlci9RZW11 SW1hZ2UucG0KaW5kZXggODA0Y2JjOGUuLjY1OGY2NzA1IDEwMDY0NAotLS0gYS9zcmMvUFZFL1Fl bXVTZXJ2ZXIvUWVtdUltYWdlLnBtCisrKyBiL3NyYy9QVkUvUWVtdVNlcnZlci9RZW11SW1hZ2Uu cG0KQEAgLTUsMTEgKzUsMTMgQEAgdXNlIHdhcm5pbmdzOwogCiB1c2UgRmNudGwgcXcoU19JU0JM Syk7CiB1c2UgRmlsZTo6c3RhdDsKK3VzZSBKU09OOwogCiB1c2UgUFZFOjpGb3JtYXQgcXcocmVu ZGVyX2J5dGVzKTsKIHVzZSBQVkU6OlN0b3JhZ2U7CiB1c2UgUFZFOjpUb29sczsKIAordXNlIFBW RTo6UWVtdVNlcnZlcjo6QmxvY2tkZXY7CiB1c2UgUFZFOjpRZW11U2VydmVyOjpEcml2ZSBxdyhj aGVja2VkX3ZvbHVtZV9mb3JtYXQpOwogdXNlIFBWRTo6UWVtdVNlcnZlcjo6SGVscGVyczsKIApA QCAtMzEsMTUgKzMzLDYyIEBAIHN1YiBjb252ZXJ0X2lzY3NpX3BhdGggewogfQogCiBteSBzdWIg cWNvdzJfdGFyZ2V0X2ltYWdlX29wdHMgewotICAgIG15ICgkcGF0aCwgQHFjb3cyX29wdHMpID0g QF87CisgICAgbXkgKCRzdG9yZWNmZywgJGRyaXZlLCBAcWNvdzJfb3B0cykgPSBAXzsKIAotICAg IG15ICRzdCA9IEZpbGU6OnN0YXQ6OnN0YXQoJHBhdGgpIG9yIGRpZSAic3RhdCBmb3IgJyRwYXRo JyBmYWlsZWQgLSAkIVxuIjsKKyAgICAjIFRoZXJlIGlzIG5vIG1hY2hpbmUgdmVyc2lvbiwgdGhl IHFlbXUtaW1nIGJpbmFyeSB2ZXJzaW9uIGlzIHdoYXQncyBpbXBvcnRhbnQuCisgICAgbXkgJHZl cnNpb24gPSBQVkU6OlFlbXVTZXJ2ZXI6OkhlbHBlcnM6Omt2bV91c2VyX3ZlcnNpb24oKTsKIAot ICAgIG15ICRkcml2ZXIgPSBTX0lTQkxLKCRzdC0+bW9kZSkgPyAnaG9zdF9kZXZpY2UnIDogJ2Zp bGUnOworICAgIG15ICRibG9ja2RldiA9IFBWRTo6UWVtdVNlcnZlcjo6QmxvY2tkZXY6OmdlbmVy YXRlX2RyaXZlX2Jsb2NrZGV2KAorICAgICAgICAkc3RvcmVjZmcsCisgICAgICAgICRkcml2ZSwK KyAgICAgICAgJHZlcnNpb24sCisgICAgICAgIHsgJ25vLXRocm90dGxlJyA9PiAxIH0sCisgICAg KTsKIAotICAgIG15ICRxY293Ml9vcHRzX3N0ciA9ICcsJyAuIGpvaW4oJywnLCBAcWNvdzJfb3B0 cyk7CisgICAgbXkgJG9wdHMgPSBbXTsKKyAgICBteSAkb3B0X3ByZWZpeCA9ICcnOworICAgIG15 ICRuZXh0X2NoaWxkID0gJGJsb2NrZGV2OworICAgIHdoaWxlICgkbmV4dF9jaGlsZCkgeworICAg ICAgICBteSAkY3VycmVudCA9ICRuZXh0X2NoaWxkOworICAgICAgICAkbmV4dF9jaGlsZCA9IGRl bGV0ZSgkY3VycmVudC0+e2ZpbGV9KTsKIAotICAgIHJldHVybiAiZHJpdmVyPXFjb3cyJHFjb3cy X29wdHNfc3RyLGZpbGUuZHJpdmVyPSRkcml2ZXIsZmlsZS5maWxlbmFtZT0kcGF0aCI7CisgICAg ICAgICMgVE9ETyBzaG91bGQgY2FjaGUgc2V0dGluZ3MgYmUgY29uZmlndXJlZCBoZXJlICh2aWEg YXBwcm9wcmlhdGUgZHJpdmUgY29uZmlndXJhdGlvbikgcmF0aGVyCisgICAgICAgICMgdGhhbiB2 aWEgZGVkaWNhdGVkIHFlbXUtaW1nIG9wdGlvbnM/CisgICAgICAgIGRlbGV0ZSgkY3VycmVudC0+ e2NhY2hlfSk7CisgICAgICAgICMgVE9ETyBlLmcuIGNhbid0IHVzZSBhaW8gJ25hdGl2ZScgd2l0 aG91dCBjYWNoZS5kaXJlY3QsIGp1c3QgdXNlIFFFTVUgZGVmYXVsdCBsaWtlIGZvcgorICAgICAg ICAjIG90aGVyIHRhcmdldHMgZm9yIG5vdworICAgICAgICBkZWxldGUoJGN1cnJlbnQtPnthaW99 KTsKKworICAgICAgICAjIG5vIG5lZWQgZm9yIG5vZGUgbmFtZXMKKyAgICAgICAgZGVsZXRlKCRj dXJyZW50LT57J25vZGUtbmFtZSd9KTsKKworICAgICAgICAjIGl0J3MgdGhlIHdyaXRlIHRhcmdl dCwgd2hpbGUgdGhlIGZsYWcgc2hvdWxkIGJlICdmYWxzZScgYW55d2F5cywgcmVtb3ZlIHRvIGJl IHN1cmUKKyAgICAgICAgZGVsZXRlKCRjdXJyZW50LT57J3JlYWQtb25seSd9KTsKKworICAgICAg ICAjIFRPRE8gc2hvdWxkIHRob3NlIGJlIHNldCAodmlhIGFwcHJvcHJpYXRlIGRyaXZlIGNvbmZp Z3VyYXRpb24pPworICAgICAgICBkZWxldGUoJGN1cnJlbnQtPnsnZGV0ZWN0LXplcm9lcyd9KTsK KyAgICAgICAgZGVsZXRlKCRjdXJyZW50LT57J2Rpc2NhcmQnfSk7CisKKyAgICAgICAgZm9yIG15 ICRrZXkgKHNvcnQga2V5cyAkY3VycmVudC0+JSopIHsKKyAgICAgICAgICAgIG15ICR2YWx1ZTsK KyAgICAgICAgICAgIGlmIChyZWYoJGN1cnJlbnQtPnska2V5fSkpIHsKKyAgICAgICAgICAgICAg ICBpZiAoJGN1cnJlbnQtPnska2V5fSBlcSBKU09OOjpmYWxzZSkgeworICAgICAgICAgICAgICAg ICAgICAkdmFsdWUgPSAnZmFsc2UnOworICAgICAgICAgICAgICAgIH0gZWxzaWYgKCRjdXJyZW50 LT57JGtleX0gZXEgSlNPTjo6dHJ1ZSkgeworICAgICAgICAgICAgICAgICAgICAkdmFsdWUgPSAn dHJ1ZSc7CisgICAgICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICAgICAgZGll ICJ0YXJnZXQgaW1hZ2Ugb3B0aW9uczogdW5oYW5kbGVkIHN0cnVjdHVyZWQga2V5OiAka2V5XG4i OworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAg ICAgJHZhbHVlID0gJGN1cnJlbnQtPnska2V5fTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAg IHB1c2ggJG9wdHMtPkAqLCAiJG9wdF9wcmVmaXgka2V5PSR2YWx1ZSI7CisgICAgICAgIH0KKwor ICAgICAgICAkb3B0X3ByZWZpeCAuPSAnZmlsZS4nOworICAgIH0KKworICAgIHJldHVybiBqb2lu KCcsJywgJG9wdHMtPkAqKTsKIH0KIAogIyBUaGUgcG9zc2libGUgb3B0aW9ucyBhcmU6CkBAIC0x MTMsNyArMTYyLDEwIEBAIHN1YiBjb252ZXJ0IHsKICAgICAgICAgJGRzdF9wYXRoID0gY29udmVy dF9pc2NzaV9wYXRoKCRkc3RfcGF0aCk7CiAgICAgfSBlbHNpZiAoJGRzdF9uZWVkc19kaXNjYXJk X25vX3VucmVmKSB7CiAgICAgICAgIHB1c2ggQCRjbWQsICctLXRhcmdldC1pbWFnZS1vcHRzJzsK LSAgICAgICAgJGRzdF9wYXRoID0gcWNvdzJfdGFyZ2V0X2ltYWdlX29wdHMoJGRzdF9wYXRoLCAn ZGlzY2FyZC1uby11bnJlZj10cnVlJyk7CisgICAgICAgICMgZG9uJ3QgdXNlIGFueSBvdGhlciBk cml2ZSBvcHRpb25zLCB0aG9zZSBhcmUgaW50ZW5kZWQgZm9yIHVzZSB3aXRoIGEgcnVubmluZyBW TSBhbmQganVzdAorICAgICAgICAjIHVzZSBzY3NpMCBhcyBhIGR1bW15IGludGVyZmFjZStpbmRl eCBmb3Igbm93CisgICAgICAgIG15ICRkc3RfZHJpdmUgPSB7IGZpbGUgPT4gJGRzdF92b2xpZCwg aW50ZXJmYWNlID0+ICdzY3NpJywgaW5kZXggPT4gMCB9OworICAgICAgICAkZHN0X3BhdGggPSBx Y293Ml90YXJnZXRfaW1hZ2Vfb3B0cygkc3RvcmVjZmcsICRkc3RfZHJpdmUsICdkaXNjYXJkLW5v LXVucmVmPXRydWUnKTsKICAgICB9IGVsc2UgewogICAgICAgICBwdXNoIEAkY21kLCAnLU8nLCAk ZHN0X2Zvcm1hdDsKICAgICB9CmRpZmYgLS1naXQgYS9zcmMvdGVzdC9ydW5fcWVtdV9pbWdfY29u dmVydF90ZXN0cy5wbCBiL3NyYy90ZXN0L3J1bl9xZW11X2ltZ19jb252ZXJ0X3Rlc3RzLnBsCmlu ZGV4IDNjOGYwOWYwLi41MTUyYmY0NyAxMDA3NTUKLS0tIGEvc3JjL3Rlc3QvcnVuX3FlbXVfaW1n X2NvbnZlcnRfdGVzdHMucGwKKysrIGIvc3JjL3Rlc3QvcnVuX3FlbXVfaW1nX2NvbnZlcnRfdGVz dHMucGwKQEAgLTUzMiw3ICs1MzIsNyBAQCBteSAkdGVzdHMgPSBbCiAgICAgICAgIG5hbWUgPT4g InFjb3cyX2V4dGVybmFsX3NuYXBzaG90X3RhcmdldCIsCiAgICAgICAgIHBhcmFtZXRlcnMgPT4g WwogICAgICAgICAgICAgImxvY2FsOiR2bWlkL3ZtLSR2bWlkLWRpc2stMC5yYXciLAotICAgICAg ICAgICAgImxvY2Fsc25hcGV4dDokdm1pZC92bS0kdm1pZC1kaXNrLTAucWNvdzIiLAorICAgICAg ICAgICAgImxvY2Fsc25hcGV4dDokdm1pZC92bS0kdm1pZC1kaXNrLXRhcmdldC5xY293MiIsCiAg ICAgICAgICAgICAxMDI0ICogMTAsCiAgICAgICAgIF0sCiAgICAgICAgIGV4cGVjdGVkID0+IFsK QEAgLTU0NCwxNCArNTQ0LDE0IEBAIG15ICR0ZXN0cyA9IFsKICAgICAgICAgICAgICJyYXciLAog ICAgICAgICAgICAgIi0tdGFyZ2V0LWltYWdlLW9wdHMiLAogICAgICAgICAgICAgIi92YXIvbGli L3Z6L2ltYWdlcy8kdm1pZC92bS0kdm1pZC1kaXNrLTAucmF3IiwKLSAgICAgICAgICAgICJkcml2 ZXI9cWNvdzIsZGlzY2FyZC1uby11bnJlZj10cnVlLGZpbGUuZHJpdmVyPWZpbGUsIgotICAgICAg ICAgICAgICAgIC4gImZpbGUuZmlsZW5hbWU9L3Zhci9saWIvdnpzbmFwZXh0L2ltYWdlcy8kdm1p ZC92bS0kdm1pZC1kaXNrLTAucWNvdzIiLAorICAgICAgICAgICAgImRpc2NhcmQtbm8tdW5yZWY9 dHJ1ZSxkcml2ZXI9cWNvdzIsZmlsZS5kcml2ZXI9ZmlsZSIKKyAgICAgICAgICAgICAgICAuICIs ZmlsZS5maWxlbmFtZT0vdmFyL2xpYi92enNuYXBleHQvaW1hZ2VzLyR2bWlkL3ZtLSR2bWlkLWRp c2stdGFyZ2V0LnFjb3cyIiwKICAgICAgICAgXSwKICAgICB9LAogICAgIHsKICAgICAgICAgbmFt ZSA9PiAibHZtcWNvdzJfZXh0ZXJuYWxfc25hcHNob3RfdGFyZ2V0IiwKICAgICAgICAgcGFyYW1l dGVycyA9PiBbCi0gICAgICAgICAgICAibG9jYWw6JHZtaWQvdm0tJHZtaWQtZGlzay0wLnJhdyIs ICJsdm0tc3RvcmU6dm0tJHZtaWQtZGlzay0wLnFjb3cyIiwgMTAyNCAqIDEwLAorICAgICAgICAg ICAgImxvY2FsOiR2bWlkL3ZtLSR2bWlkLWRpc2stMC5yYXciLCAibHZtLXN0b3JlOnZtLSR2bWlk LWRpc2stdGFyZ2V0LnFjb3cyIiwgMTAyNCAqIDEwLAogICAgICAgICBdLAogICAgICAgICBleHBl Y3RlZCA9PiBbCiAgICAgICAgICAgICAiL3Vzci9iaW4vcWVtdS1pbWciLApAQCAtNTYyLDggKzU2 Miw4IEBAIG15ICR0ZXN0cyA9IFsKICAgICAgICAgICAgICJyYXciLAogICAgICAgICAgICAgIi0t dGFyZ2V0LWltYWdlLW9wdHMiLAogICAgICAgICAgICAgIi92YXIvbGliL3Z6L2ltYWdlcy8kdm1p ZC92bS0kdm1pZC1kaXNrLTAucmF3IiwKLSAgICAgICAgICAgICJkcml2ZXI9cWNvdzIsZGlzY2Fy ZC1uby11bnJlZj10cnVlLGZpbGUuZHJpdmVyPWhvc3RfZGV2aWNlLCIKLSAgICAgICAgICAgICAg ICAuICJmaWxlLmZpbGVuYW1lPS9kZXYvcHZlL3ZtLSR2bWlkLWRpc2stMC5xY293MiIsCisgICAg ICAgICAgICAiZGlzY2FyZC1uby11bnJlZj10cnVlLGRyaXZlcj1xY293MixmaWxlLmRyaXZlcj1o b3N0X2RldmljZSIKKyAgICAgICAgICAgICAgICAuICIsZmlsZS5maWxlbmFtZT0vZGV2L3B2ZS92 bS0kdm1pZC1kaXNrLXRhcmdldC5xY293MiIsCiAgICAgICAgIF0sCiAgICAgfSwKIF07CkBAIC01 ODgsNiArNTg4LDE1IEBAICRzdG9yYWdlX21vZHVsZS0+bW9jaygKICAgICBhY3RpdmF0ZV92b2x1 bWVzID0+IHN1YiB7CiAgICAgICAgIHJldHVybiAxOwogICAgIH0sCisgICAgdm9sdW1lX3NuYXBz aG90X2luZm8gPT4gc3ViIHsKKyAgICAgICAgbXkgKCRjZmcsICR2b2xpZCkgPSBAXzsKKyAgICAg ICAgaWYgKCR2b2xpZCBlcSAibHZtLXN0b3JlOnZtLSR2bWlkLWRpc2stdGFyZ2V0LnFjb3cyIgor ICAgICAgICAgICAgfHwgJHZvbGlkIGVxICJsb2NhbHNuYXBleHQ6JHZtaWQvdm0tJHZtaWQtZGlz ay10YXJnZXQucWNvdzIiKSB7CisgICAgICAgICAgICAjIHRhcmdldCB2b2x1bWVzIGRvbid0IGhh dmUgc25hcHNob3RzCisgICAgICAgICAgICByZXR1cm4ge307CisgICAgICAgIH0KKyAgICAgICAg ZGllICJtb2NrZWQgdm9sdW1lX3NuYXBzaG90X2luZm8gY2FsbGVkIHdpdGggdW5leHBlY3RlZCB2 b2xpZCAkdm9saWRcbiI7CisgICAgfSwKICk7CiAKIG15ICRsaW9fbW9kdWxlID0gVGVzdDo6TW9j a01vZHVsZS0+bmV3KCJQVkU6OlN0b3JhZ2U6Okx1bkNtZDo6TElPIik7Ci0tIAoyLjQ3LjIKCgoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KcHZlLWRldmVs IG1haWxpbmcgbGlzdApwdmUtZGV2ZWxAbGlzdHMucHJveG1veC5jb20KaHR0cHM6Ly9saXN0cy5w cm94bW94LmNvbS9jZ2ktYmluL21haWxtYW4vbGlzdGluZm8vcHZlLWRldmVsCg==