From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH qemu-server 2/3] migrate: always check if content type images is available for target storage
Date: Fri, 19 Mar 2021 14:49:07 +0100 [thread overview]
Message-ID: <20210319134908.10558-2-f.ebner@proxmox.com> (raw)
In-Reply-To: <20210319134908.10558-1-f.ebner@proxmox.com>
it's cheap and saves code.
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
PVE/QemuMigrate.pm | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm
index 3597cc9..44cecce 100644
--- a/PVE/QemuMigrate.pm
+++ b/PVE/QemuMigrate.pm
@@ -410,11 +410,8 @@ sub sync_disks {
$log_error->("storage '$targetsid' is not available on node '$self->{node}'")
if !$target_scfg;
- # grandfather in existing mismatches
- if ($targetsid ne $storeid && $target_scfg) {
- $log_error->("content type 'images' is not available on storage '$targetsid'")
- if !$target_scfg->{content}->{images};
- }
+ $log_error->("content type 'images' is not available on storage '$targetsid'")
+ if $target_scfg && !$target_scfg->{content}->{images};
PVE::Storage::foreach_volid($dl, sub {
my ($volid, $sid, $volinfo) = @_;
--
2.20.1
next prev parent reply other threads:[~2021-03-19 13:49 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-19 13:49 [pve-devel] [PATCH qemu-server 1/3] migrate: improve early error messages Fabian Ebner
2021-03-19 13:49 ` Fabian Ebner [this message]
2021-03-19 14:16 ` [pve-devel] [PATCH qemu-server 2/3] migrate: always check if content type images is available for target storage Fabian Grünbichler
2021-03-22 8:56 ` Fabian Ebner
2021-03-22 10:01 ` Fabian Grünbichler
2021-03-22 11:08 ` Fabian Ebner
2021-03-19 13:49 ` [pve-devel] [PATCH qemu-server 3/3] code cleanup: migrate: avoid post-ifs Fabian Ebner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210319134908.10558-2-f.ebner@proxmox.com \
--to=f.ebner@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox