From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id AD7171FF183 for ; Wed, 30 Jul 2025 17:02:43 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E4630128C5; Wed, 30 Jul 2025 17:04:04 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Wed, 30 Jul 2025 17:03:16 +0200 Message-ID: <20250730150325.138087-3-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250730150325.138087-1-f.ebner@proxmox.com> References: <20250730150325.138087-1-f.ebner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1753887798217 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 2/3] 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 aW9uYSBFYm5lciA8Zi5lYm5lckBwcm94bW94LmNvbT4KLS0tCgpDaGFuZ2VzIHNpbmNlIGxhc3Qg aXRlcmF0aW9uOgoqIHJlYmFzZSArIG1ha2UgdGlkeQoKIHNyYy9QVkUvUWVtdVNlcnZlci9RZW11 SW1hZ2UucG0gICAgICAgIHwgNjUgKysrKysrKysrKysrKysrKysrKysrKystLS0KIHNyYy90ZXN0 L3J1bl9xZW11X2ltZ19jb252ZXJ0X3Rlc3RzLnBsIHwgMjQgKysrKysrKy0tLQogMiBmaWxlcyBj aGFuZ2VkLCA3NiBpbnNlcnRpb25zKCspLCAxMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9z cmMvUFZFL1FlbXVTZXJ2ZXIvUWVtdUltYWdlLnBtIGIvc3JjL1BWRS9RZW11U2VydmVyL1FlbXVJ bWFnZS5wbQppbmRleCA4ZmU3NWU5Mi4uZjJjYWRkNjkgMTAwNjQ0Ci0tLSBhL3NyYy9QVkUvUWVt dVNlcnZlci9RZW11SW1hZ2UucG0KKysrIGIvc3JjL1BWRS9RZW11U2VydmVyL1FlbXVJbWFnZS5w bQpAQCAtNSwxMSArNSwxMyBAQCB1c2Ugd2FybmluZ3M7CiAKIHVzZSBGY250bCBxdyhTX0lTQkxL KTsKIHVzZSBGaWxlOjpzdGF0OwordXNlIEpTT047CiAKIHVzZSBQVkU6OkZvcm1hdCBxdyhyZW5k ZXJfYnl0ZXMpOwogdXNlIFBWRTo6U3RvcmFnZTsKIHVzZSBQVkU6OlRvb2xzOwogCit1c2UgUFZF OjpRZW11U2VydmVyOjpCbG9ja2RldjsKIHVzZSBQVkU6OlFlbXVTZXJ2ZXI6OkRyaXZlIHF3KGNo ZWNrZWRfdm9sdW1lX2Zvcm1hdCk7CiB1c2UgUFZFOjpRZW11U2VydmVyOjpIZWxwZXJzOwogCkBA IC0zMSwxNiArMzMsNjIgQEAgc3ViIGNvbnZlcnRfaXNjc2lfcGF0aCB7CiB9CiAKIG15IHN1YiBx Y293Ml90YXJnZXRfaW1hZ2Vfb3B0cyB7Ci0gICAgbXkgKCRwYXRoLCBAcWNvdzJfb3B0cykgPSBA XzsKKyAgICBteSAoJHN0b3JlY2ZnLCAkZHJpdmUsIEBxY293Ml9vcHRzKSA9IEBfOwogCi0gICAg IyBGSVhNRSB0aGlzIGR1cGxpY2F0ZXMgbG9naWMgZnJvbSBxZW11X2Jsb2NrZGV2X29wdGlvbnMK LSAgICBteSAkc3QgPSBGaWxlOjpzdGF0OjpzdGF0KCRwYXRoKSBvciBkaWUgInN0YXQgZm9yICck cGF0aCcgZmFpbGVkIC0gJCFcbiI7CisgICAgIyBUaGVyZSBpcyBubyBtYWNoaW5lIHZlcnNpb24s IHRoZSBxZW11LWltZyBiaW5hcnkgdmVyc2lvbiBpcyB3aGF0J3MgaW1wb3J0YW50LgorICAgIG15 ICR2ZXJzaW9uID0gUFZFOjpRZW11U2VydmVyOjpIZWxwZXJzOjprdm1fdXNlcl92ZXJzaW9uKCk7 CiAKLSAgICBteSAkZHJpdmVyID0gU19JU0JMSygkc3QtPm1vZGUpID8gJ2hvc3RfZGV2aWNlJyA6 ICdmaWxlJzsKKyAgICBteSAkYmxvY2tkZXYgPSBQVkU6OlFlbXVTZXJ2ZXI6OkJsb2NrZGV2Ojpn ZW5lcmF0ZV9kcml2ZV9ibG9ja2RldigKKyAgICAgICAgJHN0b3JlY2ZnLAorICAgICAgICAkZHJp dmUsCisgICAgICAgICR2ZXJzaW9uLAorICAgICAgICB7ICduby10aHJvdHRsZScgPT4gMSB9LAor ICAgICk7CiAKLSAgICBteSAkcWNvdzJfb3B0c19zdHIgPSAnLCcgLiBqb2luKCcsJywgQHFjb3cy X29wdHMpOworICAgIG15ICRvcHRzID0gW107CisgICAgbXkgJG9wdF9wcmVmaXggPSAnJzsKKyAg ICBteSAkbmV4dF9jaGlsZCA9ICRibG9ja2RldjsKKyAgICB3aGlsZSAoJG5leHRfY2hpbGQpIHsK KyAgICAgICAgbXkgJGN1cnJlbnQgPSAkbmV4dF9jaGlsZDsKKyAgICAgICAgJG5leHRfY2hpbGQg PSBkZWxldGUoJGN1cnJlbnQtPntmaWxlfSk7CiAKLSAgICByZXR1cm4gImRyaXZlcj1xY293MiRx Y293Ml9vcHRzX3N0cixmaWxlLmRyaXZlcj0kZHJpdmVyLGZpbGUuZmlsZW5hbWU9JHBhdGgiOwor ICAgICAgICAjIFRPRE8gc2hvdWxkIGNhY2hlIHNldHRpbmdzIGJlIGNvbmZpZ3VyZWQgaGVyZSAo dmlhIGFwcHJvcHJpYXRlIGRyaXZlIGNvbmZpZ3VyYXRpb24pIHJhdGhlcgorICAgICAgICAjIHRo YW4gdmlhIGRlZGljYXRlZCBxZW11LWltZyBvcHRpb25zPworICAgICAgICBkZWxldGUoJGN1cnJl bnQtPntjYWNoZX0pOworICAgICAgICAjIFRPRE8gZS5nLiBjYW4ndCB1c2UgYWlvICduYXRpdmUn IHdpdGhvdXQgY2FjaGUuZGlyZWN0LCBqdXN0IHVzZSBRRU1VIGRlZmF1bHQgbGlrZSBmb3IKKyAg ICAgICAgIyBvdGhlciB0YXJnZXRzIGZvciBub3cKKyAgICAgICAgZGVsZXRlKCRjdXJyZW50LT57 YWlvfSk7CisKKyAgICAgICAgIyBubyBuZWVkIGZvciBub2RlIG5hbWVzCisgICAgICAgIGRlbGV0 ZSgkY3VycmVudC0+eydub2RlLW5hbWUnfSk7CisKKyAgICAgICAgIyBpdCdzIHRoZSB3cml0ZSB0 YXJnZXQsIHdoaWxlIHRoZSBmbGFnIHNob3VsZCBiZSAnZmFsc2UnIGFueXdheXMsIHJlbW92ZSB0 byBiZSBzdXJlCisgICAgICAgIGRlbGV0ZSgkY3VycmVudC0+eydyZWFkLW9ubHknfSk7CisKKyAg ICAgICAgIyBUT0RPIHNob3VsZCB0aG9zZSBiZSBzZXQgKHZpYSBhcHByb3ByaWF0ZSBkcml2ZSBj b25maWd1cmF0aW9uKT8KKyAgICAgICAgZGVsZXRlKCRjdXJyZW50LT57J2RldGVjdC16ZXJvZXMn fSk7CisgICAgICAgIGRlbGV0ZSgkY3VycmVudC0+eydkaXNjYXJkJ30pOworCisgICAgICAgIGZv ciBteSAka2V5IChzb3J0IGtleXMgJGN1cnJlbnQtPiUqKSB7CisgICAgICAgICAgICBteSAkdmFs dWU7CisgICAgICAgICAgICBpZiAocmVmKCRjdXJyZW50LT57JGtleX0pKSB7CisgICAgICAgICAg ICAgICAgaWYgKCRjdXJyZW50LT57JGtleX0gZXEgSlNPTjo6ZmFsc2UpIHsKKyAgICAgICAgICAg ICAgICAgICAgJHZhbHVlID0gJ2ZhbHNlJzsKKyAgICAgICAgICAgICAgICB9IGVsc2lmICgkY3Vy cmVudC0+eyRrZXl9IGVxIEpTT046OnRydWUpIHsKKyAgICAgICAgICAgICAgICAgICAgJHZhbHVl ID0gJ3RydWUnOworICAgICAgICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAgICAgICAg IGRpZSAidGFyZ2V0IGltYWdlIG9wdGlvbnM6IHVuaGFuZGxlZCBzdHJ1Y3R1cmVkIGtleTogJGtl eVxuIjsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAg ICAgICAgICR2YWx1ZSA9ICRjdXJyZW50LT57JGtleX07CisgICAgICAgICAgICB9CisgICAgICAg ICAgICBwdXNoICRvcHRzLT5AKiwgIiRvcHRfcHJlZml4JGtleT0kdmFsdWUiOworICAgICAgICB9 CisKKyAgICAgICAgJG9wdF9wcmVmaXggLj0gJ2ZpbGUuJzsKKyAgICB9CisKKyAgICByZXR1cm4g am9pbignLCcsICRvcHRzLT5AKik7CiB9CiAKICMgVGhlIHBvc3NpYmxlIG9wdGlvbnMgYXJlOgpA QCAtMTE1LDcgKzE2MywxMCBAQCBzdWIgY29udmVydCB7CiAgICAgaWYgKCRkc3RfaXNfaXNjc2kp IHsKICAgICAgICAgJGRzdF9wYXRoID0gY29udmVydF9pc2NzaV9wYXRoKCRkc3RfcGF0aCk7CiAg ICAgfSBlbHNpZiAoJGRzdF9uZWVkc19kaXNjYXJkX25vX3VucmVmKSB7Ci0gICAgICAgICRkc3Rf cGF0aCA9IHFjb3cyX3RhcmdldF9pbWFnZV9vcHRzKCRkc3RfcGF0aCwgJ2Rpc2NhcmQtbm8tdW5y ZWY9dHJ1ZScpOworICAgICAgICAjIGRvbid0IHVzZSBhbnkgb3RoZXIgZHJpdmUgb3B0aW9ucywg dGhvc2UgYXJlIGludGVuZGVkIGZvciB1c2Ugd2l0aCBhIHJ1bm5pbmcgVk0gYW5kIGp1c3QKKyAg ICAgICAgIyB1c2Ugc2NzaTAgYXMgYSBkdW1teSBpbnRlcmZhY2UraW5kZXggZm9yIG5vdworICAg ICAgICBteSAkZHN0X2RyaXZlID0geyBmaWxlID0+ICRkc3Rfdm9saWQsIGludGVyZmFjZSA9PiAn c2NzaScsIGluZGV4ID0+IDAgfTsKKyAgICAgICAgJGRzdF9wYXRoID0gcWNvdzJfdGFyZ2V0X2lt YWdlX29wdHMoJHN0b3JlY2ZnLCAkZHN0X2RyaXZlLCAnZGlzY2FyZC1uby11bnJlZj10cnVlJyk7 CiAgICAgfSBlbHNlIHsKICAgICAgICAgcHVzaCBAJGNtZCwgJy1PJywgJGRzdF9mb3JtYXQ7CiAg ICAgfQpkaWZmIC0tZ2l0IGEvc3JjL3Rlc3QvcnVuX3FlbXVfaW1nX2NvbnZlcnRfdGVzdHMucGwg Yi9zcmMvdGVzdC9ydW5fcWVtdV9pbWdfY29udmVydF90ZXN0cy5wbAppbmRleCAzYzhmMDlmMC4u MzkzZmM0YTggMTAwNzU1Ci0tLSBhL3NyYy90ZXN0L3J1bl9xZW11X2ltZ19jb252ZXJ0X3Rlc3Rz LnBsCisrKyBiL3NyYy90ZXN0L3J1bl9xZW11X2ltZ19jb252ZXJ0X3Rlc3RzLnBsCkBAIC01MzIs NyArNTMyLDcgQEAgbXkgJHRlc3RzID0gWwogICAgICAgICBuYW1lID0+ICJxY293Ml9leHRlcm5h bF9zbmFwc2hvdF90YXJnZXQiLAogICAgICAgICBwYXJhbWV0ZXJzID0+IFsKICAgICAgICAgICAg ICJsb2NhbDokdm1pZC92bS0kdm1pZC1kaXNrLTAucmF3IiwKLSAgICAgICAgICAgICJsb2NhbHNu YXBleHQ6JHZtaWQvdm0tJHZtaWQtZGlzay0wLnFjb3cyIiwKKyAgICAgICAgICAgICJsb2NhbHNu YXBleHQ6JHZtaWQvdm0tJHZtaWQtZGlzay10YXJnZXQucWNvdzIiLAogICAgICAgICAgICAgMTAy NCAqIDEwLAogICAgICAgICBdLAogICAgICAgICBleHBlY3RlZCA9PiBbCkBAIC01NDQsMTQgKzU0 NCwxNSBAQCBteSAkdGVzdHMgPSBbCiAgICAgICAgICAgICAicmF3IiwKICAgICAgICAgICAgICIt LXRhcmdldC1pbWFnZS1vcHRzIiwKICAgICAgICAgICAgICIvdmFyL2xpYi92ei9pbWFnZXMvJHZt aWQvdm0tJHZtaWQtZGlzay0wLnJhdyIsCi0gICAgICAgICAgICAiZHJpdmVyPXFjb3cyLGRpc2Nh cmQtbm8tdW5yZWY9dHJ1ZSxmaWxlLmRyaXZlcj1maWxlLCIKLSAgICAgICAgICAgICAgICAuICJm aWxlLmZpbGVuYW1lPS92YXIvbGliL3Z6c25hcGV4dC9pbWFnZXMvJHZtaWQvdm0tJHZtaWQtZGlz ay0wLnFjb3cyIiwKKyAgICAgICAgICAgICJkaXNjYXJkLW5vLXVucmVmPXRydWUsZHJpdmVyPXFj b3cyLGZpbGUuZHJpdmVyPWZpbGUiCisgICAgICAgICAgICAgICAgLiAiLGZpbGUuZmlsZW5hbWU9 L3Zhci9saWIvdnpzbmFwZXh0L2ltYWdlcy8kdm1pZC92bS0kdm1pZC1kaXNrLXRhcmdldC5xY293 MiIsCiAgICAgICAgIF0sCiAgICAgfSwKICAgICB7CiAgICAgICAgIG5hbWUgPT4gImx2bXFjb3cy X2V4dGVybmFsX3NuYXBzaG90X3RhcmdldCIsCiAgICAgICAgIHBhcmFtZXRlcnMgPT4gWwotICAg ICAgICAgICAgImxvY2FsOiR2bWlkL3ZtLSR2bWlkLWRpc2stMC5yYXciLCAibHZtLXN0b3JlOnZt LSR2bWlkLWRpc2stMC5xY293MiIsIDEwMjQgKiAxMCwKKyAgICAgICAgICAgICJsb2NhbDokdm1p ZC92bS0kdm1pZC1kaXNrLTAucmF3IiwgImx2bS1zdG9yZTp2bS0kdm1pZC1kaXNrLXRhcmdldC5x Y293MiIsCisgICAgICAgICAgICAxMDI0ICogMTAsCiAgICAgICAgIF0sCiAgICAgICAgIGV4cGVj dGVkID0+IFsKICAgICAgICAgICAgICIvdXNyL2Jpbi9xZW11LWltZyIsCkBAIC01NjIsOCArNTYz LDggQEAgbXkgJHRlc3RzID0gWwogICAgICAgICAgICAgInJhdyIsCiAgICAgICAgICAgICAiLS10 YXJnZXQtaW1hZ2Utb3B0cyIsCiAgICAgICAgICAgICAiL3Zhci9saWIvdnovaW1hZ2VzLyR2bWlk L3ZtLSR2bWlkLWRpc2stMC5yYXciLAotICAgICAgICAgICAgImRyaXZlcj1xY293MixkaXNjYXJk LW5vLXVucmVmPXRydWUsZmlsZS5kcml2ZXI9aG9zdF9kZXZpY2UsIgotICAgICAgICAgICAgICAg IC4gImZpbGUuZmlsZW5hbWU9L2Rldi9wdmUvdm0tJHZtaWQtZGlzay0wLnFjb3cyIiwKKyAgICAg ICAgICAgICJkaXNjYXJkLW5vLXVucmVmPXRydWUsZHJpdmVyPXFjb3cyLGZpbGUuZHJpdmVyPWhv c3RfZGV2aWNlIgorICAgICAgICAgICAgICAgIC4gIixmaWxlLmZpbGVuYW1lPS9kZXYvcHZlL3Zt LSR2bWlkLWRpc2stdGFyZ2V0LnFjb3cyIiwKICAgICAgICAgXSwKICAgICB9LAogXTsKQEAgLTU4 OCw2ICs1ODksMTcgQEAgJHN0b3JhZ2VfbW9kdWxlLT5tb2NrKAogICAgIGFjdGl2YXRlX3ZvbHVt ZXMgPT4gc3ViIHsKICAgICAgICAgcmV0dXJuIDE7CiAgICAgfSwKKyAgICB2b2x1bWVfc25hcHNo b3RfaW5mbyA9PiBzdWIgeworICAgICAgICBteSAoJGNmZywgJHZvbGlkKSA9IEBfOworICAgICAg ICBpZiAoCisgICAgICAgICAgICAkdm9saWQgZXEgImx2bS1zdG9yZTp2bS0kdm1pZC1kaXNrLXRh cmdldC5xY293MiIKKyAgICAgICAgICAgIHx8ICR2b2xpZCBlcSAibG9jYWxzbmFwZXh0OiR2bWlk L3ZtLSR2bWlkLWRpc2stdGFyZ2V0LnFjb3cyIgorICAgICAgICApIHsKKyAgICAgICAgICAgICMg dGFyZ2V0IHZvbHVtZXMgZG9uJ3QgaGF2ZSBzbmFwc2hvdHMKKyAgICAgICAgICAgIHJldHVybiB7 fTsKKyAgICAgICAgfQorICAgICAgICBkaWUgIm1vY2tlZCB2b2x1bWVfc25hcHNob3RfaW5mbyBj YWxsZWQgd2l0aCB1bmV4cGVjdGVkIHZvbGlkICR2b2xpZFxuIjsKKyAgICB9LAogKTsKIAogbXkg JGxpb19tb2R1bGUgPSBUZXN0OjpNb2NrTW9kdWxlLT5uZXcoIlBWRTo6U3RvcmFnZTo6THVuQ21k OjpMSU8iKTsKLS0gCjIuNDcuMgoKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpwdmUtZGV2ZWwgbWFpbGluZyBsaXN0CnB2ZS1kZXZlbEBsaXN0cy5wcm94 bW94LmNvbQpodHRwczovL2xpc3RzLnByb3htb3guY29tL2NnaS1iaW4vbWFpbG1hbi9saXN0aW5m by9wdmUtZGV2ZWwK