proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-06-15 18:49:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

move nbd_stop helper to QMPHelpers module

Browse Source 
Like this nbd_stop() can be called from a module that cannot include
QemuServer.pm.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fiona Ebner 2024-11-07 17:51:28 +01:00 committed by Fabian Grünbichler
parent 6f32c3fa7a
commit dde471e142
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
PVE/API2/Qemu.pm
View File

@ -35,6 +35,7 @@ use PVE::QemuServer::Monitor qw(mon_cmd);
use PVE::QemuServer::Machine; use PVE::QemuServer::Machine;
use PVE::QemuServer::Memory qw(get_current_memory); use PVE::QemuServer::Memory qw(get_current_memory);
use PVE::QemuServer::PCI; use PVE::QemuServer::PCI;
use PVE::QemuServer::QMPHelpers;
use PVE::QemuServer::USB; use PVE::QemuServer::USB;
use PVE::QemuMigrate; use PVE::QemuMigrate;
use PVE::RPCEnvironment; use PVE::RPCEnvironment;
@ -5910,7 +5911,7 @@ __PACKAGE__->register_method({
return; return;
}, },
'nbdstop' => sub { 'nbdstop' => sub {
PVE::QemuServer::nbd_stop($state->{vmid}); PVE::QemuServer::QMPHelpers::nbd_stop($state->{vmid});
return; return;
}, },
'resume' => sub { 'resume' => sub {

3
PVE/CLI/qm.pm
View File

@ -35,6 +35,7 @@ use PVE::QemuServer::Agent qw(agent_available);
use PVE::QemuServer::ImportDisk; use PVE::QemuServer::ImportDisk;
use PVE::QemuServer::Monitor qw(mon_cmd); use PVE::QemuServer::Monitor qw(mon_cmd);
use PVE::QemuServer::OVF; use PVE::QemuServer::OVF;
use PVE::QemuServer::QMPHelpers;
use PVE::QemuServer; use PVE::QemuServer;
use PVE::CLIHandler; use PVE::CLIHandler;
@ -385,7 +386,7 @@ __PACKAGE__->register_method ({
my $vmid = $param->{vmid}; my $vmid = $param->{vmid};
eval { PVE::QemuServer::nbd_stop($vmid) }; eval { PVE::QemuServer::QMPHelpers::nbd_stop($vmid) };
warn $@ if $@; warn $@ if $@;
return; return;

6
PVE/QemuServer.pm
View File

@ -8609,12 +8609,6 @@ sub generate_smbios1_uuid {
return "uuid=".generate_uuid(); return "uuid=".generate_uuid();
} }
sub nbd_stop {
my ($vmid) = @_;
mon_cmd($vmid, 'nbd-server-stop', timeout => 25);
}
sub create_reboot_request { sub create_reboot_request {
my ($vmid) = @_; my ($vmid) = @_;
open(my $fh, '>', "/run/qemu-server/$vmid.reboot") open(my $fh, '>', "/run/qemu-server/$vmid.reboot")

6
PVE/QemuServer/QMPHelpers.pm
View File

@ -15,6 +15,12 @@ qemu_objectadd
qemu_objectdel qemu_objectdel
); );
sub nbd_stop {
my ($vmid) = @_;
mon_cmd($vmid, 'nbd-server-stop', timeout => 25);
}
sub qemu_deviceadd { sub qemu_deviceadd {
my ($vmid, $devicefull) = @_; my ($vmid, $devicefull) = @_;