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

add support for add-fd command

Browse Source 
We can now pass open file descriptors to qemu.
This commit is contained in:
Dietmar Maurer 2012-12-06 08:39:03 +01:00
parent 8afd0c622f
commit 558f16446e
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
PVE/QMPClient.pm
View File

@ -1,13 +1,13 @@
package PVE::QMPClient; package PVE::QMPClient;
use strict; use strict;
#use PVE::SafeSyslog;
use PVE::QemuServer; use PVE::QemuServer;
use IO::Multiplex; use IO::Multiplex;
use POSIX qw(EINTR EAGAIN); use POSIX qw(EINTR EAGAIN);
use JSON; use JSON;
use Time::HiRes qw(usleep gettimeofday tv_interval); use Time::HiRes qw(usleep gettimeofday tv_interval);
use Scalar::Util qw(weaken); use Scalar::Util qw(weaken);
use PVE::IPCC;
use Data::Dumper; use Data::Dumper;
@ -82,6 +82,8 @@ sub cmd {
$timeout = 60; # note: cdrom mount command is slow $timeout = 60; # note: cdrom mount command is slow
} elsif ($cmd->{execute} eq 'savevm-start' || } elsif ($cmd->{execute} eq 'savevm-start' ||
$cmd->{execute} eq 'savevm-end' || $cmd->{execute} eq 'savevm-end' ||
$cmd->{execute} eq 'query-backup' ||
$cmd->{execute} eq 'backup_cancel' ||
$cmd->{execute} eq 'query-savevm' || $cmd->{execute} eq 'query-savevm' ||
$cmd->{execute} eq 'delete-drive-snapshot' || $cmd->{execute} eq 'delete-drive-snapshot' ||
$cmd->{execute} eq 'snapshot-drive' ) { $cmd->{execute} eq 'snapshot-drive' ) {
@ -178,12 +180,23 @@ my $check_queue = sub {
my $cmd = $self->{current}->{$vmid} = shift @{$self->{queue}->{$vmid}}; my $cmd = $self->{current}->{$vmid} = shift @{$self->{queue}->{$vmid}};
$cmd->{id} = &$next_cmdid(); $cmd->{id} = &$next_cmdid();
my $fd = -1;
if ($cmd->{execute} eq 'add-fd') {
$fd = $cmd->{arguments}->{fd};
delete $cmd->{arguments}->{fd};
}
my $qmpcmd = to_json({ my $qmpcmd = to_json({
execute => $cmd->{execute}, execute => $cmd->{execute},
arguments => $cmd->{arguments}, arguments => $cmd->{arguments},
id => $cmd->{id}}); id => $cmd->{id}});
if ($fd >= 0) {
my $ret = PVE::IPCC::sendfd(fileno($fh), $fd, $qmpcmd);
die "sendfd failed" if $ret < 0;
} else {
$self->{mux}->write($fh, $qmpcmd); $self->{mux}->write($fh, $qmpcmd);
}
}; };
if (my $err = $@) { if (my $err = $@) {
$self->{errors}->{$vmid} = $err; $self->{errors}->{$vmid} = $err;