proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-04-29 21:51:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

introduce QMPHelpers module

Browse Source 
moving qemu_{device,object}{add,del} helpers there for now.

In preparation to remove the cyclic include of PVE::QemuServer in the
memory module and generally for better modularity in the future.

No functional change intended.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fiona Ebner 2023-09-04 13:39:48 +02:00 committed by Thomas Lamprecht
parent 2951c45ec0
commit 87b0f305e7
4 changed files with 55 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
PVE/QemuServer.pm
View File

@ -58,6 +58,7 @@ use PVE::QemuServer::Machine;
use PVE::QemuServer::Memory; use PVE::QemuServer::Memory;
use PVE::QemuServer::Monitor qw(mon_cmd); use PVE::QemuServer::Monitor qw(mon_cmd);
use PVE::QemuServer::PCI qw(print_pci_addr print_pcie_addr print_pcie_root_port parse_hostpci); use PVE::QemuServer::PCI qw(print_pci_addr print_pcie_addr print_pcie_root_port parse_hostpci);
use PVE::QemuServer::QMPHelpers qw(qemu_deviceadd qemu_devicedel qemu_objectadd qemu_objectdel);
use PVE::QemuServer::USB; use PVE::QemuServer::USB;
my $have_sdn; my $have_sdn;
@ -4377,21 +4378,6 @@ sub qemu_spice_usbredir_chardev_add {
)); ));
} }
sub qemu_deviceadd {
my ($vmid, $devicefull) = @_;
$devicefull = "driver=".$devicefull;
my %options = split(/[=,]/, $devicefull);
mon_cmd($vmid, "device_add" , %options);
}
sub qemu_devicedel {
my ($vmid, $deviceid) = @_;
my $ret = mon_cmd($vmid, "device_del", id => $deviceid);
}
sub qemu_iothread_add { sub qemu_iothread_add {
my ($vmid, $deviceid, $device) = @_; my ($vmid, $deviceid, $device) = @_;
@ -4410,22 +4396,6 @@ sub qemu_iothread_del {
} }
} }
sub qemu_objectadd {
my ($vmid, $objectid, $qomtype) = @_;
mon_cmd($vmid, "object-add", id => $objectid, "qom-type" => $qomtype);
return 1;
}
sub qemu_objectdel {
my ($vmid, $objectid) = @_;
mon_cmd($vmid, "object-del", id => $objectid);
return 1;
}
sub qemu_driveadd { sub qemu_driveadd {
my ($storecfg, $vmid, $device) = @_; my ($storecfg, $vmid, $device) = @_;

1
PVE/QemuServer/Makefile
View File

@ -11,6 +11,7 @@ SOURCES=PCI.pm \
CPUConfig.pm \ CPUConfig.pm \
CGroup.pm \ CGroup.pm \
Drive.pm \ Drive.pm \
QMPHelpers.pm
.PHONY: install .PHONY: install
install: ${SOURCES} install: ${SOURCES}

9
PVE/QemuServer/Memory.pm
View File

@ -10,6 +10,7 @@ use PVE::Exception qw(raise raise_param_exc);
use PVE::QemuServer; use PVE::QemuServer;
use PVE::QemuServer::Helpers qw(parse_number_sets); use PVE::QemuServer::Helpers qw(parse_number_sets);
use PVE::QemuServer::Monitor qw(mon_cmd); use PVE::QemuServer::Monitor qw(mon_cmd);
use PVE::QemuServer::QMPHelpers qw(qemu_devicedel qemu_objectdel);
our $MAX_NUMA = 8; our $MAX_NUMA = 8;
@ -226,13 +227,13 @@ sub qemu_memory_hotplug {
} }
if (my $err = $@) { if (my $err = $@) {
eval { PVE::QemuServer::qemu_objectdel($vmid, "mem-$name"); }; eval { qemu_objectdel($vmid, "mem-$name"); };
die $err; die $err;
} }
eval { mon_cmd($vmid, "device_add", driver => "pc-dimm", id => "$name", memdev => "mem-$name", node => $numanode) }; eval { mon_cmd($vmid, "device_add", driver => "pc-dimm", id => "$name", memdev => "mem-$name", node => $numanode) };
if (my $err = $@) { if (my $err = $@) {
eval { PVE::QemuServer::qemu_objectdel($vmid, "mem-$name"); }; eval { qemu_objectdel($vmid, "mem-$name"); };
die $err; die $err;
} }
#update conf after each succesful module hotplug #update conf after each succesful module hotplug
@ -255,7 +256,7 @@ sub qemu_memory_hotplug {
my $retry = 0; my $retry = 0;
while (1) { while (1) {
eval { PVE::QemuServer::qemu_devicedel($vmid, $name) }; eval { qemu_devicedel($vmid, $name) };
sleep 3; sleep 3;
my $dimm_list = qemu_memdevices_list($vmid, 'dimm'); my $dimm_list = qemu_memdevices_list($vmid, 'dimm');
last if !$dimm_list->{$name}; last if !$dimm_list->{$name};
@ -266,7 +267,7 @@ sub qemu_memory_hotplug {
#update conf after each succesful module unplug #update conf after each succesful module unplug
$conf->{memory} = $current_size; $conf->{memory} = $current_size;
eval { PVE::QemuServer::qemu_objectdel($vmid, "mem-$name"); }; eval { qemu_objectdel($vmid, "mem-$name"); };
PVE::QemuConfig->write_config($vmid, $conf); PVE::QemuConfig->write_config($vmid, $conf);
} }
} }

48
PVE/QemuServer/QMPHelpers.pm Normal file
View File

@ -0,0 +1,48 @@
package PVE::QemuServer::QMPHelpers;
use warnings;
use strict;
use PVE::QemuServer::Monitor qw(mon_cmd);
use base 'Exporter';
our @EXPORT_OK = qw(
qemu_deviceadd
qemu_devicedel
qemu_objectadd
qemu_objectdel
);
sub qemu_deviceadd {
my ($vmid, $devicefull) = @_;
$devicefull = "driver=".$devicefull;
my %options = split(/[=,]/, $devicefull);
mon_cmd($vmid, "device_add" , %options);
}
sub qemu_devicedel {
my ($vmid, $deviceid) = @_;
my $ret = mon_cmd($vmid, "device_del", id => $deviceid);
}
sub qemu_objectadd {
my ($vmid, $objectid, $qomtype) = @_;
mon_cmd($vmid, "object-add", id => $objectid, "qom-type" => $qomtype);
return 1;
}
sub qemu_objectdel {
my ($vmid, $objectid) = @_;
mon_cmd($vmid, "object-del", id => $objectid);
return 1;
}
1;