Like this nbd_stop() can be called from a module that cannot include QemuServer.pm.
Signed-off-by: Fiona Ebner <f.eb...@proxmox.com> --- PVE/API2/Qemu.pm | 3 ++- PVE/CLI/qm.pm | 3 ++- PVE/QemuServer.pm | 6 ------ PVE/QemuServer/QMPHelpers.pm | 6 ++++++ 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index a3313f3a..9c644ff6 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -35,6 +35,7 @@ use PVE::QemuServer::Monitor qw(mon_cmd); use PVE::QemuServer::Machine; use PVE::QemuServer::Memory qw(get_current_memory); use PVE::QemuServer::PCI; +use PVE::QemuServer::QMPHelpers; use PVE::QemuServer::USB; use PVE::QemuMigrate; use PVE::RPCEnvironment; @@ -5909,7 +5910,7 @@ __PACKAGE__->register_method({ return; }, 'nbdstop' => sub { - PVE::QemuServer::nbd_stop($state->{vmid}); + PVE::QemuServer::QMPHelpers::nbd_stop($state->{vmid}); return; }, 'resume' => sub { diff --git a/PVE/CLI/qm.pm b/PVE/CLI/qm.pm index d3dbf7b4..8349997e 100755 --- a/PVE/CLI/qm.pm +++ b/PVE/CLI/qm.pm @@ -35,6 +35,7 @@ use PVE::QemuServer::Agent qw(agent_available); use PVE::QemuServer::ImportDisk; use PVE::QemuServer::Monitor qw(mon_cmd); use PVE::QemuServer::OVF; +use PVE::QemuServer::QMPHelpers; use PVE::QemuServer; use PVE::CLIHandler; @@ -385,7 +386,7 @@ __PACKAGE__->register_method ({ my $vmid = $param->{vmid}; - eval { PVE::QemuServer::nbd_stop($vmid) }; + eval { PVE::QemuServer::QMPHelpers::nbd_stop($vmid) }; warn $@ if $@; return; diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index bf59b091..d05705b1 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -8494,12 +8494,6 @@ sub generate_smbios1_uuid { return "uuid=".generate_uuid(); } -sub nbd_stop { - my ($vmid) = @_; - - mon_cmd($vmid, 'nbd-server-stop', timeout => 25); -} - sub create_reboot_request { my ($vmid) = @_; open(my $fh, '>', "/run/qemu-server/$vmid.reboot") diff --git a/PVE/QemuServer/QMPHelpers.pm b/PVE/QemuServer/QMPHelpers.pm index d3a52327..785bc49c 100644 --- a/PVE/QemuServer/QMPHelpers.pm +++ b/PVE/QemuServer/QMPHelpers.pm @@ -14,6 +14,12 @@ qemu_objectadd qemu_objectdel ); +sub nbd_stop { + my ($vmid) = @_; + + mon_cmd($vmid, 'nbd-server-stop', timeout => 25); +} + sub qemu_deviceadd { my ($vmid, $devicefull) = @_; -- 2.39.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel