From: Fiona Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH qemu-server 12/22] vm start: move state file handling to dedicated module
Date: Thu, 12 Jun 2025 16:02:43 +0200 [thread overview]
Message-ID: <20250612140253.106555-13-f.ebner@proxmox.com> (raw)
In-Reply-To: <20250612140253.106555-1-f.ebner@proxmox.com>
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
PVE/QemuServer.pm | 56 +++++++------------------------------
PVE/QemuServer/StateFile.pm | 56 +++++++++++++++++++++++++++++++++++++
2 files changed, 66 insertions(+), 46 deletions(-)
diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 91b55cf9..25ba709d 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -5577,8 +5577,6 @@ sub vm_start_nolock {
my $migration_type = $migrate_opts->{type};
my $nbd_protocol_version = $migrate_opts->{nbd_proto_version} // 0;
- my $res = {};
-
# clean up leftover reboot request files
eval { clear_reboot_request($vmid); };
warn $@ if $@;
@@ -5649,54 +5647,20 @@ sub vm_start_nolock {
$nodename, $migrate_opts->{network});
}
+ my $res = {};
+ my $statefile_is_a_volume;
+ my $state_cmdline = [];
if ($statefile) {
- if ($statefile eq 'tcp') {
- my $migrate = $res->{migrate} = { proto => 'tcp' };
- $migrate->{addr} = "localhost";
- my $datacenterconf = PVE::Cluster::cfs_read_file('datacenter.cfg');
- my $nodename = nodename();
-
- if (!defined($migration_type)) {
- if (defined($datacenterconf->{migration}->{type})) {
- $migration_type = $datacenterconf->{migration}->{type};
- } else {
- $migration_type = 'secure';
- }
- }
-
- if ($migration_type eq 'insecure') {
- $migrate->{addr} = $migration_ip // die "internal error - no migration IP";
- $migrate->{addr} = "[$migrate->{addr}]" if Net::IP::ip_is_ipv6($migrate->{addr});
- }
-
- # see #4501: port reservation should be done close to usage - tell QEMU where to listen
- # via QMP later
- push @$cmd, '-incoming', 'defer';
- push @$cmd, '-S';
-
- } elsif ($statefile eq 'unix') {
- # should be default for secure migrations as a ssh TCP forward
- # tunnel is not deterministic reliable ready and fails regurarly
- # to set up in time, so use UNIX socket forwards
- my $migrate = $res->{migrate} = { proto => 'unix' };
- $migrate->{addr} = "/run/qemu-server/$vmid.migrate";
- unlink $migrate->{addr};
-
- $migrate->{uri} = "unix:$migrate->{addr}";
- push @$cmd, '-incoming', $migrate->{uri};
- push @$cmd, '-S';
-
- } elsif (-e $statefile) {
- push @$cmd, '-loadstate', $statefile;
- } else {
- my $statepath = PVE::Storage::path($storecfg, $statefile);
- push @$vollist, $statefile;
- push @$cmd, '-loadstate', $statepath;
- }
+ ($state_cmdline, $res->{migrate}, $statefile_is_a_volume) =
+ PVE::QemuServer::StateFile::statefile_cmdline_option(
+ $storecfg, $vmid, $statefile, $migrate_opts, $migration_ip);
+ push @$vollist, $statefile if $statefile_is_a_volume;
} elsif ($params->{paused}) {
- push @$cmd, '-S';
+ $state_cmdline = ['-S'];
}
+ push $cmd->@*, $state_cmdline->@*;
+
my $memory = get_current_memory($conf->{memory});
my $start_timeout = $params->{timeout} // config_aware_timeout($conf, $memory, $resume);
diff --git a/PVE/QemuServer/StateFile.pm b/PVE/QemuServer/StateFile.pm
index e297839b..630ccca3 100644
--- a/PVE/QemuServer/StateFile.pm
+++ b/PVE/QemuServer/StateFile.pm
@@ -29,4 +29,60 @@ sub get_migration_ip {
return PVE::Cluster::remote_node_ip($nodename, 1);
}
+# $migration_ip must be defined if using insecure TCP migration
+sub statefile_cmdline_option {
+ my ($storecfg, $vmid, $statefile, $migrate_opts, $migration_ip) = @_;
+
+ my $migration_type = $migrate_opts->{type};
+
+ my $statefile_is_a_volume = 0;
+ my $res = {};
+ my $cmd = [];
+
+ if ($statefile eq 'tcp') {
+ my $migrate = $res->{migrate} = { proto => 'tcp' };
+ $migrate->{addr} = "localhost";
+ my $datacenterconf = PVE::Cluster::cfs_read_file('datacenter.cfg');
+
+ if (!defined($migration_type)) {
+ if (defined($datacenterconf->{migration}->{type})) {
+ $migration_type = $datacenterconf->{migration}->{type};
+ } else {
+ $migration_type = 'secure';
+ }
+ }
+
+ if ($migration_type eq 'insecure') {
+ $migrate->{addr} = $migration_ip // die "internal error - no migration IP";
+ $migrate->{addr} = "[$migrate->{addr}]" if Net::IP::ip_is_ipv6($migrate->{addr});
+ }
+
+ # see #4501: port reservation should be done close to usage - tell QEMU where to listen
+ # via QMP later
+ push @$cmd, '-incoming', 'defer';
+ push @$cmd, '-S';
+
+ } elsif ($statefile eq 'unix') {
+ # should be default for secure migrations as a ssh TCP forward
+ # tunnel is not deterministic reliable ready and fails regurarly
+ # to set up in time, so use UNIX socket forwards
+ my $migrate = $res->{migrate} = { proto => 'unix' };
+ $migrate->{addr} = "/run/qemu-server/$vmid.migrate";
+ unlink $migrate->{addr};
+
+ $migrate->{uri} = "unix:$migrate->{addr}";
+ push @$cmd, '-incoming', $migrate->{uri};
+ push @$cmd, '-S';
+
+ } elsif (-e $statefile) {
+ push @$cmd, '-loadstate', $statefile;
+ } else {
+ my $statepath = PVE::Storage::path($storecfg, $statefile);
+ $statefile_is_a_volume = 1;
+ push @$cmd, '-loadstate', $statepath;
+ }
+
+ return ($cmd, $res->{migrate}, $statefile_is_a_volume);
+}
+
1;
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
next prev parent reply other threads:[~2025-06-12 14:03 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-12 14:02 [pve-devel] [PATCH-SERIES qemu-server 00/22] preparation for switch to blockdev Fiona Ebner
2025-06-12 14:02 ` [pve-devel] [PATCH qemu-server 01/22] drive: code cleanup: drop unused $vmid parameter from get_path_and_format() Fiona Ebner
2025-06-12 14:02 ` [pve-devel] [PATCH qemu-server 02/22] cfg2cmd: require at least QEMU binary version 6.0 Fiona Ebner
2025-06-13 9:18 ` Fabian Grünbichler
2025-06-16 8:47 ` Fiona Ebner
2025-06-12 14:02 ` [pve-devel] [PATCH qemu-server 03/22] drive: parse: use hash argument for optional parameters Fiona Ebner
2025-06-12 14:02 ` [pve-devel] [PATCH qemu-server 04/22] drive: parse drive: support parsing with additional properties Fiona Ebner
2025-06-12 14:02 ` [pve-devel] [PATCH qemu-server 05/22] restore: parse drive " Fiona Ebner
2025-06-13 9:30 ` Fabian Grünbichler
2025-06-16 8:51 ` Fiona Ebner
2025-06-12 14:02 ` [pve-devel] [PATCH qemu-server 06/22] drive: remove geometry options gone since QEMU 3.1 Fiona Ebner
2025-06-12 14:02 ` [pve-devel] [PATCH qemu-server 07/22] clone disk: io uring check: fix call to determine cache direct Fiona Ebner
2025-06-12 14:02 ` [pve-devel] [PATCH qemu-server 08/22] drive: move storage_allows_io_uring_default() and drive_uses_cache_direct() helpers to drive module Fiona Ebner
2025-06-12 14:02 ` [pve-devel] [PATCH qemu-server 09/22] drive: introduce aio_cmdline_option() helper Fiona Ebner
2025-06-12 14:02 ` [pve-devel] [PATCH qemu-server 10/22] drive: introduce detect_zeroes_cmdline_option() helper Fiona Ebner
2025-06-12 14:02 ` [pve-devel] [PATCH qemu-server 11/22] introduce StateFile module for state file related helpers Fiona Ebner
2025-06-12 14:02 ` Fiona Ebner [this message]
2025-06-13 10:00 ` [pve-devel] [PATCH qemu-server 12/22] vm start: move state file handling to dedicated module Fabian Grünbichler
2025-06-16 10:34 ` Fiona Ebner
2025-06-16 10:54 ` Fabian Grünbichler
2025-06-16 10:57 ` Fiona Ebner
2025-06-12 14:02 ` [pve-devel] [PATCH qemu-server 13/22] vm start: move config_to_command() call further down Fiona Ebner
2025-06-13 10:05 ` Fabian Grünbichler
2025-06-16 10:54 ` Fiona Ebner
2025-06-12 14:02 ` [pve-devel] [PATCH qemu-server 14/22] vm start/commandline: also clean up pci reservation when config_to_command() fails Fiona Ebner
2025-06-12 14:02 ` [pve-devel] [PATCH qemu-server 15/22] vm start/commandline: activate volumes before config_to_command() Fiona Ebner
2025-06-13 10:16 ` Fabian Grünbichler
2025-06-17 7:46 ` Fiona Ebner
2025-06-13 10:25 ` Fabian Grünbichler
2025-06-16 11:31 ` DERUMIER, Alexandre via pve-devel
2025-06-16 11:51 ` Fiona Ebner
2025-06-16 12:46 ` Fabian Grünbichler
2025-06-16 12:57 ` Fiona Ebner
2025-06-16 13:15 ` Fabian Grünbichler
2025-06-16 13:27 ` Fiona Ebner
[not found] ` <409e12ad0b53d1b51c30717e6b9df3d370112df4.camel@groupe-cyllene.com>
2025-06-17 6:04 ` DERUMIER, Alexandre via pve-devel
2025-06-17 7:35 ` Fiona Ebner
2025-06-12 14:02 ` [pve-devel] [PATCH qemu-server 16/22] print drive device: explicitly set write-cache starting with machine version 10.0 Fiona Ebner
2025-06-13 10:28 ` Fabian Grünbichler
2025-06-17 7:47 ` Fiona Ebner
2025-06-12 14:02 ` [pve-devel] [PATCH qemu-server 17/22] print drive device: set {r, w}error front-end properties " Fiona Ebner
2025-06-12 14:02 ` [pve-devel] [PATCH qemu-server 18/22] print drive device: don't reference any drive for 'none' " Fiona Ebner
2025-06-13 11:14 ` Fabian Grünbichler
2025-06-17 7:54 ` Fiona Ebner
2025-06-12 14:02 ` [pve-devel] [PATCH qemu-server 19/22] drive: create a throttle group for each drive " Fiona Ebner
2025-06-13 11:23 ` Fabian Grünbichler
2025-06-17 7:58 ` Fiona Ebner
2025-06-12 14:02 ` [pve-devel] [PATCH qemu-server 20/22] blockdev: add helpers to generate blockdev commandline Fiona Ebner
2025-06-13 11:35 ` Fabian Grünbichler
2025-06-17 9:37 ` Fiona Ebner
2025-06-17 9:58 ` Fabian Grünbichler
2025-06-16 11:07 ` DERUMIER, Alexandre via pve-devel
2025-06-17 10:02 ` Fiona Ebner
2025-06-12 14:02 ` [pve-devel] [RFC qemu-server 21/22] blockdev: add support for NBD paths Fiona Ebner
2025-06-16 10:46 ` DERUMIER, Alexandre via pve-devel
2025-06-17 10:11 ` Fiona Ebner
2025-06-12 14:02 ` [pve-devel] [RFC qemu-server 22/22] command line: switch to blockdev starting with machine version 10.0 Fiona Ebner
2025-06-16 10:40 ` DERUMIER, Alexandre via pve-devel
2025-06-18 11:39 ` Fiona Ebner
2025-06-18 12:04 ` DERUMIER, Alexandre via pve-devel
2025-06-16 6:22 ` [pve-devel] [PATCH-SERIES qemu-server 00/22] preparation for switch to blockdev DERUMIER, Alexandre via pve-devel
2025-06-16 8:44 ` Fiona 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=20250612140253.106555-13-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
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal