proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-05-03 01:29:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tree-wide: switch to official spelling of QEMU in descriptions/messages

Browse Source 
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fiona Ebner 2022-12-20 10:23:32 +01:00
parent 9cdb3150f0
commit 7bd9abd243
6 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PVE/API2/Qemu.pm
View File

@ -2571,12 +2571,12 @@ __PACKAGE__->register_method({
type => 'object', type => 'object',
}, },
spice => { spice => {
description => "Qemu VGA configuration supports spice.", description => "QEMU VGA configuration supports spice.",
type => 'boolean', type => 'boolean',
optional => 1, optional => 1,
}, },
agent => { agent => {
description => "Qemu GuestAgent enabled in config.", description => "QEMU Guest Agent is enabled in config.",
type => 'boolean', type => 'boolean',
optional => 1, optional => 1,
}, },
@ -4601,7 +4601,7 @@ __PACKAGE__->register_method({
method => 'POST', method => 'POST',
protected => 1, protected => 1,
proxyto => 'node', proxyto => 'node',
description => "Execute Qemu monitor commands.", description => "Execute QEMU monitor commands.",
permissions => { permissions => {
description => "Sys.Modify is required for (sub)commands which are not read-only ('info *' and 'help')", description => "Sys.Modify is required for (sub)commands which are not read-only ('info *' and 'help')",
check => ['perm', '/vms/{vmid}', [ 'VM.Monitor' ]], check => ['perm', '/vms/{vmid}', [ 'VM.Monitor' ]],

6
PVE/API2/Qemu/Agent.pm
View File

@ -88,7 +88,7 @@ __PACKAGE__->register_method({
path => '', path => '',
proxyto => 'node', proxyto => 'node',
method => 'GET', method => 'GET',
description => "Qemu Agent command index.", description => "QEMU Guest Agent command index.",
permissions => { permissions => {
user => 'all', user => 'all',
}, },
@ -107,7 +107,7 @@ __PACKAGE__->register_method({
properties => {}, properties => {},
}, },
links => [ { rel => 'child', href => '{name}' } ], links => [ { rel => 'child', href => '{name}' } ],
description => "Returns the list of Qemu Agent commands", description => "Returns the list of QEMU Guest Agent commands",
}, },
code => sub { code => sub {
my ($param) = @_; my ($param) = @_;
@ -160,7 +160,7 @@ sub register_command {
}, },
}; };
my $description = "Execute Qemu Guest Agent commands."; my $description = "Execute QEMU Guest Agent commands.";
my $name = 'agent'; my $name = 'agent';
if ($command ne '') { if ($command ne '') {

4
PVE/CLI/qm.pm
View File

@ -488,7 +488,7 @@ __PACKAGE__->register_method ({
name => 'monitor', name => 'monitor',
path => 'monitor', path => 'monitor',
method => 'POST', method => 'POST',
description => "Enter Qemu Monitor interface.", description => "Enter QEMU Monitor interface.",
parameters => { parameters => {
additionalProperties => 0, additionalProperties => 0,
properties => { properties => {
@ -503,7 +503,7 @@ __PACKAGE__->register_method ({
my $conf = PVE::QemuConfig->load_config ($vmid); # check if VM exists my $conf = PVE::QemuConfig->load_config ($vmid); # check if VM exists
print "Entering Qemu Monitor for VM $vmid - type 'help' for help\n"; print "Entering QEMU Monitor for VM $vmid - type 'help' for help\n";
my $term = Term::ReadLine->new('qm'); my $term = Term::ReadLine->new('qm');

2
PVE/QMPClient.pm
View File

@ -12,7 +12,7 @@ use Time::HiRes qw(usleep gettimeofday tv_interval);
use PVE::IPCC; use PVE::IPCC;
use PVE::QemuServer::Helpers; use PVE::QemuServer::Helpers;
# Qemu Monitor Protocol (QMP) client. # QEMU Monitor Protocol (QMP) client.
# #
# This implementation uses IO::Multiplex (libio-multiplex-perl) and # This implementation uses IO::Multiplex (libio-multiplex-perl) and
# allows you to issue qmp and qga commands to different VMs in parallel. # allows you to issue qmp and qga commands to different VMs in parallel.

16
PVE/QemuServer.pm
View File

@ -116,7 +116,7 @@ PVE::JSONSchema::register_standard_option('pve-qm-stateuri', {
}); });
PVE::JSONSchema::register_standard_option('pve-qemu-machine', { PVE::JSONSchema::register_standard_option('pve-qemu-machine', {
description => "Specifies the Qemu machine type.", description => "Specifies the QEMU machine type.",
type => 'string', type => 'string',
pattern => '(pc|pc(-i440fx)?-\d+(\.\d+)+(\+pve\d+)?(\.pxe)?|q35|pc-q35-\d+(\.\d+)+(\+pve\d+)?(\.pxe)?|virt(?:-\d+(\.\d+)+)?(\+pve\d+)?)', pattern => '(pc|pc(-i440fx)?-\d+(\.\d+)+(\+pve\d+)?(\.pxe)?|q35|pc-q35-\d+(\.\d+)+(\+pve\d+)?(\.pxe)?|virt(?:-\d+(\.\d+)+)?(\+pve\d+)?)',
maxLength => 40, maxLength => 40,
@ -150,7 +150,7 @@ PVE::JSONSchema::register_format('pve-qm-watchdog', $watchdog_fmt);
my $agent_fmt = { my $agent_fmt = {
enabled => { enabled => {
description => "Enable/disable communication with a Qemu Guest Agent (QGA) running in the VM.", description => "Enable/disable communication with a QEMU Guest Agent (QGA) running in the VM.",
type => 'boolean', type => 'boolean',
default => 0, default => 0,
default_key => 1, default_key => 1,
@ -481,7 +481,7 @@ EODESC
}, },
agent => { agent => {
optional => 1, optional => 1,
description => "Enable/disable communication with the Qemu Guest Agent and its properties.", description => "Enable/disable communication with the QEMU Guest Agent and its properties.",
type => 'string', type => 'string',
format => $agent_fmt, format => $agent_fmt,
}, },
@ -2819,7 +2819,7 @@ sub vzlist {
our $vmstatus_return_properties = { our $vmstatus_return_properties = {
vmid => get_standard_option('pve-vmid'), vmid => get_standard_option('pve-vmid'),
status => { status => {
description => "Qemu process status.", description => "QEMU process status.",
type => 'string', type => 'string',
enum => ['stopped', 'running'], enum => ['stopped', 'running'],
}, },
@ -2841,7 +2841,7 @@ our $vmstatus_return_properties = {
optional => 1, optional => 1,
}, },
qmpstatus => { qmpstatus => {
description => "Qemu QMP agent status.", description => "QEMU QMP agent status.",
type => 'string', type => 'string',
optional => 1, optional => 1,
}, },
@ -3750,7 +3750,7 @@ sub config_to_command {
if ($path eq 'socket') { if ($path eq 'socket') {
my $socket = "/var/run/qemu-server/${vmid}.serial$i"; my $socket = "/var/run/qemu-server/${vmid}.serial$i";
push @$devices, '-chardev', "socket,id=serial$i,path=$socket,server=on,wait=off"; push @$devices, '-chardev', "socket,id=serial$i,path=$socket,server=on,wait=off";
# On aarch64, serial0 is the UART device. Qemu only allows # On aarch64, serial0 is the UART device. QEMU only allows
# connecting UART devices via the '-serial' command line, as # connecting UART devices via the '-serial' command line, as
# the device has a fixed slot on the hardware... # the device has a fixed slot on the hardware...
if ($arch eq 'aarch64' && $i == 0) { if ($arch eq 'aarch64' && $i == 0) {
@ -5624,7 +5624,7 @@ sub vm_start {
# statefile => 'tcp', 'unix' for migration or path/volid for RAM state # statefile => 'tcp', 'unix' for migration or path/volid for RAM state
# skiplock => 0/1, skip checking for config lock # skiplock => 0/1, skip checking for config lock
# skiptemplate => 0/1, skip checking whether VM is template # skiptemplate => 0/1, skip checking whether VM is template
# forcemachine => to force Qemu machine (rollback/migration) # forcemachine => to force QEMU machine (rollback/migration)
# forcecpu => a QEMU '-cpu' argument string to override get_cpu_options # forcecpu => a QEMU '-cpu' argument string to override get_cpu_options
# timeout => in seconds # timeout => in seconds
# paused => start VM in paused state (backup) # paused => start VM in paused state (backup)
@ -7552,7 +7552,7 @@ sub qga_check_running {
eval { mon_cmd($vmid, "guest-ping", timeout => 3); }; eval { mon_cmd($vmid, "guest-ping", timeout => 3); };
if ($@) { if ($@) {
warn "Qemu Guest Agent is not running - $@" if !$nowarn; warn "QEMU Guest Agent is not running - $@" if !$nowarn;
return 0; return 0;
} }
return 1; return 1;

2
test/snapshot-test.pm
View File

@ -559,7 +559,7 @@ printf("Expected error for snapshot_create when volume snapshot is not possible
testcase_create("202", "test", 0, "test comment", "volume snapshot disabled\n\n", { "local:snapshotable-disk-1" => "test" }, { "local:snapshotable-disk-1" => "test" }); testcase_create("202", "test", 0, "test comment", "volume snapshot disabled\n\n", { "local:snapshotable-disk-1" => "test" }, { "local:snapshotable-disk-1" => "test" });
$vm_mon->{savevm_start} = 0; $vm_mon->{savevm_start} = 0;
printf("Expected error for snapshot_create when Qemu mon command 'savevm-start' fails\n"); printf("Expected error for snapshot_create when QEMU mon command 'savevm-start' fails\n");
testcase_create("203", "test", 0, "test comment", "savevm-start disabled\n\n"); testcase_create("203", "test", 0, "test comment", "savevm-start disabled\n\n");
$vm_mon->{savevm_start} = 1; $vm_mon->{savevm_start} = 1;