From: Fiona Ebner Date: Tue, 20 Dec 2022 09:23:32 +0000 (+0100) Subject: tree-wide: switch to official spelling of QEMU in descriptions/messages X-Git-Url: https://git.proxmox.com/?p=qemu-server.git;a=commitdiff_plain;h=7bd9abd2436f864991f16b10429d873ae8624ae8 tree-wide: switch to official spelling of QEMU in descriptions/messages Signed-off-by: Fiona Ebner --- diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index badfc37..e2a420f 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -2571,12 +2571,12 @@ __PACKAGE__->register_method({ type => 'object', }, spice => { - description => "Qemu VGA configuration supports spice.", + description => "QEMU VGA configuration supports spice.", type => 'boolean', optional => 1, }, agent => { - description => "Qemu GuestAgent enabled in config.", + description => "QEMU Guest Agent is enabled in config.", type => 'boolean', optional => 1, }, @@ -4601,7 +4601,7 @@ __PACKAGE__->register_method({ method => 'POST', protected => 1, proxyto => 'node', - description => "Execute Qemu monitor commands.", + description => "Execute QEMU monitor commands.", permissions => { description => "Sys.Modify is required for (sub)commands which are not read-only ('info *' and 'help')", check => ['perm', '/vms/{vmid}', [ 'VM.Monitor' ]], diff --git a/PVE/API2/Qemu/Agent.pm b/PVE/API2/Qemu/Agent.pm index 7d35fe7..5ff1fa9 100644 --- a/PVE/API2/Qemu/Agent.pm +++ b/PVE/API2/Qemu/Agent.pm @@ -88,7 +88,7 @@ __PACKAGE__->register_method({ path => '', proxyto => 'node', method => 'GET', - description => "Qemu Agent command index.", + description => "QEMU Guest Agent command index.", permissions => { user => 'all', }, @@ -107,7 +107,7 @@ __PACKAGE__->register_method({ properties => {}, }, links => [ { rel => 'child', href => '{name}' } ], - description => "Returns the list of Qemu Agent commands", + description => "Returns the list of QEMU Guest Agent commands", }, code => sub { 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'; if ($command ne '') { diff --git a/PVE/CLI/qm.pm b/PVE/CLI/qm.pm index 3e0f128..c3c2982 100755 --- a/PVE/CLI/qm.pm +++ b/PVE/CLI/qm.pm @@ -488,7 +488,7 @@ __PACKAGE__->register_method ({ name => 'monitor', path => 'monitor', method => 'POST', - description => "Enter Qemu Monitor interface.", + description => "Enter QEMU Monitor interface.", parameters => { additionalProperties => 0, properties => { @@ -503,7 +503,7 @@ __PACKAGE__->register_method ({ 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'); diff --git a/PVE/QMPClient.pm b/PVE/QMPClient.pm index 9805c20..3bc5eaa 100644 --- a/PVE/QMPClient.pm +++ b/PVE/QMPClient.pm @@ -12,7 +12,7 @@ use Time::HiRes qw(usleep gettimeofday tv_interval); use PVE::IPCC; use PVE::QemuServer::Helpers; -# Qemu Monitor Protocol (QMP) client. +# QEMU Monitor Protocol (QMP) client. # # This implementation uses IO::Multiplex (libio-multiplex-perl) and # allows you to issue qmp and qga commands to different VMs in parallel. diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index dd6ea3e..39fc6b0 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -116,7 +116,7 @@ PVE::JSONSchema::register_standard_option('pve-qm-stateuri', { }); PVE::JSONSchema::register_standard_option('pve-qemu-machine', { - description => "Specifies the Qemu machine type.", + description => "Specifies the QEMU machine type.", type => 'string', pattern => '(pc|pc(-i440fx)?-\d+(\.\d+)+(\+pve\d+)?(\.pxe)?|q35|pc-q35-\d+(\.\d+)+(\+pve\d+)?(\.pxe)?|virt(?:-\d+(\.\d+)+)?(\+pve\d+)?)', maxLength => 40, @@ -150,7 +150,7 @@ PVE::JSONSchema::register_format('pve-qm-watchdog', $watchdog_fmt); my $agent_fmt = { 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', default => 0, default_key => 1, @@ -481,7 +481,7 @@ EODESC }, agent => { 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', format => $agent_fmt, }, @@ -2819,7 +2819,7 @@ sub vzlist { our $vmstatus_return_properties = { vmid => get_standard_option('pve-vmid'), status => { - description => "Qemu process status.", + description => "QEMU process status.", type => 'string', enum => ['stopped', 'running'], }, @@ -2841,7 +2841,7 @@ our $vmstatus_return_properties = { optional => 1, }, qmpstatus => { - description => "Qemu QMP agent status.", + description => "QEMU QMP agent status.", type => 'string', optional => 1, }, @@ -3750,7 +3750,7 @@ sub config_to_command { if ($path eq 'socket') { my $socket = "/var/run/qemu-server/${vmid}.serial$i"; 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 # the device has a fixed slot on the hardware... if ($arch eq 'aarch64' && $i == 0) { @@ -5624,7 +5624,7 @@ sub vm_start { # statefile => 'tcp', 'unix' for migration or path/volid for RAM state # skiplock => 0/1, skip checking for config lock # 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 # timeout => in seconds # paused => start VM in paused state (backup) @@ -7552,7 +7552,7 @@ sub qga_check_running { eval { mon_cmd($vmid, "guest-ping", timeout => 3); }; if ($@) { - warn "Qemu Guest Agent is not running - $@" if !$nowarn; + warn "QEMU Guest Agent is not running - $@" if !$nowarn; return 0; } return 1; diff --git a/test/snapshot-test.pm b/test/snapshot-test.pm index 3f1ac7c..d26b422 100644 --- a/test/snapshot-test.pm +++ b/test/snapshot-test.pm @@ -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" }); $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"); $vm_mon->{savevm_start} = 1;