2009-10-09 18:07:55 +00:00
|
|
|
/*
|
|
|
|
* qemu_monitor.c: interaction with QEMU monitor console
|
|
|
|
*
|
|
|
|
* Copyright (C) 2006-2009 Red Hat, Inc.
|
|
|
|
* Copyright (C) 2006 Daniel P. Berrange
|
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* Lesser General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
|
|
* License along with this library; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
*
|
|
|
|
* Author: Daniel P. Berrange <berrange@redhat.com>
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
|
|
|
|
#include <poll.h>
|
|
|
|
#include <sys/un.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
#include <fcntl.h>
|
|
|
|
|
|
|
|
#include "qemu_monitor.h"
|
2009-10-09 20:13:06 +00:00
|
|
|
#include "qemu_monitor_text.h"
|
2009-11-03 18:59:18 +00:00
|
|
|
#include "qemu_monitor_json.h"
|
2009-10-09 18:07:55 +00:00
|
|
|
#include "qemu_conf.h"
|
|
|
|
#include "event.h"
|
|
|
|
#include "virterror_internal.h"
|
2009-10-09 19:13:29 +00:00
|
|
|
#include "memory.h"
|
|
|
|
#include "logging.h"
|
2009-10-09 18:07:55 +00:00
|
|
|
|
|
|
|
#define VIR_FROM_THIS VIR_FROM_QEMU
|
|
|
|
|
2009-12-08 18:05:02 +00:00
|
|
|
#define QEMU_DEBUG_RAW_IO 0
|
|
|
|
|
2009-10-09 19:13:29 +00:00
|
|
|
struct _qemuMonitor {
|
2009-10-13 14:27:58 +00:00
|
|
|
virMutex lock;
|
Fully asynchronous monitor I/O processing
Change the QEMU monitor file handle watch to poll for both
read & write events, as well as EOF. All I/O to/from the
QEMU monitor FD is now done in the event callback thread.
When the QEMU driver needs to send a command, it puts the
data to be sent into a qemuMonitorMessagePtr object instance,
queues it for dispatch, and then goes to sleep on a condition
variable. The event thread sends all the data, and then waits
for the reply to arrive, putting the response / error data
back into the qemuMonitorMessagePtr and notifying the condition
variable.
There is a temporary hack in the disk passphrase callback to
avoid acquiring the domain lock. This avoids a deadlock in
the command processing, since the domain lock is still held
when running monitor commands. The next commit will remove
the locking when running commands & thus allow re-introduction
of locking the disk passphrase callback
* src/qemu/qemu_driver.c: Temporarily don't acquire lock in
disk passphrase callback. To be reverted in next commit
* src/qemu/qemu_monitor.c, src/qemu/qemu_monitor.h: Remove
raw I/O functions, and a generic qemuMonitorSend() for
invoking a command
* src/qemu/qemu_monitor_text.c, src/qemu/qemu_monitor_text.h:
Remove all low level I/O, and use the new qemuMonitorSend()
API. Provide a qemuMonitorTextIOProcess() method for detecting
command/reply/prompt boundaries in the monitor data stream
2009-10-14 17:40:51 +00:00
|
|
|
virCond notify;
|
|
|
|
|
2009-11-26 13:29:29 +00:00
|
|
|
int refs;
|
2009-10-13 14:27:58 +00:00
|
|
|
|
2009-10-09 19:13:29 +00:00
|
|
|
int fd;
|
|
|
|
int watch;
|
|
|
|
int hasSendFD;
|
|
|
|
|
|
|
|
virDomainObjPtr vm;
|
|
|
|
|
2009-10-15 17:56:52 +00:00
|
|
|
qemuMonitorCallbacksPtr cb;
|
Fully asynchronous monitor I/O processing
Change the QEMU monitor file handle watch to poll for both
read & write events, as well as EOF. All I/O to/from the
QEMU monitor FD is now done in the event callback thread.
When the QEMU driver needs to send a command, it puts the
data to be sent into a qemuMonitorMessagePtr object instance,
queues it for dispatch, and then goes to sleep on a condition
variable. The event thread sends all the data, and then waits
for the reply to arrive, putting the response / error data
back into the qemuMonitorMessagePtr and notifying the condition
variable.
There is a temporary hack in the disk passphrase callback to
avoid acquiring the domain lock. This avoids a deadlock in
the command processing, since the domain lock is still held
when running monitor commands. The next commit will remove
the locking when running commands & thus allow re-introduction
of locking the disk passphrase callback
* src/qemu/qemu_driver.c: Temporarily don't acquire lock in
disk passphrase callback. To be reverted in next commit
* src/qemu/qemu_monitor.c, src/qemu/qemu_monitor.h: Remove
raw I/O functions, and a generic qemuMonitorSend() for
invoking a command
* src/qemu/qemu_monitor_text.c, src/qemu/qemu_monitor_text.h:
Remove all low level I/O, and use the new qemuMonitorSend()
API. Provide a qemuMonitorTextIOProcess() method for detecting
command/reply/prompt boundaries in the monitor data stream
2009-10-14 17:40:51 +00:00
|
|
|
|
|
|
|
/* If there's a command being processed this will be
|
|
|
|
* non-NULL */
|
|
|
|
qemuMonitorMessagePtr msg;
|
|
|
|
|
|
|
|
/* Buffer incoming data ready for Text/QMP monitor
|
|
|
|
* code to process & find message boundaries */
|
|
|
|
size_t bufferOffset;
|
|
|
|
size_t bufferLength;
|
|
|
|
char *buffer;
|
|
|
|
|
|
|
|
/* If anything went wrong, this will be fed back
|
|
|
|
* the next monitor msg */
|
|
|
|
int lastErrno;
|
|
|
|
|
2009-11-26 13:29:29 +00:00
|
|
|
/* If the monitor EOF callback is currently active (stops more commands being run) */
|
Fully asynchronous monitor I/O processing
Change the QEMU monitor file handle watch to poll for both
read & write events, as well as EOF. All I/O to/from the
QEMU monitor FD is now done in the event callback thread.
When the QEMU driver needs to send a command, it puts the
data to be sent into a qemuMonitorMessagePtr object instance,
queues it for dispatch, and then goes to sleep on a condition
variable. The event thread sends all the data, and then waits
for the reply to arrive, putting the response / error data
back into the qemuMonitorMessagePtr and notifying the condition
variable.
There is a temporary hack in the disk passphrase callback to
avoid acquiring the domain lock. This avoids a deadlock in
the command processing, since the domain lock is still held
when running monitor commands. The next commit will remove
the locking when running commands & thus allow re-introduction
of locking the disk passphrase callback
* src/qemu/qemu_driver.c: Temporarily don't acquire lock in
disk passphrase callback. To be reverted in next commit
* src/qemu/qemu_monitor.c, src/qemu/qemu_monitor.h: Remove
raw I/O functions, and a generic qemuMonitorSend() for
invoking a command
* src/qemu/qemu_monitor_text.c, src/qemu/qemu_monitor_text.h:
Remove all low level I/O, and use the new qemuMonitorSend()
API. Provide a qemuMonitorTextIOProcess() method for detecting
command/reply/prompt boundaries in the monitor data stream
2009-10-14 17:40:51 +00:00
|
|
|
unsigned eofcb: 1;
|
2009-11-26 13:29:29 +00:00
|
|
|
/* If the monitor is in process of shutting down */
|
Fully asynchronous monitor I/O processing
Change the QEMU monitor file handle watch to poll for both
read & write events, as well as EOF. All I/O to/from the
QEMU monitor FD is now done in the event callback thread.
When the QEMU driver needs to send a command, it puts the
data to be sent into a qemuMonitorMessagePtr object instance,
queues it for dispatch, and then goes to sleep on a condition
variable. The event thread sends all the data, and then waits
for the reply to arrive, putting the response / error data
back into the qemuMonitorMessagePtr and notifying the condition
variable.
There is a temporary hack in the disk passphrase callback to
avoid acquiring the domain lock. This avoids a deadlock in
the command processing, since the domain lock is still held
when running monitor commands. The next commit will remove
the locking when running commands & thus allow re-introduction
of locking the disk passphrase callback
* src/qemu/qemu_driver.c: Temporarily don't acquire lock in
disk passphrase callback. To be reverted in next commit
* src/qemu/qemu_monitor.c, src/qemu/qemu_monitor.h: Remove
raw I/O functions, and a generic qemuMonitorSend() for
invoking a command
* src/qemu/qemu_monitor_text.c, src/qemu/qemu_monitor_text.h:
Remove all low level I/O, and use the new qemuMonitorSend()
API. Provide a qemuMonitorTextIOProcess() method for detecting
command/reply/prompt boundaries in the monitor data stream
2009-10-14 17:40:51 +00:00
|
|
|
unsigned closed: 1;
|
2009-11-26 13:29:29 +00:00
|
|
|
|
2009-11-03 18:59:18 +00:00
|
|
|
unsigned json: 1;
|
2009-10-09 19:13:29 +00:00
|
|
|
};
|
|
|
|
|
2009-11-26 13:29:29 +00:00
|
|
|
|
2009-11-26 13:37:11 +00:00
|
|
|
VIR_ENUM_IMPL(qemuMonitorMigrationStatus,
|
|
|
|
QEMU_MONITOR_MIGRATION_STATUS_LAST,
|
|
|
|
"inactive", "active", "completed", "failed", "cancelled")
|
|
|
|
|
|
|
|
static char *qemuMonitorEscape(const char *in, int shell)
|
|
|
|
{
|
|
|
|
int len = 0;
|
|
|
|
int i, j;
|
|
|
|
char *out;
|
|
|
|
|
|
|
|
/* To pass through the QEMU monitor, we need to use escape
|
|
|
|
sequences: \r, \n, \", \\
|
|
|
|
|
|
|
|
To pass through both QEMU + the shell, we need to escape
|
|
|
|
the single character ' as the five characters '\\''
|
|
|
|
*/
|
|
|
|
|
|
|
|
for (i = 0; in[i] != '\0'; i++) {
|
|
|
|
switch(in[i]) {
|
|
|
|
case '\r':
|
|
|
|
case '\n':
|
|
|
|
case '"':
|
|
|
|
case '\\':
|
|
|
|
len += 2;
|
|
|
|
break;
|
|
|
|
case '\'':
|
|
|
|
if (shell)
|
|
|
|
len += 5;
|
|
|
|
else
|
|
|
|
len += 1;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
len += 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (VIR_ALLOC_N(out, len + 1) < 0)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
for (i = j = 0; in[i] != '\0'; i++) {
|
|
|
|
switch(in[i]) {
|
|
|
|
case '\r':
|
|
|
|
out[j++] = '\\';
|
|
|
|
out[j++] = 'r';
|
|
|
|
break;
|
|
|
|
case '\n':
|
|
|
|
out[j++] = '\\';
|
|
|
|
out[j++] = 'n';
|
|
|
|
break;
|
|
|
|
case '"':
|
|
|
|
case '\\':
|
|
|
|
out[j++] = '\\';
|
|
|
|
out[j++] = in[i];
|
|
|
|
break;
|
|
|
|
case '\'':
|
|
|
|
if (shell) {
|
|
|
|
out[j++] = '\'';
|
|
|
|
out[j++] = '\\';
|
|
|
|
out[j++] = '\\';
|
|
|
|
out[j++] = '\'';
|
|
|
|
out[j++] = '\'';
|
|
|
|
} else {
|
|
|
|
out[j++] = in[i];
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
out[j++] = in[i];
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
out[j] = '\0';
|
|
|
|
|
|
|
|
return out;
|
|
|
|
}
|
|
|
|
|
|
|
|
char *qemuMonitorEscapeArg(const char *in)
|
|
|
|
{
|
|
|
|
return qemuMonitorEscape(in, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
char *qemuMonitorEscapeShell(const char *in)
|
|
|
|
{
|
|
|
|
return qemuMonitorEscape(in, 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-12-08 18:05:02 +00:00
|
|
|
#if QEMU_DEBUG_RAW_IO
|
|
|
|
#include <c-ctype.h>
|
|
|
|
static char * qemuMonitorEscapeNonPrintable(const char *text)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
virBuffer buf = VIR_BUFFER_INITIALIZER;
|
|
|
|
for (i = 0 ; text[i] != '\0' ; i++) {
|
|
|
|
if (c_isprint(text[i]) ||
|
|
|
|
text[i] == '\n' ||
|
|
|
|
(text[i] == '\r' && text[i+1] == '\n'))
|
|
|
|
virBufferVSprintf(&buf,"%c", text[i]);
|
|
|
|
else
|
|
|
|
virBufferVSprintf(&buf, "0x%02x", text[i]);
|
|
|
|
}
|
|
|
|
return virBufferContentAndReset(&buf);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2009-10-13 14:27:58 +00:00
|
|
|
void qemuMonitorLock(qemuMonitorPtr mon)
|
|
|
|
{
|
|
|
|
virMutexLock(&mon->lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
void qemuMonitorUnlock(qemuMonitorPtr mon)
|
|
|
|
{
|
|
|
|
virMutexUnlock(&mon->lock);
|
|
|
|
}
|
|
|
|
|
2009-10-09 18:07:55 +00:00
|
|
|
|
2009-11-26 13:29:29 +00:00
|
|
|
static void qemuMonitorFree(qemuMonitorPtr mon)
|
2009-10-09 18:07:55 +00:00
|
|
|
{
|
2009-11-26 13:29:29 +00:00
|
|
|
VIR_DEBUG("mon=%p", mon);
|
Fully asynchronous monitor I/O processing
Change the QEMU monitor file handle watch to poll for both
read & write events, as well as EOF. All I/O to/from the
QEMU monitor FD is now done in the event callback thread.
When the QEMU driver needs to send a command, it puts the
data to be sent into a qemuMonitorMessagePtr object instance,
queues it for dispatch, and then goes to sleep on a condition
variable. The event thread sends all the data, and then waits
for the reply to arrive, putting the response / error data
back into the qemuMonitorMessagePtr and notifying the condition
variable.
There is a temporary hack in the disk passphrase callback to
avoid acquiring the domain lock. This avoids a deadlock in
the command processing, since the domain lock is still held
when running monitor commands. The next commit will remove
the locking when running commands & thus allow re-introduction
of locking the disk passphrase callback
* src/qemu/qemu_driver.c: Temporarily don't acquire lock in
disk passphrase callback. To be reverted in next commit
* src/qemu/qemu_monitor.c, src/qemu/qemu_monitor.h: Remove
raw I/O functions, and a generic qemuMonitorSend() for
invoking a command
* src/qemu/qemu_monitor_text.c, src/qemu/qemu_monitor_text.h:
Remove all low level I/O, and use the new qemuMonitorSend()
API. Provide a qemuMonitorTextIOProcess() method for detecting
command/reply/prompt boundaries in the monitor data stream
2009-10-14 17:40:51 +00:00
|
|
|
if (virCondDestroy(&mon->notify) < 0)
|
|
|
|
{}
|
|
|
|
virMutexDestroy(&mon->lock);
|
|
|
|
VIR_FREE(mon);
|
2009-10-09 18:07:55 +00:00
|
|
|
}
|
|
|
|
|
2009-11-26 13:29:29 +00:00
|
|
|
int qemuMonitorRef(qemuMonitorPtr mon)
|
|
|
|
{
|
|
|
|
mon->refs++;
|
|
|
|
return mon->refs;
|
|
|
|
}
|
|
|
|
|
|
|
|
int qemuMonitorUnref(qemuMonitorPtr mon)
|
|
|
|
{
|
|
|
|
mon->refs--;
|
|
|
|
|
|
|
|
if (mon->refs == 0) {
|
|
|
|
qemuMonitorUnlock(mon);
|
|
|
|
qemuMonitorFree(mon);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return mon->refs;
|
|
|
|
}
|
|
|
|
|
2009-10-09 18:07:55 +00:00
|
|
|
|
|
|
|
static int
|
Fully asynchronous monitor I/O processing
Change the QEMU monitor file handle watch to poll for both
read & write events, as well as EOF. All I/O to/from the
QEMU monitor FD is now done in the event callback thread.
When the QEMU driver needs to send a command, it puts the
data to be sent into a qemuMonitorMessagePtr object instance,
queues it for dispatch, and then goes to sleep on a condition
variable. The event thread sends all the data, and then waits
for the reply to arrive, putting the response / error data
back into the qemuMonitorMessagePtr and notifying the condition
variable.
There is a temporary hack in the disk passphrase callback to
avoid acquiring the domain lock. This avoids a deadlock in
the command processing, since the domain lock is still held
when running monitor commands. The next commit will remove
the locking when running commands & thus allow re-introduction
of locking the disk passphrase callback
* src/qemu/qemu_driver.c: Temporarily don't acquire lock in
disk passphrase callback. To be reverted in next commit
* src/qemu/qemu_monitor.c, src/qemu/qemu_monitor.h: Remove
raw I/O functions, and a generic qemuMonitorSend() for
invoking a command
* src/qemu/qemu_monitor_text.c, src/qemu/qemu_monitor_text.h:
Remove all low level I/O, and use the new qemuMonitorSend()
API. Provide a qemuMonitorTextIOProcess() method for detecting
command/reply/prompt boundaries in the monitor data stream
2009-10-14 17:40:51 +00:00
|
|
|
qemuMonitorOpenUnix(const char *monitor)
|
2009-10-09 18:07:55 +00:00
|
|
|
{
|
|
|
|
struct sockaddr_un addr;
|
|
|
|
int monfd;
|
|
|
|
int timeout = 3; /* In seconds */
|
|
|
|
int ret, i = 0;
|
|
|
|
|
|
|
|
if ((monfd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) {
|
2010-02-04 20:02:58 +00:00
|
|
|
virReportSystemError(errno,
|
2009-10-09 18:07:55 +00:00
|
|
|
"%s", _("failed to create socket"));
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
memset(&addr, 0, sizeof(addr));
|
|
|
|
addr.sun_family = AF_UNIX;
|
|
|
|
if (virStrcpyStatic(addr.sun_path, monitor) == NULL) {
|
|
|
|
qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("Monitor path %s too big for destination"), monitor);
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
do {
|
|
|
|
ret = connect(monfd, (struct sockaddr *) &addr, sizeof(addr));
|
|
|
|
|
|
|
|
if (ret == 0)
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (errno == ENOENT || errno == ECONNREFUSED) {
|
|
|
|
/* ENOENT : Socket may not have shown up yet
|
|
|
|
* ECONNREFUSED : Leftover socket hasn't been removed yet */
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2010-02-04 20:02:58 +00:00
|
|
|
virReportSystemError(errno, "%s",
|
2009-10-09 18:07:55 +00:00
|
|
|
_("failed to connect to monitor socket"));
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
} while ((++i <= timeout*5) && (usleep(.2 * 1000000) <= 0));
|
|
|
|
|
|
|
|
if (ret != 0) {
|
2010-02-04 20:02:58 +00:00
|
|
|
virReportSystemError(errno, "%s",
|
2009-10-09 18:07:55 +00:00
|
|
|
_("monitor socket did not show up."));
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
2009-10-09 19:13:29 +00:00
|
|
|
return monfd;
|
2009-10-09 18:07:55 +00:00
|
|
|
|
|
|
|
error:
|
|
|
|
close(monfd);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
Fully asynchronous monitor I/O processing
Change the QEMU monitor file handle watch to poll for both
read & write events, as well as EOF. All I/O to/from the
QEMU monitor FD is now done in the event callback thread.
When the QEMU driver needs to send a command, it puts the
data to be sent into a qemuMonitorMessagePtr object instance,
queues it for dispatch, and then goes to sleep on a condition
variable. The event thread sends all the data, and then waits
for the reply to arrive, putting the response / error data
back into the qemuMonitorMessagePtr and notifying the condition
variable.
There is a temporary hack in the disk passphrase callback to
avoid acquiring the domain lock. This avoids a deadlock in
the command processing, since the domain lock is still held
when running monitor commands. The next commit will remove
the locking when running commands & thus allow re-introduction
of locking the disk passphrase callback
* src/qemu/qemu_driver.c: Temporarily don't acquire lock in
disk passphrase callback. To be reverted in next commit
* src/qemu/qemu_monitor.c, src/qemu/qemu_monitor.h: Remove
raw I/O functions, and a generic qemuMonitorSend() for
invoking a command
* src/qemu/qemu_monitor_text.c, src/qemu/qemu_monitor_text.h:
Remove all low level I/O, and use the new qemuMonitorSend()
API. Provide a qemuMonitorTextIOProcess() method for detecting
command/reply/prompt boundaries in the monitor data stream
2009-10-14 17:40:51 +00:00
|
|
|
qemuMonitorOpenPty(const char *monitor)
|
2009-10-09 18:07:55 +00:00
|
|
|
{
|
|
|
|
int monfd;
|
|
|
|
|
|
|
|
if ((monfd = open(monitor, O_RDWR)) < 0) {
|
|
|
|
qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("Unable to open monitor path %s"), monitor);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2009-10-09 19:13:29 +00:00
|
|
|
return monfd;
|
Fully asynchronous monitor I/O processing
Change the QEMU monitor file handle watch to poll for both
read & write events, as well as EOF. All I/O to/from the
QEMU monitor FD is now done in the event callback thread.
When the QEMU driver needs to send a command, it puts the
data to be sent into a qemuMonitorMessagePtr object instance,
queues it for dispatch, and then goes to sleep on a condition
variable. The event thread sends all the data, and then waits
for the reply to arrive, putting the response / error data
back into the qemuMonitorMessagePtr and notifying the condition
variable.
There is a temporary hack in the disk passphrase callback to
avoid acquiring the domain lock. This avoids a deadlock in
the command processing, since the domain lock is still held
when running monitor commands. The next commit will remove
the locking when running commands & thus allow re-introduction
of locking the disk passphrase callback
* src/qemu/qemu_driver.c: Temporarily don't acquire lock in
disk passphrase callback. To be reverted in next commit
* src/qemu/qemu_monitor.c, src/qemu/qemu_monitor.h: Remove
raw I/O functions, and a generic qemuMonitorSend() for
invoking a command
* src/qemu/qemu_monitor_text.c, src/qemu/qemu_monitor_text.h:
Remove all low level I/O, and use the new qemuMonitorSend()
API. Provide a qemuMonitorTextIOProcess() method for detecting
command/reply/prompt boundaries in the monitor data stream
2009-10-14 17:40:51 +00:00
|
|
|
}
|
2009-10-09 18:07:55 +00:00
|
|
|
|
Fully asynchronous monitor I/O processing
Change the QEMU monitor file handle watch to poll for both
read & write events, as well as EOF. All I/O to/from the
QEMU monitor FD is now done in the event callback thread.
When the QEMU driver needs to send a command, it puts the
data to be sent into a qemuMonitorMessagePtr object instance,
queues it for dispatch, and then goes to sleep on a condition
variable. The event thread sends all the data, and then waits
for the reply to arrive, putting the response / error data
back into the qemuMonitorMessagePtr and notifying the condition
variable.
There is a temporary hack in the disk passphrase callback to
avoid acquiring the domain lock. This avoids a deadlock in
the command processing, since the domain lock is still held
when running monitor commands. The next commit will remove
the locking when running commands & thus allow re-introduction
of locking the disk passphrase callback
* src/qemu/qemu_driver.c: Temporarily don't acquire lock in
disk passphrase callback. To be reverted in next commit
* src/qemu/qemu_monitor.c, src/qemu/qemu_monitor.h: Remove
raw I/O functions, and a generic qemuMonitorSend() for
invoking a command
* src/qemu/qemu_monitor_text.c, src/qemu/qemu_monitor_text.h:
Remove all low level I/O, and use the new qemuMonitorSend()
API. Provide a qemuMonitorTextIOProcess() method for detecting
command/reply/prompt boundaries in the monitor data stream
2009-10-14 17:40:51 +00:00
|
|
|
|
|
|
|
static int
|
|
|
|
qemuMonitorIOProcess(qemuMonitorPtr mon)
|
|
|
|
{
|
|
|
|
int len;
|
|
|
|
qemuMonitorMessagePtr msg = NULL;
|
|
|
|
|
|
|
|
/* See if there's a message & whether its ready for its reply
|
|
|
|
* ie whether its completed writing all its data */
|
|
|
|
if (mon->msg && mon->msg->txOffset == mon->msg->txLength)
|
|
|
|
msg = mon->msg;
|
|
|
|
|
2009-12-08 18:05:02 +00:00
|
|
|
#if QEMU_DEBUG_RAW_IO
|
|
|
|
char *str1 = qemuMonitorEscapeNonPrintable(msg ? msg->txBuffer : "");
|
|
|
|
char *str2 = qemuMonitorEscapeNonPrintable(mon->buffer);
|
|
|
|
VIR_ERROR("Process %d %p %p [[[[%s]]][[[%s]]]", (int)mon->bufferOffset, mon->msg, msg, str1, str2);
|
|
|
|
VIR_FREE(str1);
|
|
|
|
VIR_FREE(str2);
|
|
|
|
#else
|
2009-11-11 10:30:01 +00:00
|
|
|
VIR_DEBUG("Process %d", (int)mon->bufferOffset);
|
2009-12-08 18:05:02 +00:00
|
|
|
#endif
|
2009-11-03 18:59:18 +00:00
|
|
|
if (mon->json)
|
|
|
|
len = qemuMonitorJSONIOProcess(mon,
|
|
|
|
mon->buffer, mon->bufferOffset,
|
|
|
|
msg);
|
|
|
|
else
|
|
|
|
len = qemuMonitorTextIOProcess(mon,
|
|
|
|
mon->buffer, mon->bufferOffset,
|
|
|
|
msg);
|
Fully asynchronous monitor I/O processing
Change the QEMU monitor file handle watch to poll for both
read & write events, as well as EOF. All I/O to/from the
QEMU monitor FD is now done in the event callback thread.
When the QEMU driver needs to send a command, it puts the
data to be sent into a qemuMonitorMessagePtr object instance,
queues it for dispatch, and then goes to sleep on a condition
variable. The event thread sends all the data, and then waits
for the reply to arrive, putting the response / error data
back into the qemuMonitorMessagePtr and notifying the condition
variable.
There is a temporary hack in the disk passphrase callback to
avoid acquiring the domain lock. This avoids a deadlock in
the command processing, since the domain lock is still held
when running monitor commands. The next commit will remove
the locking when running commands & thus allow re-introduction
of locking the disk passphrase callback
* src/qemu/qemu_driver.c: Temporarily don't acquire lock in
disk passphrase callback. To be reverted in next commit
* src/qemu/qemu_monitor.c, src/qemu/qemu_monitor.h: Remove
raw I/O functions, and a generic qemuMonitorSend() for
invoking a command
* src/qemu/qemu_monitor_text.c, src/qemu/qemu_monitor_text.h:
Remove all low level I/O, and use the new qemuMonitorSend()
API. Provide a qemuMonitorTextIOProcess() method for detecting
command/reply/prompt boundaries in the monitor data stream
2009-10-14 17:40:51 +00:00
|
|
|
|
|
|
|
if (len < 0) {
|
|
|
|
mon->lastErrno = errno;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (len < mon->bufferOffset) {
|
|
|
|
memmove(mon->buffer, mon->buffer + len, mon->bufferOffset - len);
|
|
|
|
mon->bufferOffset -= len;
|
|
|
|
} else {
|
|
|
|
VIR_FREE(mon->buffer);
|
|
|
|
mon->bufferOffset = mon->bufferLength = 0;
|
|
|
|
}
|
2009-11-11 10:30:01 +00:00
|
|
|
VIR_DEBUG("Process done %d used %d", (int)mon->bufferOffset, len);
|
Fully asynchronous monitor I/O processing
Change the QEMU monitor file handle watch to poll for both
read & write events, as well as EOF. All I/O to/from the
QEMU monitor FD is now done in the event callback thread.
When the QEMU driver needs to send a command, it puts the
data to be sent into a qemuMonitorMessagePtr object instance,
queues it for dispatch, and then goes to sleep on a condition
variable. The event thread sends all the data, and then waits
for the reply to arrive, putting the response / error data
back into the qemuMonitorMessagePtr and notifying the condition
variable.
There is a temporary hack in the disk passphrase callback to
avoid acquiring the domain lock. This avoids a deadlock in
the command processing, since the domain lock is still held
when running monitor commands. The next commit will remove
the locking when running commands & thus allow re-introduction
of locking the disk passphrase callback
* src/qemu/qemu_driver.c: Temporarily don't acquire lock in
disk passphrase callback. To be reverted in next commit
* src/qemu/qemu_monitor.c, src/qemu/qemu_monitor.h: Remove
raw I/O functions, and a generic qemuMonitorSend() for
invoking a command
* src/qemu/qemu_monitor_text.c, src/qemu/qemu_monitor_text.h:
Remove all low level I/O, and use the new qemuMonitorSend()
API. Provide a qemuMonitorTextIOProcess() method for detecting
command/reply/prompt boundaries in the monitor data stream
2009-10-14 17:40:51 +00:00
|
|
|
if (msg && msg->finished)
|
|
|
|
virCondBroadcast(&mon->notify);
|
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
qemuMonitorIOWriteWithFD(qemuMonitorPtr mon,
|
|
|
|
const char *data,
|
|
|
|
size_t len,
|
|
|
|
int fd)
|
|
|
|
{
|
|
|
|
struct msghdr msg;
|
|
|
|
struct iovec iov[1];
|
|
|
|
int ret;
|
|
|
|
char control[CMSG_SPACE(sizeof(int))];
|
|
|
|
struct cmsghdr *cmsg;
|
|
|
|
|
|
|
|
if (!mon->hasSendFD) {
|
|
|
|
errno = EINVAL;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
memset(&msg, 0, sizeof(msg));
|
|
|
|
|
|
|
|
iov[0].iov_base = (void *)data;
|
|
|
|
iov[0].iov_len = len;
|
|
|
|
|
|
|
|
msg.msg_iov = iov;
|
|
|
|
msg.msg_iovlen = 1;
|
|
|
|
|
|
|
|
msg.msg_control = control;
|
|
|
|
msg.msg_controllen = sizeof(control);
|
|
|
|
|
|
|
|
cmsg = CMSG_FIRSTHDR(&msg);
|
|
|
|
cmsg->cmsg_len = CMSG_LEN(sizeof(int));
|
|
|
|
cmsg->cmsg_level = SOL_SOCKET;
|
|
|
|
cmsg->cmsg_type = SCM_RIGHTS;
|
|
|
|
memcpy(CMSG_DATA(cmsg), &fd, sizeof(int));
|
|
|
|
|
|
|
|
do {
|
|
|
|
ret = sendmsg(mon->fd, &msg, 0);
|
|
|
|
} while (ret < 0 && errno == EINTR);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Called when the monitor is able to write data */
|
|
|
|
static int
|
|
|
|
qemuMonitorIOWrite(qemuMonitorPtr mon)
|
|
|
|
{
|
|
|
|
int done;
|
|
|
|
|
|
|
|
/* If no active message, or fully transmitted, the no-op */
|
|
|
|
if (!mon->msg || mon->msg->txOffset == mon->msg->txLength)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (mon->msg->txFD == -1)
|
|
|
|
done = write(mon->fd,
|
|
|
|
mon->msg->txBuffer + mon->msg->txOffset,
|
|
|
|
mon->msg->txLength - mon->msg->txOffset);
|
|
|
|
else
|
|
|
|
done = qemuMonitorIOWriteWithFD(mon,
|
|
|
|
mon->msg->txBuffer + mon->msg->txOffset,
|
|
|
|
mon->msg->txLength - mon->msg->txOffset,
|
|
|
|
mon->msg->txFD);
|
|
|
|
|
|
|
|
if (done < 0) {
|
|
|
|
if (errno == EAGAIN)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
mon->lastErrno = errno;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
mon->msg->txOffset += done;
|
|
|
|
return done;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Called when the monitor has incoming data to read
|
|
|
|
*
|
|
|
|
* Returns -1 on error, or number of bytes read
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
qemuMonitorIORead(qemuMonitorPtr mon)
|
|
|
|
{
|
|
|
|
size_t avail = mon->bufferLength - mon->bufferOffset;
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
if (avail < 1024) {
|
|
|
|
if (VIR_REALLOC_N(mon->buffer,
|
|
|
|
mon->bufferLength + 1024) < 0) {
|
|
|
|
errno = ENOMEM;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
mon->bufferLength += 1024;
|
|
|
|
avail += 1024;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Read as much as we can get into our buffer,
|
|
|
|
until we block on EAGAIN, or hit EOF */
|
|
|
|
while (avail > 1) {
|
|
|
|
int got;
|
|
|
|
got = read(mon->fd,
|
|
|
|
mon->buffer + mon->bufferOffset,
|
|
|
|
avail - 1);
|
|
|
|
if (got < 0) {
|
|
|
|
if (errno == EAGAIN)
|
|
|
|
break;
|
|
|
|
mon->lastErrno = errno;
|
|
|
|
ret = -1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (got == 0)
|
|
|
|
break;
|
|
|
|
|
|
|
|
ret += got;
|
|
|
|
avail -= got;
|
|
|
|
mon->bufferOffset += got;
|
|
|
|
mon->buffer[mon->bufferOffset] = '\0';
|
|
|
|
}
|
|
|
|
|
2009-11-11 10:30:01 +00:00
|
|
|
VIR_DEBUG("Now read %d bytes of data", (int)mon->bufferOffset);
|
Fully asynchronous monitor I/O processing
Change the QEMU monitor file handle watch to poll for both
read & write events, as well as EOF. All I/O to/from the
QEMU monitor FD is now done in the event callback thread.
When the QEMU driver needs to send a command, it puts the
data to be sent into a qemuMonitorMessagePtr object instance,
queues it for dispatch, and then goes to sleep on a condition
variable. The event thread sends all the data, and then waits
for the reply to arrive, putting the response / error data
back into the qemuMonitorMessagePtr and notifying the condition
variable.
There is a temporary hack in the disk passphrase callback to
avoid acquiring the domain lock. This avoids a deadlock in
the command processing, since the domain lock is still held
when running monitor commands. The next commit will remove
the locking when running commands & thus allow re-introduction
of locking the disk passphrase callback
* src/qemu/qemu_driver.c: Temporarily don't acquire lock in
disk passphrase callback. To be reverted in next commit
* src/qemu/qemu_monitor.c, src/qemu/qemu_monitor.h: Remove
raw I/O functions, and a generic qemuMonitorSend() for
invoking a command
* src/qemu/qemu_monitor_text.c, src/qemu/qemu_monitor_text.h:
Remove all low level I/O, and use the new qemuMonitorSend()
API. Provide a qemuMonitorTextIOProcess() method for detecting
command/reply/prompt boundaries in the monitor data stream
2009-10-14 17:40:51 +00:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void qemuMonitorUpdateWatch(qemuMonitorPtr mon)
|
|
|
|
{
|
|
|
|
int events =
|
|
|
|
VIR_EVENT_HANDLE_HANGUP |
|
|
|
|
VIR_EVENT_HANDLE_ERROR;
|
|
|
|
|
|
|
|
if (!mon->lastErrno) {
|
|
|
|
events |= VIR_EVENT_HANDLE_READABLE;
|
|
|
|
|
|
|
|
if (mon->msg && mon->msg->txOffset < mon->msg->txLength)
|
|
|
|
events |= VIR_EVENT_HANDLE_WRITABLE;
|
|
|
|
}
|
|
|
|
|
|
|
|
virEventUpdateHandle(mon->watch, events);
|
2009-10-09 18:07:55 +00:00
|
|
|
}
|
|
|
|
|
2009-10-09 19:13:29 +00:00
|
|
|
|
|
|
|
static void
|
|
|
|
qemuMonitorIO(int watch, int fd, int events, void *opaque) {
|
|
|
|
qemuMonitorPtr mon = opaque;
|
|
|
|
int quit = 0, failed = 0;
|
|
|
|
|
Fully asynchronous monitor I/O processing
Change the QEMU monitor file handle watch to poll for both
read & write events, as well as EOF. All I/O to/from the
QEMU monitor FD is now done in the event callback thread.
When the QEMU driver needs to send a command, it puts the
data to be sent into a qemuMonitorMessagePtr object instance,
queues it for dispatch, and then goes to sleep on a condition
variable. The event thread sends all the data, and then waits
for the reply to arrive, putting the response / error data
back into the qemuMonitorMessagePtr and notifying the condition
variable.
There is a temporary hack in the disk passphrase callback to
avoid acquiring the domain lock. This avoids a deadlock in
the command processing, since the domain lock is still held
when running monitor commands. The next commit will remove
the locking when running commands & thus allow re-introduction
of locking the disk passphrase callback
* src/qemu/qemu_driver.c: Temporarily don't acquire lock in
disk passphrase callback. To be reverted in next commit
* src/qemu/qemu_monitor.c, src/qemu/qemu_monitor.h: Remove
raw I/O functions, and a generic qemuMonitorSend() for
invoking a command
* src/qemu/qemu_monitor_text.c, src/qemu/qemu_monitor_text.h:
Remove all low level I/O, and use the new qemuMonitorSend()
API. Provide a qemuMonitorTextIOProcess() method for detecting
command/reply/prompt boundaries in the monitor data stream
2009-10-14 17:40:51 +00:00
|
|
|
qemuMonitorLock(mon);
|
2009-11-26 13:29:29 +00:00
|
|
|
qemuMonitorRef(mon);
|
Fully asynchronous monitor I/O processing
Change the QEMU monitor file handle watch to poll for both
read & write events, as well as EOF. All I/O to/from the
QEMU monitor FD is now done in the event callback thread.
When the QEMU driver needs to send a command, it puts the
data to be sent into a qemuMonitorMessagePtr object instance,
queues it for dispatch, and then goes to sleep on a condition
variable. The event thread sends all the data, and then waits
for the reply to arrive, putting the response / error data
back into the qemuMonitorMessagePtr and notifying the condition
variable.
There is a temporary hack in the disk passphrase callback to
avoid acquiring the domain lock. This avoids a deadlock in
the command processing, since the domain lock is still held
when running monitor commands. The next commit will remove
the locking when running commands & thus allow re-introduction
of locking the disk passphrase callback
* src/qemu/qemu_driver.c: Temporarily don't acquire lock in
disk passphrase callback. To be reverted in next commit
* src/qemu/qemu_monitor.c, src/qemu/qemu_monitor.h: Remove
raw I/O functions, and a generic qemuMonitorSend() for
invoking a command
* src/qemu/qemu_monitor_text.c, src/qemu/qemu_monitor_text.h:
Remove all low level I/O, and use the new qemuMonitorSend()
API. Provide a qemuMonitorTextIOProcess() method for detecting
command/reply/prompt boundaries in the monitor data stream
2009-10-14 17:40:51 +00:00
|
|
|
VIR_DEBUG("Monitor %p I/O on watch %d fd %d events %d", mon, watch, fd, events);
|
|
|
|
|
2009-10-09 19:13:29 +00:00
|
|
|
if (mon->fd != fd || mon->watch != watch) {
|
Fully asynchronous monitor I/O processing
Change the QEMU monitor file handle watch to poll for both
read & write events, as well as EOF. All I/O to/from the
QEMU monitor FD is now done in the event callback thread.
When the QEMU driver needs to send a command, it puts the
data to be sent into a qemuMonitorMessagePtr object instance,
queues it for dispatch, and then goes to sleep on a condition
variable. The event thread sends all the data, and then waits
for the reply to arrive, putting the response / error data
back into the qemuMonitorMessagePtr and notifying the condition
variable.
There is a temporary hack in the disk passphrase callback to
avoid acquiring the domain lock. This avoids a deadlock in
the command processing, since the domain lock is still held
when running monitor commands. The next commit will remove
the locking when running commands & thus allow re-introduction
of locking the disk passphrase callback
* src/qemu/qemu_driver.c: Temporarily don't acquire lock in
disk passphrase callback. To be reverted in next commit
* src/qemu/qemu_monitor.c, src/qemu/qemu_monitor.h: Remove
raw I/O functions, and a generic qemuMonitorSend() for
invoking a command
* src/qemu/qemu_monitor_text.c, src/qemu/qemu_monitor_text.h:
Remove all low level I/O, and use the new qemuMonitorSend()
API. Provide a qemuMonitorTextIOProcess() method for detecting
command/reply/prompt boundaries in the monitor data stream
2009-10-14 17:40:51 +00:00
|
|
|
VIR_ERROR("event from unexpected fd %d!=%d / watch %d!=%d", mon->fd, fd, mon->watch, watch);
|
2009-10-09 19:13:29 +00:00
|
|
|
failed = 1;
|
|
|
|
} else {
|
Fully asynchronous monitor I/O processing
Change the QEMU monitor file handle watch to poll for both
read & write events, as well as EOF. All I/O to/from the
QEMU monitor FD is now done in the event callback thread.
When the QEMU driver needs to send a command, it puts the
data to be sent into a qemuMonitorMessagePtr object instance,
queues it for dispatch, and then goes to sleep on a condition
variable. The event thread sends all the data, and then waits
for the reply to arrive, putting the response / error data
back into the qemuMonitorMessagePtr and notifying the condition
variable.
There is a temporary hack in the disk passphrase callback to
avoid acquiring the domain lock. This avoids a deadlock in
the command processing, since the domain lock is still held
when running monitor commands. The next commit will remove
the locking when running commands & thus allow re-introduction
of locking the disk passphrase callback
* src/qemu/qemu_driver.c: Temporarily don't acquire lock in
disk passphrase callback. To be reverted in next commit
* src/qemu/qemu_monitor.c, src/qemu/qemu_monitor.h: Remove
raw I/O functions, and a generic qemuMonitorSend() for
invoking a command
* src/qemu/qemu_monitor_text.c, src/qemu/qemu_monitor_text.h:
Remove all low level I/O, and use the new qemuMonitorSend()
API. Provide a qemuMonitorTextIOProcess() method for detecting
command/reply/prompt boundaries in the monitor data stream
2009-10-14 17:40:51 +00:00
|
|
|
if (!mon->lastErrno &&
|
|
|
|
events & VIR_EVENT_HANDLE_WRITABLE) {
|
|
|
|
int done = qemuMonitorIOWrite(mon);
|
|
|
|
if (done < 0)
|
|
|
|
failed = 1;
|
|
|
|
events &= ~VIR_EVENT_HANDLE_WRITABLE;
|
|
|
|
}
|
|
|
|
if (!mon->lastErrno &&
|
|
|
|
events & VIR_EVENT_HANDLE_READABLE) {
|
|
|
|
int got = qemuMonitorIORead(mon);
|
|
|
|
if (got < 0)
|
|
|
|
failed = 1;
|
|
|
|
/* Ignore hangup/error events if we read some data, to
|
|
|
|
* give time for that data to be consumed */
|
|
|
|
if (got > 0) {
|
|
|
|
events = 0;
|
|
|
|
|
|
|
|
if (qemuMonitorIOProcess(mon) < 0)
|
|
|
|
failed = 1;
|
|
|
|
} else
|
|
|
|
events &= ~VIR_EVENT_HANDLE_READABLE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If IO process resulted in an error & we have a message,
|
|
|
|
* then wakeup that waiter */
|
|
|
|
if (mon->lastErrno && mon->msg && !mon->msg->finished) {
|
|
|
|
mon->msg->lastErrno = mon->lastErrno;
|
|
|
|
mon->msg->finished = 1;
|
|
|
|
virCondSignal(&mon->notify);
|
|
|
|
}
|
|
|
|
|
|
|
|
qemuMonitorUpdateWatch(mon);
|
|
|
|
|
|
|
|
if (events & VIR_EVENT_HANDLE_HANGUP) {
|
|
|
|
/* If IO process resulted in EOF & we have a message,
|
|
|
|
* then wakeup that waiter */
|
|
|
|
if (mon->msg && !mon->msg->finished) {
|
|
|
|
mon->msg->finished = 1;
|
|
|
|
mon->msg->lastErrno = EIO;
|
|
|
|
virCondSignal(&mon->notify);
|
|
|
|
}
|
2009-10-09 19:13:29 +00:00
|
|
|
quit = 1;
|
Fully asynchronous monitor I/O processing
Change the QEMU monitor file handle watch to poll for both
read & write events, as well as EOF. All I/O to/from the
QEMU monitor FD is now done in the event callback thread.
When the QEMU driver needs to send a command, it puts the
data to be sent into a qemuMonitorMessagePtr object instance,
queues it for dispatch, and then goes to sleep on a condition
variable. The event thread sends all the data, and then waits
for the reply to arrive, putting the response / error data
back into the qemuMonitorMessagePtr and notifying the condition
variable.
There is a temporary hack in the disk passphrase callback to
avoid acquiring the domain lock. This avoids a deadlock in
the command processing, since the domain lock is still held
when running monitor commands. The next commit will remove
the locking when running commands & thus allow re-introduction
of locking the disk passphrase callback
* src/qemu/qemu_driver.c: Temporarily don't acquire lock in
disk passphrase callback. To be reverted in next commit
* src/qemu/qemu_monitor.c, src/qemu/qemu_monitor.h: Remove
raw I/O functions, and a generic qemuMonitorSend() for
invoking a command
* src/qemu/qemu_monitor_text.c, src/qemu/qemu_monitor_text.h:
Remove all low level I/O, and use the new qemuMonitorSend()
API. Provide a qemuMonitorTextIOProcess() method for detecting
command/reply/prompt boundaries in the monitor data stream
2009-10-14 17:40:51 +00:00
|
|
|
} else if (events) {
|
2009-10-09 19:13:29 +00:00
|
|
|
VIR_ERROR(_("unhandled fd event %d for monitor fd %d"),
|
|
|
|
events, mon->fd);
|
|
|
|
failed = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Fully asynchronous monitor I/O processing
Change the QEMU monitor file handle watch to poll for both
read & write events, as well as EOF. All I/O to/from the
QEMU monitor FD is now done in the event callback thread.
When the QEMU driver needs to send a command, it puts the
data to be sent into a qemuMonitorMessagePtr object instance,
queues it for dispatch, and then goes to sleep on a condition
variable. The event thread sends all the data, and then waits
for the reply to arrive, putting the response / error data
back into the qemuMonitorMessagePtr and notifying the condition
variable.
There is a temporary hack in the disk passphrase callback to
avoid acquiring the domain lock. This avoids a deadlock in
the command processing, since the domain lock is still held
when running monitor commands. The next commit will remove
the locking when running commands & thus allow re-introduction
of locking the disk passphrase callback
* src/qemu/qemu_driver.c: Temporarily don't acquire lock in
disk passphrase callback. To be reverted in next commit
* src/qemu/qemu_monitor.c, src/qemu/qemu_monitor.h: Remove
raw I/O functions, and a generic qemuMonitorSend() for
invoking a command
* src/qemu/qemu_monitor_text.c, src/qemu/qemu_monitor_text.h:
Remove all low level I/O, and use the new qemuMonitorSend()
API. Provide a qemuMonitorTextIOProcess() method for detecting
command/reply/prompt boundaries in the monitor data stream
2009-10-14 17:40:51 +00:00
|
|
|
/* We have to unlock to avoid deadlock against command thread,
|
|
|
|
* but is this safe ? I think it is, because the callback
|
|
|
|
* will try to acquire the virDomainObjPtr mutex next */
|
|
|
|
if (failed || quit) {
|
2009-10-15 17:56:52 +00:00
|
|
|
void (*eofNotify)(qemuMonitorPtr, virDomainObjPtr, int)
|
|
|
|
= mon->cb->eofNotify;
|
2009-11-26 13:29:29 +00:00
|
|
|
virDomainObjPtr vm = mon->vm;
|
Fully asynchronous monitor I/O processing
Change the QEMU monitor file handle watch to poll for both
read & write events, as well as EOF. All I/O to/from the
QEMU monitor FD is now done in the event callback thread.
When the QEMU driver needs to send a command, it puts the
data to be sent into a qemuMonitorMessagePtr object instance,
queues it for dispatch, and then goes to sleep on a condition
variable. The event thread sends all the data, and then waits
for the reply to arrive, putting the response / error data
back into the qemuMonitorMessagePtr and notifying the condition
variable.
There is a temporary hack in the disk passphrase callback to
avoid acquiring the domain lock. This avoids a deadlock in
the command processing, since the domain lock is still held
when running monitor commands. The next commit will remove
the locking when running commands & thus allow re-introduction
of locking the disk passphrase callback
* src/qemu/qemu_driver.c: Temporarily don't acquire lock in
disk passphrase callback. To be reverted in next commit
* src/qemu/qemu_monitor.c, src/qemu/qemu_monitor.h: Remove
raw I/O functions, and a generic qemuMonitorSend() for
invoking a command
* src/qemu/qemu_monitor_text.c, src/qemu/qemu_monitor_text.h:
Remove all low level I/O, and use the new qemuMonitorSend()
API. Provide a qemuMonitorTextIOProcess() method for detecting
command/reply/prompt boundaries in the monitor data stream
2009-10-14 17:40:51 +00:00
|
|
|
/* Make sure anyone waiting wakes up now */
|
|
|
|
virCondSignal(&mon->notify);
|
2009-11-26 13:29:29 +00:00
|
|
|
if (qemuMonitorUnref(mon) > 0)
|
Fully asynchronous monitor I/O processing
Change the QEMU monitor file handle watch to poll for both
read & write events, as well as EOF. All I/O to/from the
QEMU monitor FD is now done in the event callback thread.
When the QEMU driver needs to send a command, it puts the
data to be sent into a qemuMonitorMessagePtr object instance,
queues it for dispatch, and then goes to sleep on a condition
variable. The event thread sends all the data, and then waits
for the reply to arrive, putting the response / error data
back into the qemuMonitorMessagePtr and notifying the condition
variable.
There is a temporary hack in the disk passphrase callback to
avoid acquiring the domain lock. This avoids a deadlock in
the command processing, since the domain lock is still held
when running monitor commands. The next commit will remove
the locking when running commands & thus allow re-introduction
of locking the disk passphrase callback
* src/qemu/qemu_driver.c: Temporarily don't acquire lock in
disk passphrase callback. To be reverted in next commit
* src/qemu/qemu_monitor.c, src/qemu/qemu_monitor.h: Remove
raw I/O functions, and a generic qemuMonitorSend() for
invoking a command
* src/qemu/qemu_monitor_text.c, src/qemu/qemu_monitor_text.h:
Remove all low level I/O, and use the new qemuMonitorSend()
API. Provide a qemuMonitorTextIOProcess() method for detecting
command/reply/prompt boundaries in the monitor data stream
2009-10-14 17:40:51 +00:00
|
|
|
qemuMonitorUnlock(mon);
|
2009-11-26 13:29:29 +00:00
|
|
|
VIR_DEBUG("Triggering EOF callback error? %d", failed);
|
2009-10-15 17:56:52 +00:00
|
|
|
(eofNotify)(mon, vm, failed);
|
Fully asynchronous monitor I/O processing
Change the QEMU monitor file handle watch to poll for both
read & write events, as well as EOF. All I/O to/from the
QEMU monitor FD is now done in the event callback thread.
When the QEMU driver needs to send a command, it puts the
data to be sent into a qemuMonitorMessagePtr object instance,
queues it for dispatch, and then goes to sleep on a condition
variable. The event thread sends all the data, and then waits
for the reply to arrive, putting the response / error data
back into the qemuMonitorMessagePtr and notifying the condition
variable.
There is a temporary hack in the disk passphrase callback to
avoid acquiring the domain lock. This avoids a deadlock in
the command processing, since the domain lock is still held
when running monitor commands. The next commit will remove
the locking when running commands & thus allow re-introduction
of locking the disk passphrase callback
* src/qemu/qemu_driver.c: Temporarily don't acquire lock in
disk passphrase callback. To be reverted in next commit
* src/qemu/qemu_monitor.c, src/qemu/qemu_monitor.h: Remove
raw I/O functions, and a generic qemuMonitorSend() for
invoking a command
* src/qemu/qemu_monitor_text.c, src/qemu/qemu_monitor_text.h:
Remove all low level I/O, and use the new qemuMonitorSend()
API. Provide a qemuMonitorTextIOProcess() method for detecting
command/reply/prompt boundaries in the monitor data stream
2009-10-14 17:40:51 +00:00
|
|
|
} else {
|
2009-11-26 13:29:29 +00:00
|
|
|
if (qemuMonitorUnref(mon) > 0)
|
|
|
|
qemuMonitorUnlock(mon);
|
Fully asynchronous monitor I/O processing
Change the QEMU monitor file handle watch to poll for both
read & write events, as well as EOF. All I/O to/from the
QEMU monitor FD is now done in the event callback thread.
When the QEMU driver needs to send a command, it puts the
data to be sent into a qemuMonitorMessagePtr object instance,
queues it for dispatch, and then goes to sleep on a condition
variable. The event thread sends all the data, and then waits
for the reply to arrive, putting the response / error data
back into the qemuMonitorMessagePtr and notifying the condition
variable.
There is a temporary hack in the disk passphrase callback to
avoid acquiring the domain lock. This avoids a deadlock in
the command processing, since the domain lock is still held
when running monitor commands. The next commit will remove
the locking when running commands & thus allow re-introduction
of locking the disk passphrase callback
* src/qemu/qemu_driver.c: Temporarily don't acquire lock in
disk passphrase callback. To be reverted in next commit
* src/qemu/qemu_monitor.c, src/qemu/qemu_monitor.h: Remove
raw I/O functions, and a generic qemuMonitorSend() for
invoking a command
* src/qemu/qemu_monitor_text.c, src/qemu/qemu_monitor_text.h:
Remove all low level I/O, and use the new qemuMonitorSend()
API. Provide a qemuMonitorTextIOProcess() method for detecting
command/reply/prompt boundaries in the monitor data stream
2009-10-14 17:40:51 +00:00
|
|
|
}
|
2009-10-09 19:13:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
qemuMonitorPtr
|
2009-10-09 18:07:55 +00:00
|
|
|
qemuMonitorOpen(virDomainObjPtr vm,
|
2009-11-26 17:57:00 +00:00
|
|
|
virDomainChrDefPtr config,
|
2009-11-03 18:59:18 +00:00
|
|
|
int json,
|
2009-10-15 17:56:52 +00:00
|
|
|
qemuMonitorCallbacksPtr cb)
|
2009-10-09 18:07:55 +00:00
|
|
|
{
|
2009-10-09 19:13:29 +00:00
|
|
|
qemuMonitorPtr mon;
|
|
|
|
|
2009-10-15 17:56:52 +00:00
|
|
|
if (!cb || !cb->eofNotify) {
|
|
|
|
qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s",
|
|
|
|
_("EOF notify callback must be supplied"));
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2009-10-09 19:13:29 +00:00
|
|
|
if (VIR_ALLOC(mon) < 0) {
|
2010-02-04 18:19:08 +00:00
|
|
|
virReportOOMError();
|
2009-10-09 19:13:29 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2009-10-13 14:27:58 +00:00
|
|
|
if (virMutexInit(&mon->lock) < 0) {
|
|
|
|
qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s",
|
|
|
|
_("cannot initialize monitor mutex"));
|
|
|
|
VIR_FREE(mon);
|
|
|
|
return NULL;
|
|
|
|
}
|
Fully asynchronous monitor I/O processing
Change the QEMU monitor file handle watch to poll for both
read & write events, as well as EOF. All I/O to/from the
QEMU monitor FD is now done in the event callback thread.
When the QEMU driver needs to send a command, it puts the
data to be sent into a qemuMonitorMessagePtr object instance,
queues it for dispatch, and then goes to sleep on a condition
variable. The event thread sends all the data, and then waits
for the reply to arrive, putting the response / error data
back into the qemuMonitorMessagePtr and notifying the condition
variable.
There is a temporary hack in the disk passphrase callback to
avoid acquiring the domain lock. This avoids a deadlock in
the command processing, since the domain lock is still held
when running monitor commands. The next commit will remove
the locking when running commands & thus allow re-introduction
of locking the disk passphrase callback
* src/qemu/qemu_driver.c: Temporarily don't acquire lock in
disk passphrase callback. To be reverted in next commit
* src/qemu/qemu_monitor.c, src/qemu/qemu_monitor.h: Remove
raw I/O functions, and a generic qemuMonitorSend() for
invoking a command
* src/qemu/qemu_monitor_text.c, src/qemu/qemu_monitor_text.h:
Remove all low level I/O, and use the new qemuMonitorSend()
API. Provide a qemuMonitorTextIOProcess() method for detecting
command/reply/prompt boundaries in the monitor data stream
2009-10-14 17:40:51 +00:00
|
|
|
if (virCondInit(&mon->notify) < 0) {
|
|
|
|
qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s",
|
|
|
|
_("cannot initialize monitor condition"));
|
|
|
|
virMutexDestroy(&mon->lock);
|
|
|
|
VIR_FREE(mon);
|
|
|
|
return NULL;
|
|
|
|
}
|
2009-10-09 19:13:29 +00:00
|
|
|
mon->fd = -1;
|
2009-11-26 13:29:29 +00:00
|
|
|
mon->refs = 1;
|
2009-10-09 19:13:29 +00:00
|
|
|
mon->vm = vm;
|
2009-11-03 18:59:18 +00:00
|
|
|
mon->json = json;
|
2009-10-15 17:56:52 +00:00
|
|
|
mon->cb = cb;
|
Fully asynchronous monitor I/O processing
Change the QEMU monitor file handle watch to poll for both
read & write events, as well as EOF. All I/O to/from the
QEMU monitor FD is now done in the event callback thread.
When the QEMU driver needs to send a command, it puts the
data to be sent into a qemuMonitorMessagePtr object instance,
queues it for dispatch, and then goes to sleep on a condition
variable. The event thread sends all the data, and then waits
for the reply to arrive, putting the response / error data
back into the qemuMonitorMessagePtr and notifying the condition
variable.
There is a temporary hack in the disk passphrase callback to
avoid acquiring the domain lock. This avoids a deadlock in
the command processing, since the domain lock is still held
when running monitor commands. The next commit will remove
the locking when running commands & thus allow re-introduction
of locking the disk passphrase callback
* src/qemu/qemu_driver.c: Temporarily don't acquire lock in
disk passphrase callback. To be reverted in next commit
* src/qemu/qemu_monitor.c, src/qemu/qemu_monitor.h: Remove
raw I/O functions, and a generic qemuMonitorSend() for
invoking a command
* src/qemu/qemu_monitor_text.c, src/qemu/qemu_monitor_text.h:
Remove all low level I/O, and use the new qemuMonitorSend()
API. Provide a qemuMonitorTextIOProcess() method for detecting
command/reply/prompt boundaries in the monitor data stream
2009-10-14 17:40:51 +00:00
|
|
|
qemuMonitorLock(mon);
|
2009-10-09 19:13:29 +00:00
|
|
|
|
2009-11-26 17:57:00 +00:00
|
|
|
switch (config->type) {
|
2009-10-09 18:07:55 +00:00
|
|
|
case VIR_DOMAIN_CHR_TYPE_UNIX:
|
2009-10-09 19:13:29 +00:00
|
|
|
mon->hasSendFD = 1;
|
2009-11-26 17:57:00 +00:00
|
|
|
mon->fd = qemuMonitorOpenUnix(config->data.nix.path);
|
2009-10-09 19:13:29 +00:00
|
|
|
break;
|
|
|
|
|
2009-10-09 18:07:55 +00:00
|
|
|
case VIR_DOMAIN_CHR_TYPE_PTY:
|
2009-11-26 17:57:00 +00:00
|
|
|
mon->fd = qemuMonitorOpenPty(config->data.file.path);
|
2009-10-09 19:13:29 +00:00
|
|
|
break;
|
|
|
|
|
2009-10-09 18:07:55 +00:00
|
|
|
default:
|
|
|
|
qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("unable to handle monitor type: %s"),
|
2009-11-26 17:57:00 +00:00
|
|
|
virDomainChrTypeToString(config->type));
|
2009-10-09 19:13:29 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
2009-11-12 10:33:30 +00:00
|
|
|
if (mon->fd == -1) goto cleanup;
|
|
|
|
|
Fully asynchronous monitor I/O processing
Change the QEMU monitor file handle watch to poll for both
read & write events, as well as EOF. All I/O to/from the
QEMU monitor FD is now done in the event callback thread.
When the QEMU driver needs to send a command, it puts the
data to be sent into a qemuMonitorMessagePtr object instance,
queues it for dispatch, and then goes to sleep on a condition
variable. The event thread sends all the data, and then waits
for the reply to arrive, putting the response / error data
back into the qemuMonitorMessagePtr and notifying the condition
variable.
There is a temporary hack in the disk passphrase callback to
avoid acquiring the domain lock. This avoids a deadlock in
the command processing, since the domain lock is still held
when running monitor commands. The next commit will remove
the locking when running commands & thus allow re-introduction
of locking the disk passphrase callback
* src/qemu/qemu_driver.c: Temporarily don't acquire lock in
disk passphrase callback. To be reverted in next commit
* src/qemu/qemu_monitor.c, src/qemu/qemu_monitor.h: Remove
raw I/O functions, and a generic qemuMonitorSend() for
invoking a command
* src/qemu/qemu_monitor_text.c, src/qemu/qemu_monitor_text.h:
Remove all low level I/O, and use the new qemuMonitorSend()
API. Provide a qemuMonitorTextIOProcess() method for detecting
command/reply/prompt boundaries in the monitor data stream
2009-10-14 17:40:51 +00:00
|
|
|
if (virSetCloseExec(mon->fd) < 0) {
|
|
|
|
qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
"%s", _("Unable to set monitor close-on-exec flag"));
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
if (virSetNonBlock(mon->fd) < 0) {
|
|
|
|
qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
"%s", _("Unable to put monitor into non-blocking mode"));
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-10-09 19:13:29 +00:00
|
|
|
if ((mon->watch = virEventAddHandle(mon->fd,
|
Fully asynchronous monitor I/O processing
Change the QEMU monitor file handle watch to poll for both
read & write events, as well as EOF. All I/O to/from the
QEMU monitor FD is now done in the event callback thread.
When the QEMU driver needs to send a command, it puts the
data to be sent into a qemuMonitorMessagePtr object instance,
queues it for dispatch, and then goes to sleep on a condition
variable. The event thread sends all the data, and then waits
for the reply to arrive, putting the response / error data
back into the qemuMonitorMessagePtr and notifying the condition
variable.
There is a temporary hack in the disk passphrase callback to
avoid acquiring the domain lock. This avoids a deadlock in
the command processing, since the domain lock is still held
when running monitor commands. The next commit will remove
the locking when running commands & thus allow re-introduction
of locking the disk passphrase callback
* src/qemu/qemu_driver.c: Temporarily don't acquire lock in
disk passphrase callback. To be reverted in next commit
* src/qemu/qemu_monitor.c, src/qemu/qemu_monitor.h: Remove
raw I/O functions, and a generic qemuMonitorSend() for
invoking a command
* src/qemu/qemu_monitor_text.c, src/qemu/qemu_monitor_text.h:
Remove all low level I/O, and use the new qemuMonitorSend()
API. Provide a qemuMonitorTextIOProcess() method for detecting
command/reply/prompt boundaries in the monitor data stream
2009-10-14 17:40:51 +00:00
|
|
|
VIR_EVENT_HANDLE_HANGUP |
|
|
|
|
VIR_EVENT_HANDLE_ERROR |
|
|
|
|
VIR_EVENT_HANDLE_READABLE,
|
2009-10-09 19:13:29 +00:00
|
|
|
qemuMonitorIO,
|
|
|
|
mon, NULL)) < 0) {
|
|
|
|
qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s",
|
|
|
|
_("unable to register monitor events"));
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
Fully asynchronous monitor I/O processing
Change the QEMU monitor file handle watch to poll for both
read & write events, as well as EOF. All I/O to/from the
QEMU monitor FD is now done in the event callback thread.
When the QEMU driver needs to send a command, it puts the
data to be sent into a qemuMonitorMessagePtr object instance,
queues it for dispatch, and then goes to sleep on a condition
variable. The event thread sends all the data, and then waits
for the reply to arrive, putting the response / error data
back into the qemuMonitorMessagePtr and notifying the condition
variable.
There is a temporary hack in the disk passphrase callback to
avoid acquiring the domain lock. This avoids a deadlock in
the command processing, since the domain lock is still held
when running monitor commands. The next commit will remove
the locking when running commands & thus allow re-introduction
of locking the disk passphrase callback
* src/qemu/qemu_driver.c: Temporarily don't acquire lock in
disk passphrase callback. To be reverted in next commit
* src/qemu/qemu_monitor.c, src/qemu/qemu_monitor.h: Remove
raw I/O functions, and a generic qemuMonitorSend() for
invoking a command
* src/qemu/qemu_monitor_text.c, src/qemu/qemu_monitor_text.h:
Remove all low level I/O, and use the new qemuMonitorSend()
API. Provide a qemuMonitorTextIOProcess() method for detecting
command/reply/prompt boundaries in the monitor data stream
2009-10-14 17:40:51 +00:00
|
|
|
VIR_DEBUG("New mon %p fd =%d watch=%d", mon, mon->fd, mon->watch);
|
|
|
|
qemuMonitorUnlock(mon);
|
2009-10-09 19:34:24 +00:00
|
|
|
|
2009-10-09 19:13:29 +00:00
|
|
|
return mon;
|
|
|
|
|
|
|
|
cleanup:
|
Fully asynchronous monitor I/O processing
Change the QEMU monitor file handle watch to poll for both
read & write events, as well as EOF. All I/O to/from the
QEMU monitor FD is now done in the event callback thread.
When the QEMU driver needs to send a command, it puts the
data to be sent into a qemuMonitorMessagePtr object instance,
queues it for dispatch, and then goes to sleep on a condition
variable. The event thread sends all the data, and then waits
for the reply to arrive, putting the response / error data
back into the qemuMonitorMessagePtr and notifying the condition
variable.
There is a temporary hack in the disk passphrase callback to
avoid acquiring the domain lock. This avoids a deadlock in
the command processing, since the domain lock is still held
when running monitor commands. The next commit will remove
the locking when running commands & thus allow re-introduction
of locking the disk passphrase callback
* src/qemu/qemu_driver.c: Temporarily don't acquire lock in
disk passphrase callback. To be reverted in next commit
* src/qemu/qemu_monitor.c, src/qemu/qemu_monitor.h: Remove
raw I/O functions, and a generic qemuMonitorSend() for
invoking a command
* src/qemu/qemu_monitor_text.c, src/qemu/qemu_monitor_text.h:
Remove all low level I/O, and use the new qemuMonitorSend()
API. Provide a qemuMonitorTextIOProcess() method for detecting
command/reply/prompt boundaries in the monitor data stream
2009-10-14 17:40:51 +00:00
|
|
|
qemuMonitorUnlock(mon);
|
2009-10-09 19:13:29 +00:00
|
|
|
qemuMonitorClose(mon);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-11-26 13:29:29 +00:00
|
|
|
int qemuMonitorClose(qemuMonitorPtr mon)
|
2009-10-09 19:13:29 +00:00
|
|
|
{
|
2009-11-26 13:29:29 +00:00
|
|
|
int refs;
|
|
|
|
|
2009-10-09 19:13:29 +00:00
|
|
|
if (!mon)
|
2009-11-26 13:29:29 +00:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
VIR_DEBUG("mon=%p", mon);
|
2009-10-09 19:13:29 +00:00
|
|
|
|
Fully asynchronous monitor I/O processing
Change the QEMU monitor file handle watch to poll for both
read & write events, as well as EOF. All I/O to/from the
QEMU monitor FD is now done in the event callback thread.
When the QEMU driver needs to send a command, it puts the
data to be sent into a qemuMonitorMessagePtr object instance,
queues it for dispatch, and then goes to sleep on a condition
variable. The event thread sends all the data, and then waits
for the reply to arrive, putting the response / error data
back into the qemuMonitorMessagePtr and notifying the condition
variable.
There is a temporary hack in the disk passphrase callback to
avoid acquiring the domain lock. This avoids a deadlock in
the command processing, since the domain lock is still held
when running monitor commands. The next commit will remove
the locking when running commands & thus allow re-introduction
of locking the disk passphrase callback
* src/qemu/qemu_driver.c: Temporarily don't acquire lock in
disk passphrase callback. To be reverted in next commit
* src/qemu/qemu_monitor.c, src/qemu/qemu_monitor.h: Remove
raw I/O functions, and a generic qemuMonitorSend() for
invoking a command
* src/qemu/qemu_monitor_text.c, src/qemu/qemu_monitor_text.h:
Remove all low level I/O, and use the new qemuMonitorSend()
API. Provide a qemuMonitorTextIOProcess() method for detecting
command/reply/prompt boundaries in the monitor data stream
2009-10-14 17:40:51 +00:00
|
|
|
qemuMonitorLock(mon);
|
|
|
|
if (!mon->closed) {
|
|
|
|
if (mon->watch)
|
|
|
|
virEventRemoveHandle(mon->watch);
|
|
|
|
if (mon->fd != -1)
|
|
|
|
close(mon->fd);
|
2009-11-26 13:29:29 +00:00
|
|
|
/* NB: ordinarily one might immediately set mon->watch to -1
|
|
|
|
* and mon->fd to -1, but there may be a callback active
|
|
|
|
* that is still relying on these fields being valid. So
|
|
|
|
* we merely close them, but not clear their values and
|
|
|
|
* use this explicit 'closed' flag to track this state */
|
Fully asynchronous monitor I/O processing
Change the QEMU monitor file handle watch to poll for both
read & write events, as well as EOF. All I/O to/from the
QEMU monitor FD is now done in the event callback thread.
When the QEMU driver needs to send a command, it puts the
data to be sent into a qemuMonitorMessagePtr object instance,
queues it for dispatch, and then goes to sleep on a condition
variable. The event thread sends all the data, and then waits
for the reply to arrive, putting the response / error data
back into the qemuMonitorMessagePtr and notifying the condition
variable.
There is a temporary hack in the disk passphrase callback to
avoid acquiring the domain lock. This avoids a deadlock in
the command processing, since the domain lock is still held
when running monitor commands. The next commit will remove
the locking when running commands & thus allow re-introduction
of locking the disk passphrase callback
* src/qemu/qemu_driver.c: Temporarily don't acquire lock in
disk passphrase callback. To be reverted in next commit
* src/qemu/qemu_monitor.c, src/qemu/qemu_monitor.h: Remove
raw I/O functions, and a generic qemuMonitorSend() for
invoking a command
* src/qemu/qemu_monitor_text.c, src/qemu/qemu_monitor_text.h:
Remove all low level I/O, and use the new qemuMonitorSend()
API. Provide a qemuMonitorTextIOProcess() method for detecting
command/reply/prompt boundaries in the monitor data stream
2009-10-14 17:40:51 +00:00
|
|
|
mon->closed = 1;
|
|
|
|
}
|
2009-10-09 19:13:29 +00:00
|
|
|
|
2009-11-26 13:29:29 +00:00
|
|
|
if ((refs = qemuMonitorUnref(mon)) > 0)
|
Fully asynchronous monitor I/O processing
Change the QEMU monitor file handle watch to poll for both
read & write events, as well as EOF. All I/O to/from the
QEMU monitor FD is now done in the event callback thread.
When the QEMU driver needs to send a command, it puts the
data to be sent into a qemuMonitorMessagePtr object instance,
queues it for dispatch, and then goes to sleep on a condition
variable. The event thread sends all the data, and then waits
for the reply to arrive, putting the response / error data
back into the qemuMonitorMessagePtr and notifying the condition
variable.
There is a temporary hack in the disk passphrase callback to
avoid acquiring the domain lock. This avoids a deadlock in
the command processing, since the domain lock is still held
when running monitor commands. The next commit will remove
the locking when running commands & thus allow re-introduction
of locking the disk passphrase callback
* src/qemu/qemu_driver.c: Temporarily don't acquire lock in
disk passphrase callback. To be reverted in next commit
* src/qemu/qemu_monitor.c, src/qemu/qemu_monitor.h: Remove
raw I/O functions, and a generic qemuMonitorSend() for
invoking a command
* src/qemu/qemu_monitor_text.c, src/qemu/qemu_monitor_text.h:
Remove all low level I/O, and use the new qemuMonitorSend()
API. Provide a qemuMonitorTextIOProcess() method for detecting
command/reply/prompt boundaries in the monitor data stream
2009-10-14 17:40:51 +00:00
|
|
|
qemuMonitorUnlock(mon);
|
2009-11-26 13:29:29 +00:00
|
|
|
return refs;
|
2009-10-09 19:13:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
Fully asynchronous monitor I/O processing
Change the QEMU monitor file handle watch to poll for both
read & write events, as well as EOF. All I/O to/from the
QEMU monitor FD is now done in the event callback thread.
When the QEMU driver needs to send a command, it puts the
data to be sent into a qemuMonitorMessagePtr object instance,
queues it for dispatch, and then goes to sleep on a condition
variable. The event thread sends all the data, and then waits
for the reply to arrive, putting the response / error data
back into the qemuMonitorMessagePtr and notifying the condition
variable.
There is a temporary hack in the disk passphrase callback to
avoid acquiring the domain lock. This avoids a deadlock in
the command processing, since the domain lock is still held
when running monitor commands. The next commit will remove
the locking when running commands & thus allow re-introduction
of locking the disk passphrase callback
* src/qemu/qemu_driver.c: Temporarily don't acquire lock in
disk passphrase callback. To be reverted in next commit
* src/qemu/qemu_monitor.c, src/qemu/qemu_monitor.h: Remove
raw I/O functions, and a generic qemuMonitorSend() for
invoking a command
* src/qemu/qemu_monitor_text.c, src/qemu/qemu_monitor_text.h:
Remove all low level I/O, and use the new qemuMonitorSend()
API. Provide a qemuMonitorTextIOProcess() method for detecting
command/reply/prompt boundaries in the monitor data stream
2009-10-14 17:40:51 +00:00
|
|
|
int qemuMonitorSend(qemuMonitorPtr mon,
|
|
|
|
qemuMonitorMessagePtr msg)
|
2009-10-09 19:13:29 +00:00
|
|
|
{
|
Fully asynchronous monitor I/O processing
Change the QEMU monitor file handle watch to poll for both
read & write events, as well as EOF. All I/O to/from the
QEMU monitor FD is now done in the event callback thread.
When the QEMU driver needs to send a command, it puts the
data to be sent into a qemuMonitorMessagePtr object instance,
queues it for dispatch, and then goes to sleep on a condition
variable. The event thread sends all the data, and then waits
for the reply to arrive, putting the response / error data
back into the qemuMonitorMessagePtr and notifying the condition
variable.
There is a temporary hack in the disk passphrase callback to
avoid acquiring the domain lock. This avoids a deadlock in
the command processing, since the domain lock is still held
when running monitor commands. The next commit will remove
the locking when running commands & thus allow re-introduction
of locking the disk passphrase callback
* src/qemu/qemu_driver.c: Temporarily don't acquire lock in
disk passphrase callback. To be reverted in next commit
* src/qemu/qemu_monitor.c, src/qemu/qemu_monitor.h: Remove
raw I/O functions, and a generic qemuMonitorSend() for
invoking a command
* src/qemu/qemu_monitor_text.c, src/qemu/qemu_monitor_text.h:
Remove all low level I/O, and use the new qemuMonitorSend()
API. Provide a qemuMonitorTextIOProcess() method for detecting
command/reply/prompt boundaries in the monitor data stream
2009-10-14 17:40:51 +00:00
|
|
|
int ret = -1;
|
2009-10-09 19:13:29 +00:00
|
|
|
|
Fully asynchronous monitor I/O processing
Change the QEMU monitor file handle watch to poll for both
read & write events, as well as EOF. All I/O to/from the
QEMU monitor FD is now done in the event callback thread.
When the QEMU driver needs to send a command, it puts the
data to be sent into a qemuMonitorMessagePtr object instance,
queues it for dispatch, and then goes to sleep on a condition
variable. The event thread sends all the data, and then waits
for the reply to arrive, putting the response / error data
back into the qemuMonitorMessagePtr and notifying the condition
variable.
There is a temporary hack in the disk passphrase callback to
avoid acquiring the domain lock. This avoids a deadlock in
the command processing, since the domain lock is still held
when running monitor commands. The next commit will remove
the locking when running commands & thus allow re-introduction
of locking the disk passphrase callback
* src/qemu/qemu_driver.c: Temporarily don't acquire lock in
disk passphrase callback. To be reverted in next commit
* src/qemu/qemu_monitor.c, src/qemu/qemu_monitor.h: Remove
raw I/O functions, and a generic qemuMonitorSend() for
invoking a command
* src/qemu/qemu_monitor_text.c, src/qemu/qemu_monitor_text.h:
Remove all low level I/O, and use the new qemuMonitorSend()
API. Provide a qemuMonitorTextIOProcess() method for detecting
command/reply/prompt boundaries in the monitor data stream
2009-10-14 17:40:51 +00:00
|
|
|
if (mon->eofcb) {
|
|
|
|
msg->lastErrno = EIO;
|
2009-10-09 18:07:55 +00:00
|
|
|
return -1;
|
|
|
|
}
|
2009-10-09 19:13:29 +00:00
|
|
|
|
Fully asynchronous monitor I/O processing
Change the QEMU monitor file handle watch to poll for both
read & write events, as well as EOF. All I/O to/from the
QEMU monitor FD is now done in the event callback thread.
When the QEMU driver needs to send a command, it puts the
data to be sent into a qemuMonitorMessagePtr object instance,
queues it for dispatch, and then goes to sleep on a condition
variable. The event thread sends all the data, and then waits
for the reply to arrive, putting the response / error data
back into the qemuMonitorMessagePtr and notifying the condition
variable.
There is a temporary hack in the disk passphrase callback to
avoid acquiring the domain lock. This avoids a deadlock in
the command processing, since the domain lock is still held
when running monitor commands. The next commit will remove
the locking when running commands & thus allow re-introduction
of locking the disk passphrase callback
* src/qemu/qemu_driver.c: Temporarily don't acquire lock in
disk passphrase callback. To be reverted in next commit
* src/qemu/qemu_monitor.c, src/qemu/qemu_monitor.h: Remove
raw I/O functions, and a generic qemuMonitorSend() for
invoking a command
* src/qemu/qemu_monitor_text.c, src/qemu/qemu_monitor_text.h:
Remove all low level I/O, and use the new qemuMonitorSend()
API. Provide a qemuMonitorTextIOProcess() method for detecting
command/reply/prompt boundaries in the monitor data stream
2009-10-14 17:40:51 +00:00
|
|
|
mon->msg = msg;
|
|
|
|
qemuMonitorUpdateWatch(mon);
|
2009-10-09 19:13:29 +00:00
|
|
|
|
Fully asynchronous monitor I/O processing
Change the QEMU monitor file handle watch to poll for both
read & write events, as well as EOF. All I/O to/from the
QEMU monitor FD is now done in the event callback thread.
When the QEMU driver needs to send a command, it puts the
data to be sent into a qemuMonitorMessagePtr object instance,
queues it for dispatch, and then goes to sleep on a condition
variable. The event thread sends all the data, and then waits
for the reply to arrive, putting the response / error data
back into the qemuMonitorMessagePtr and notifying the condition
variable.
There is a temporary hack in the disk passphrase callback to
avoid acquiring the domain lock. This avoids a deadlock in
the command processing, since the domain lock is still held
when running monitor commands. The next commit will remove
the locking when running commands & thus allow re-introduction
of locking the disk passphrase callback
* src/qemu/qemu_driver.c: Temporarily don't acquire lock in
disk passphrase callback. To be reverted in next commit
* src/qemu/qemu_monitor.c, src/qemu/qemu_monitor.h: Remove
raw I/O functions, and a generic qemuMonitorSend() for
invoking a command
* src/qemu/qemu_monitor_text.c, src/qemu/qemu_monitor_text.h:
Remove all low level I/O, and use the new qemuMonitorSend()
API. Provide a qemuMonitorTextIOProcess() method for detecting
command/reply/prompt boundaries in the monitor data stream
2009-10-14 17:40:51 +00:00
|
|
|
while (!mon->msg->finished) {
|
|
|
|
if (virCondWait(&mon->notify, &mon->lock) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
}
|
2009-10-09 19:13:29 +00:00
|
|
|
|
Fully asynchronous monitor I/O processing
Change the QEMU monitor file handle watch to poll for both
read & write events, as well as EOF. All I/O to/from the
QEMU monitor FD is now done in the event callback thread.
When the QEMU driver needs to send a command, it puts the
data to be sent into a qemuMonitorMessagePtr object instance,
queues it for dispatch, and then goes to sleep on a condition
variable. The event thread sends all the data, and then waits
for the reply to arrive, putting the response / error data
back into the qemuMonitorMessagePtr and notifying the condition
variable.
There is a temporary hack in the disk passphrase callback to
avoid acquiring the domain lock. This avoids a deadlock in
the command processing, since the domain lock is still held
when running monitor commands. The next commit will remove
the locking when running commands & thus allow re-introduction
of locking the disk passphrase callback
* src/qemu/qemu_driver.c: Temporarily don't acquire lock in
disk passphrase callback. To be reverted in next commit
* src/qemu/qemu_monitor.c, src/qemu/qemu_monitor.h: Remove
raw I/O functions, and a generic qemuMonitorSend() for
invoking a command
* src/qemu/qemu_monitor_text.c, src/qemu/qemu_monitor_text.h:
Remove all low level I/O, and use the new qemuMonitorSend()
API. Provide a qemuMonitorTextIOProcess() method for detecting
command/reply/prompt boundaries in the monitor data stream
2009-10-14 17:40:51 +00:00
|
|
|
if (mon->lastErrno == 0)
|
|
|
|
ret = 0;
|
2009-10-09 19:13:29 +00:00
|
|
|
|
Fully asynchronous monitor I/O processing
Change the QEMU monitor file handle watch to poll for both
read & write events, as well as EOF. All I/O to/from the
QEMU monitor FD is now done in the event callback thread.
When the QEMU driver needs to send a command, it puts the
data to be sent into a qemuMonitorMessagePtr object instance,
queues it for dispatch, and then goes to sleep on a condition
variable. The event thread sends all the data, and then waits
for the reply to arrive, putting the response / error data
back into the qemuMonitorMessagePtr and notifying the condition
variable.
There is a temporary hack in the disk passphrase callback to
avoid acquiring the domain lock. This avoids a deadlock in
the command processing, since the domain lock is still held
when running monitor commands. The next commit will remove
the locking when running commands & thus allow re-introduction
of locking the disk passphrase callback
* src/qemu/qemu_driver.c: Temporarily don't acquire lock in
disk passphrase callback. To be reverted in next commit
* src/qemu/qemu_monitor.c, src/qemu/qemu_monitor.h: Remove
raw I/O functions, and a generic qemuMonitorSend() for
invoking a command
* src/qemu/qemu_monitor_text.c, src/qemu/qemu_monitor_text.h:
Remove all low level I/O, and use the new qemuMonitorSend()
API. Provide a qemuMonitorTextIOProcess() method for detecting
command/reply/prompt boundaries in the monitor data stream
2009-10-14 17:40:51 +00:00
|
|
|
cleanup:
|
|
|
|
mon->msg = NULL;
|
|
|
|
qemuMonitorUpdateWatch(mon);
|
2009-10-09 19:13:29 +00:00
|
|
|
|
Fully asynchronous monitor I/O processing
Change the QEMU monitor file handle watch to poll for both
read & write events, as well as EOF. All I/O to/from the
QEMU monitor FD is now done in the event callback thread.
When the QEMU driver needs to send a command, it puts the
data to be sent into a qemuMonitorMessagePtr object instance,
queues it for dispatch, and then goes to sleep on a condition
variable. The event thread sends all the data, and then waits
for the reply to arrive, putting the response / error data
back into the qemuMonitorMessagePtr and notifying the condition
variable.
There is a temporary hack in the disk passphrase callback to
avoid acquiring the domain lock. This avoids a deadlock in
the command processing, since the domain lock is still held
when running monitor commands. The next commit will remove
the locking when running commands & thus allow re-introduction
of locking the disk passphrase callback
* src/qemu/qemu_driver.c: Temporarily don't acquire lock in
disk passphrase callback. To be reverted in next commit
* src/qemu/qemu_monitor.c, src/qemu/qemu_monitor.h: Remove
raw I/O functions, and a generic qemuMonitorSend() for
invoking a command
* src/qemu/qemu_monitor_text.c, src/qemu/qemu_monitor_text.h:
Remove all low level I/O, and use the new qemuMonitorSend()
API. Provide a qemuMonitorTextIOProcess() method for detecting
command/reply/prompt boundaries in the monitor data stream
2009-10-14 17:40:51 +00:00
|
|
|
return ret;
|
2009-10-09 18:07:55 +00:00
|
|
|
}
|
2009-10-09 19:34:24 +00:00
|
|
|
|
|
|
|
|
|
|
|
int qemuMonitorGetDiskSecret(qemuMonitorPtr mon,
|
|
|
|
virConnectPtr conn,
|
|
|
|
const char *path,
|
|
|
|
char **secret,
|
|
|
|
size_t *secretLen)
|
|
|
|
{
|
2009-10-15 17:56:52 +00:00
|
|
|
int ret = -1;
|
2009-10-09 19:34:24 +00:00
|
|
|
*secret = NULL;
|
|
|
|
*secretLen = 0;
|
|
|
|
|
2009-10-15 17:56:52 +00:00
|
|
|
qemuMonitorRef(mon);
|
|
|
|
qemuMonitorUnlock(mon);
|
|
|
|
if (mon->cb && mon->cb->diskSecretLookup)
|
|
|
|
ret = mon->cb->diskSecretLookup(mon, conn, mon->vm, path, secret, secretLen);
|
|
|
|
qemuMonitorLock(mon);
|
|
|
|
qemuMonitorUnref(mon);
|
|
|
|
return ret;
|
2009-10-09 19:34:24 +00:00
|
|
|
}
|
2009-10-09 20:13:06 +00:00
|
|
|
|
|
|
|
|
2009-11-26 13:05:24 +00:00
|
|
|
int qemuMonitorEmitShutdown(qemuMonitorPtr mon)
|
|
|
|
{
|
|
|
|
int ret = -1;
|
|
|
|
VIR_DEBUG("mon=%p", mon);
|
|
|
|
|
|
|
|
qemuMonitorRef(mon);
|
|
|
|
qemuMonitorUnlock(mon);
|
|
|
|
if (mon->cb && mon->cb->domainShutdown)
|
|
|
|
ret = mon->cb->domainShutdown(mon, mon->vm);
|
|
|
|
qemuMonitorLock(mon);
|
|
|
|
qemuMonitorUnref(mon);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int qemuMonitorEmitReset(qemuMonitorPtr mon)
|
|
|
|
{
|
|
|
|
int ret = -1;
|
|
|
|
VIR_DEBUG("mon=%p", mon);
|
|
|
|
|
|
|
|
qemuMonitorRef(mon);
|
|
|
|
qemuMonitorUnlock(mon);
|
|
|
|
if (mon->cb && mon->cb->domainReset)
|
|
|
|
ret = mon->cb->domainReset(mon, mon->vm);
|
|
|
|
qemuMonitorLock(mon);
|
|
|
|
qemuMonitorUnref(mon);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int qemuMonitorEmitPowerdown(qemuMonitorPtr mon)
|
|
|
|
{
|
|
|
|
int ret = -1;
|
|
|
|
VIR_DEBUG("mon=%p", mon);
|
|
|
|
|
|
|
|
qemuMonitorRef(mon);
|
|
|
|
qemuMonitorUnlock(mon);
|
|
|
|
if (mon->cb && mon->cb->domainPowerdown)
|
|
|
|
ret = mon->cb->domainPowerdown(mon, mon->vm);
|
|
|
|
qemuMonitorLock(mon);
|
|
|
|
qemuMonitorUnref(mon);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int qemuMonitorEmitStop(qemuMonitorPtr mon)
|
|
|
|
{
|
|
|
|
int ret = -1;
|
|
|
|
VIR_DEBUG("mon=%p", mon);
|
|
|
|
|
|
|
|
qemuMonitorRef(mon);
|
|
|
|
qemuMonitorUnlock(mon);
|
|
|
|
if (mon->cb && mon->cb->domainStop)
|
|
|
|
ret = mon->cb->domainStop(mon, mon->vm);
|
|
|
|
qemuMonitorLock(mon);
|
|
|
|
qemuMonitorUnref(mon);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-10-09 20:13:06 +00:00
|
|
|
int
|
|
|
|
qemuMonitorStartCPUs(qemuMonitorPtr mon,
|
|
|
|
virConnectPtr conn)
|
|
|
|
{
|
2009-11-03 18:59:18 +00:00
|
|
|
int ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
DEBUG("mon=%p, fd=%d", mon, mon->fd);
|
|
|
|
|
2009-11-03 18:59:18 +00:00
|
|
|
if (mon->json)
|
|
|
|
ret = qemuMonitorJSONStartCPUs(mon, conn);
|
|
|
|
else
|
|
|
|
ret = qemuMonitorTextStartCPUs(mon, conn);
|
|
|
|
return ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
qemuMonitorStopCPUs(qemuMonitorPtr mon)
|
|
|
|
{
|
2009-11-03 18:59:18 +00:00
|
|
|
int ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
DEBUG("mon=%p, fd=%d", mon, mon->fd);
|
|
|
|
|
2009-11-03 18:59:18 +00:00
|
|
|
if (mon->json)
|
|
|
|
ret = qemuMonitorJSONStopCPUs(mon);
|
|
|
|
else
|
|
|
|
ret = qemuMonitorTextStopCPUs(mon);
|
|
|
|
return ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int qemuMonitorSystemPowerdown(qemuMonitorPtr mon)
|
|
|
|
{
|
2009-11-03 18:59:18 +00:00
|
|
|
int ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
DEBUG("mon=%p, fd=%d", mon, mon->fd);
|
|
|
|
|
2009-11-03 18:59:18 +00:00
|
|
|
if (mon->json)
|
|
|
|
ret = qemuMonitorJSONSystemPowerdown(mon);
|
|
|
|
else
|
|
|
|
ret = qemuMonitorTextSystemPowerdown(mon);
|
|
|
|
return ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int qemuMonitorGetCPUInfo(qemuMonitorPtr mon,
|
|
|
|
int **pids)
|
|
|
|
{
|
2009-11-03 18:59:18 +00:00
|
|
|
int ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
DEBUG("mon=%p, fd=%d", mon, mon->fd);
|
|
|
|
|
2009-11-03 18:59:18 +00:00
|
|
|
if (mon->json)
|
|
|
|
ret = qemuMonitorJSONGetCPUInfo(mon, pids);
|
|
|
|
else
|
|
|
|
ret = qemuMonitorTextGetCPUInfo(mon, pids);
|
|
|
|
return ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int qemuMonitorGetBalloonInfo(qemuMonitorPtr mon,
|
|
|
|
unsigned long *currmem)
|
|
|
|
{
|
2009-11-03 18:59:18 +00:00
|
|
|
int ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
DEBUG("mon=%p, fd=%d", mon, mon->fd);
|
|
|
|
|
2009-11-03 18:59:18 +00:00
|
|
|
if (mon->json)
|
|
|
|
ret = qemuMonitorJSONGetBalloonInfo(mon, currmem);
|
|
|
|
else
|
|
|
|
ret = qemuMonitorTextGetBalloonInfo(mon, currmem);
|
|
|
|
return ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int qemuMonitorGetBlockStatsInfo(qemuMonitorPtr mon,
|
|
|
|
const char *devname,
|
|
|
|
long long *rd_req,
|
|
|
|
long long *rd_bytes,
|
|
|
|
long long *wr_req,
|
|
|
|
long long *wr_bytes,
|
|
|
|
long long *errs)
|
|
|
|
{
|
2009-11-03 18:59:18 +00:00
|
|
|
int ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
DEBUG("mon=%p, fd=%d dev=%s", mon, mon->fd, devname);
|
|
|
|
|
2009-11-03 18:59:18 +00:00
|
|
|
if (mon->json)
|
|
|
|
ret = qemuMonitorJSONGetBlockStatsInfo(mon, devname,
|
|
|
|
rd_req, rd_bytes,
|
|
|
|
wr_req, wr_bytes,
|
|
|
|
errs);
|
|
|
|
else
|
|
|
|
ret = qemuMonitorTextGetBlockStatsInfo(mon, devname,
|
|
|
|
rd_req, rd_bytes,
|
|
|
|
wr_req, wr_bytes,
|
|
|
|
errs);
|
|
|
|
return ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int qemuMonitorSetVNCPassword(qemuMonitorPtr mon,
|
|
|
|
const char *password)
|
|
|
|
{
|
2009-11-03 18:59:18 +00:00
|
|
|
int ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
DEBUG("mon=%p, fd=%d", mon, mon->fd);
|
|
|
|
|
2009-11-03 18:59:18 +00:00
|
|
|
if (mon->json)
|
|
|
|
ret = qemuMonitorJSONSetVNCPassword(mon, password);
|
|
|
|
else
|
|
|
|
ret = qemuMonitorTextSetVNCPassword(mon, password);
|
|
|
|
return ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int qemuMonitorSetBalloon(qemuMonitorPtr mon,
|
|
|
|
unsigned long newmem)
|
|
|
|
{
|
2009-11-03 18:59:18 +00:00
|
|
|
int ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
DEBUG("mon=%p, fd=%d newmem=%lu", mon, mon->fd, newmem);
|
|
|
|
|
2009-11-03 18:59:18 +00:00
|
|
|
if (mon->json)
|
|
|
|
ret = qemuMonitorJSONSetBalloon(mon, newmem);
|
|
|
|
else
|
|
|
|
ret = qemuMonitorTextSetBalloon(mon, newmem);
|
|
|
|
return ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int qemuMonitorEjectMedia(qemuMonitorPtr mon,
|
|
|
|
const char *devname)
|
|
|
|
{
|
2009-11-03 18:59:18 +00:00
|
|
|
int ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
DEBUG("mon=%p, fd=%d devname=%s", mon, mon->fd, devname);
|
|
|
|
|
2009-11-03 18:59:18 +00:00
|
|
|
if (mon->json)
|
|
|
|
ret = qemuMonitorJSONEjectMedia(mon, devname);
|
|
|
|
else
|
|
|
|
ret = qemuMonitorTextEjectMedia(mon, devname);
|
|
|
|
return ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int qemuMonitorChangeMedia(qemuMonitorPtr mon,
|
|
|
|
const char *devname,
|
2009-11-26 13:48:17 +00:00
|
|
|
const char *newmedia,
|
|
|
|
const char *format)
|
2009-10-09 20:13:06 +00:00
|
|
|
{
|
2009-11-03 18:59:18 +00:00
|
|
|
int ret;
|
2009-11-26 13:48:17 +00:00
|
|
|
DEBUG("mon=%p, fd=%d devname=%s newmedia=%s format=%s",
|
|
|
|
mon, mon->fd, devname, newmedia, format);
|
2009-10-09 20:13:06 +00:00
|
|
|
|
2009-11-03 18:59:18 +00:00
|
|
|
if (mon->json)
|
|
|
|
ret = qemuMonitorJSONChangeMedia(mon, devname, newmedia, format);
|
|
|
|
else
|
|
|
|
ret = qemuMonitorTextChangeMedia(mon, devname, newmedia, format);
|
|
|
|
return ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int qemuMonitorSaveVirtualMemory(qemuMonitorPtr mon,
|
|
|
|
unsigned long long offset,
|
|
|
|
size_t length,
|
|
|
|
const char *path)
|
|
|
|
{
|
2009-11-03 18:59:18 +00:00
|
|
|
int ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
DEBUG("mon=%p, fd=%d offset=%llu length=%zu path=%s",
|
|
|
|
mon, mon->fd, offset, length, path);
|
|
|
|
|
2009-11-03 18:59:18 +00:00
|
|
|
if (mon->json)
|
|
|
|
ret = qemuMonitorJSONSaveVirtualMemory(mon, offset, length, path);
|
|
|
|
else
|
|
|
|
ret = qemuMonitorTextSaveVirtualMemory(mon, offset, length, path);
|
|
|
|
return ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int qemuMonitorSavePhysicalMemory(qemuMonitorPtr mon,
|
|
|
|
unsigned long long offset,
|
|
|
|
size_t length,
|
|
|
|
const char *path)
|
|
|
|
{
|
2009-11-03 18:59:18 +00:00
|
|
|
int ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
DEBUG("mon=%p, fd=%d offset=%llu length=%zu path=%s",
|
|
|
|
mon, mon->fd, offset, length, path);
|
|
|
|
|
2009-11-03 18:59:18 +00:00
|
|
|
if (mon->json)
|
|
|
|
ret = qemuMonitorJSONSavePhysicalMemory(mon, offset, length, path);
|
|
|
|
else
|
|
|
|
ret = qemuMonitorTextSavePhysicalMemory(mon, offset, length, path);
|
|
|
|
return ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int qemuMonitorSetMigrationSpeed(qemuMonitorPtr mon,
|
|
|
|
unsigned long bandwidth)
|
|
|
|
{
|
2009-11-03 18:59:18 +00:00
|
|
|
int ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
DEBUG("mon=%p, fd=%d bandwidth=%lu", mon, mon->fd, bandwidth);
|
|
|
|
|
2009-11-03 18:59:18 +00:00
|
|
|
if (mon->json)
|
|
|
|
ret = qemuMonitorJSONSetMigrationSpeed(mon, bandwidth);
|
|
|
|
else
|
|
|
|
ret = qemuMonitorTextSetMigrationSpeed(mon, bandwidth);
|
|
|
|
return ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int qemuMonitorGetMigrationStatus(qemuMonitorPtr mon,
|
|
|
|
int *status,
|
|
|
|
unsigned long long *transferred,
|
|
|
|
unsigned long long *remaining,
|
|
|
|
unsigned long long *total)
|
|
|
|
{
|
2009-11-03 18:59:18 +00:00
|
|
|
int ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
DEBUG("mon=%p, fd=%d", mon, mon->fd);
|
|
|
|
|
2009-11-03 18:59:18 +00:00
|
|
|
if (mon->json)
|
|
|
|
ret = qemuMonitorJSONGetMigrationStatus(mon, status,
|
|
|
|
transferred,
|
|
|
|
remaining,
|
|
|
|
total);
|
|
|
|
else
|
|
|
|
ret = qemuMonitorTextGetMigrationStatus(mon, status,
|
|
|
|
transferred,
|
|
|
|
remaining,
|
|
|
|
total);
|
|
|
|
return ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int qemuMonitorMigrateToHost(qemuMonitorPtr mon,
|
|
|
|
int background,
|
|
|
|
const char *hostname,
|
|
|
|
int port)
|
|
|
|
{
|
2009-11-03 18:59:18 +00:00
|
|
|
int ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
DEBUG("mon=%p, fd=%d hostname=%s port=%d",
|
|
|
|
mon, mon->fd, hostname, port);
|
|
|
|
|
2009-11-03 18:59:18 +00:00
|
|
|
if (mon->json)
|
|
|
|
ret = qemuMonitorJSONMigrateToHost(mon, background, hostname, port);
|
|
|
|
else
|
|
|
|
ret = qemuMonitorTextMigrateToHost(mon, background, hostname, port);
|
|
|
|
return ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int qemuMonitorMigrateToCommand(qemuMonitorPtr mon,
|
|
|
|
int background,
|
|
|
|
const char * const *argv,
|
|
|
|
const char *target)
|
|
|
|
{
|
2009-11-03 18:59:18 +00:00
|
|
|
int ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
DEBUG("mon=%p, fd=%d argv=%p target=%s",
|
|
|
|
mon, mon->fd, argv, target);
|
|
|
|
|
2009-11-03 18:59:18 +00:00
|
|
|
if (mon->json)
|
|
|
|
ret = qemuMonitorJSONMigrateToCommand(mon, background, argv, target);
|
|
|
|
else
|
|
|
|
ret = qemuMonitorTextMigrateToCommand(mon, background, argv, target);
|
|
|
|
return ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int qemuMonitorMigrateToUnix(qemuMonitorPtr mon,
|
|
|
|
int background,
|
|
|
|
const char *unixfile)
|
|
|
|
{
|
2009-11-03 18:59:18 +00:00
|
|
|
int ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
DEBUG("mon=%p fd=%d unixfile=%s",
|
|
|
|
mon, mon->fd, unixfile);
|
|
|
|
|
2009-11-03 18:59:18 +00:00
|
|
|
if (mon->json)
|
|
|
|
ret = qemuMonitorJSONMigrateToUnix(mon, background, unixfile);
|
|
|
|
else
|
|
|
|
ret = qemuMonitorTextMigrateToUnix(mon, background, unixfile);
|
|
|
|
return ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int qemuMonitorMigrateCancel(qemuMonitorPtr mon)
|
|
|
|
{
|
2009-11-03 18:59:18 +00:00
|
|
|
int ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
DEBUG("mon=%p fd=%d", mon, mon->fd);
|
|
|
|
|
2009-11-03 18:59:18 +00:00
|
|
|
if (mon->json)
|
|
|
|
ret = qemuMonitorJSONMigrateCancel(mon);
|
|
|
|
else
|
|
|
|
ret = qemuMonitorTextMigrateCancel(mon);
|
|
|
|
return ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int qemuMonitorAddUSBDisk(qemuMonitorPtr mon,
|
|
|
|
const char *path)
|
|
|
|
{
|
2009-11-03 18:59:18 +00:00
|
|
|
int ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
DEBUG("mon=%p, fd=%d path=%s", mon, mon->fd, path);
|
|
|
|
|
2009-11-03 18:59:18 +00:00
|
|
|
if (mon->json)
|
|
|
|
ret = qemuMonitorJSONAddUSBDisk(mon, path);
|
|
|
|
else
|
|
|
|
ret = qemuMonitorTextAddUSBDisk(mon, path);
|
|
|
|
return ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int qemuMonitorAddUSBDeviceExact(qemuMonitorPtr mon,
|
|
|
|
int bus,
|
|
|
|
int dev)
|
|
|
|
{
|
2009-11-03 18:59:18 +00:00
|
|
|
int ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
DEBUG("mon=%p, fd=%d bus=%d dev=%d", mon, mon->fd, bus, dev);
|
|
|
|
|
2009-11-03 18:59:18 +00:00
|
|
|
if (mon->json)
|
|
|
|
ret = qemuMonitorJSONAddUSBDeviceExact(mon, bus, dev);
|
|
|
|
else
|
|
|
|
ret = qemuMonitorTextAddUSBDeviceExact(mon, bus, dev);
|
|
|
|
return ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int qemuMonitorAddUSBDeviceMatch(qemuMonitorPtr mon,
|
|
|
|
int vendor,
|
|
|
|
int product)
|
|
|
|
{
|
2009-11-03 18:59:18 +00:00
|
|
|
int ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
DEBUG("mon=%p, fd=%d vendor=%d product=%d",
|
|
|
|
mon, mon->fd, vendor, product);
|
|
|
|
|
2009-11-03 18:59:18 +00:00
|
|
|
if (mon->json)
|
|
|
|
ret = qemuMonitorJSONAddUSBDeviceMatch(mon, vendor, product);
|
|
|
|
else
|
|
|
|
ret = qemuMonitorTextAddUSBDeviceMatch(mon, vendor, product);
|
|
|
|
return ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int qemuMonitorAddPCIHostDevice(qemuMonitorPtr mon,
|
2009-12-07 19:07:39 +00:00
|
|
|
virDomainDevicePCIAddress *hostAddr,
|
|
|
|
virDomainDevicePCIAddress *guestAddr)
|
2009-10-09 20:13:06 +00:00
|
|
|
{
|
2009-11-03 18:59:18 +00:00
|
|
|
int ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
DEBUG("mon=%p, fd=%d domain=%d bus=%d slot=%d function=%d",
|
|
|
|
mon, mon->fd,
|
2009-12-07 19:07:39 +00:00
|
|
|
hostAddr->domain, hostAddr->bus, hostAddr->slot, hostAddr->function);
|
2009-10-09 20:13:06 +00:00
|
|
|
|
2009-11-03 18:59:18 +00:00
|
|
|
if (mon->json)
|
2009-12-07 19:07:39 +00:00
|
|
|
ret = qemuMonitorJSONAddPCIHostDevice(mon, hostAddr, guestAddr);
|
2009-11-03 18:59:18 +00:00
|
|
|
else
|
2009-12-07 19:07:39 +00:00
|
|
|
ret = qemuMonitorTextAddPCIHostDevice(mon, hostAddr, guestAddr);
|
2009-11-03 18:59:18 +00:00
|
|
|
return ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int qemuMonitorAddPCIDisk(qemuMonitorPtr mon,
|
|
|
|
const char *path,
|
|
|
|
const char *bus,
|
2009-12-07 19:07:39 +00:00
|
|
|
virDomainDevicePCIAddress *guestAddr)
|
2009-10-09 20:13:06 +00:00
|
|
|
{
|
2009-11-03 18:59:18 +00:00
|
|
|
int ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
DEBUG("mon=%p, fd=%d path=%s bus=%s",
|
|
|
|
mon, mon->fd, path, bus);
|
|
|
|
|
2009-11-03 18:59:18 +00:00
|
|
|
if (mon->json)
|
2009-12-07 19:07:39 +00:00
|
|
|
ret = qemuMonitorJSONAddPCIDisk(mon, path, bus, guestAddr);
|
2009-11-03 18:59:18 +00:00
|
|
|
else
|
2009-12-07 19:07:39 +00:00
|
|
|
ret = qemuMonitorTextAddPCIDisk(mon, path, bus, guestAddr);
|
2009-11-03 18:59:18 +00:00
|
|
|
return ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int qemuMonitorAddPCINetwork(qemuMonitorPtr mon,
|
|
|
|
const char *nicstr,
|
2009-12-07 19:07:39 +00:00
|
|
|
virDomainDevicePCIAddress *guestAddr)
|
2009-10-09 20:13:06 +00:00
|
|
|
{
|
2009-11-03 18:59:18 +00:00
|
|
|
int ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
DEBUG("mon=%p, fd=%d nicstr=%s", mon, mon->fd, nicstr);
|
|
|
|
|
2009-11-03 18:59:18 +00:00
|
|
|
if (mon->json)
|
2009-12-07 19:07:39 +00:00
|
|
|
ret = qemuMonitorJSONAddPCINetwork(mon, nicstr, guestAddr);
|
2009-11-03 18:59:18 +00:00
|
|
|
else
|
2009-12-07 19:07:39 +00:00
|
|
|
ret = qemuMonitorTextAddPCINetwork(mon, nicstr, guestAddr);
|
2009-11-03 18:59:18 +00:00
|
|
|
return ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int qemuMonitorRemovePCIDevice(qemuMonitorPtr mon,
|
2009-12-07 19:07:39 +00:00
|
|
|
virDomainDevicePCIAddress *guestAddr)
|
2009-10-09 20:13:06 +00:00
|
|
|
{
|
2009-11-03 18:59:18 +00:00
|
|
|
int ret;
|
2009-12-07 19:07:39 +00:00
|
|
|
DEBUG("mon=%p, fd=%d domain=%d bus=%d slot=%d function=%d",
|
|
|
|
mon, mon->fd, guestAddr->domain, guestAddr->bus,
|
|
|
|
guestAddr->slot, guestAddr->function);
|
2009-10-09 20:13:06 +00:00
|
|
|
|
2009-11-03 18:59:18 +00:00
|
|
|
if (mon->json)
|
2009-12-07 19:07:39 +00:00
|
|
|
ret = qemuMonitorJSONRemovePCIDevice(mon, guestAddr);
|
2009-11-03 18:59:18 +00:00
|
|
|
else
|
2009-12-07 19:07:39 +00:00
|
|
|
ret = qemuMonitorTextRemovePCIDevice(mon, guestAddr);
|
2009-11-03 18:59:18 +00:00
|
|
|
return ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int qemuMonitorSendFileHandle(qemuMonitorPtr mon,
|
|
|
|
const char *fdname,
|
|
|
|
int fd)
|
|
|
|
{
|
2009-11-03 18:59:18 +00:00
|
|
|
int ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
DEBUG("mon=%p, fd=%d fdname=%s fd=%d",
|
|
|
|
mon, mon->fd, fdname, fd);
|
|
|
|
|
2009-11-03 18:59:18 +00:00
|
|
|
if (mon->json)
|
|
|
|
ret = qemuMonitorJSONSendFileHandle(mon, fdname, fd);
|
|
|
|
else
|
|
|
|
ret = qemuMonitorTextSendFileHandle(mon, fdname, fd);
|
|
|
|
return ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int qemuMonitorCloseFileHandle(qemuMonitorPtr mon,
|
|
|
|
const char *fdname)
|
|
|
|
{
|
2009-11-03 18:59:18 +00:00
|
|
|
int ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
DEBUG("mon=%p, fd=%d fdname=%s",
|
|
|
|
mon, mon->fd, fdname);
|
|
|
|
|
2009-11-03 18:59:18 +00:00
|
|
|
if (mon->json)
|
|
|
|
ret = qemuMonitorJSONCloseFileHandle(mon, fdname);
|
|
|
|
else
|
|
|
|
ret = qemuMonitorTextCloseFileHandle(mon, fdname);
|
|
|
|
return ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int qemuMonitorAddHostNetwork(qemuMonitorPtr mon,
|
|
|
|
const char *netstr)
|
|
|
|
{
|
2009-11-03 18:59:18 +00:00
|
|
|
int ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
DEBUG("mon=%p, fd=%d netstr=%s",
|
|
|
|
mon, mon->fd, netstr);
|
|
|
|
|
2009-11-03 18:59:18 +00:00
|
|
|
if (mon->json)
|
|
|
|
ret = qemuMonitorJSONAddHostNetwork(mon, netstr);
|
|
|
|
else
|
|
|
|
ret = qemuMonitorTextAddHostNetwork(mon, netstr);
|
|
|
|
return ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int qemuMonitorRemoveHostNetwork(qemuMonitorPtr mon,
|
|
|
|
int vlan,
|
|
|
|
const char *netname)
|
|
|
|
{
|
2009-11-03 18:59:18 +00:00
|
|
|
int ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
DEBUG("mon=%p, fd=%d netname=%s",
|
|
|
|
mon, mon->fd, netname);
|
|
|
|
|
2009-11-03 18:59:18 +00:00
|
|
|
if (mon->json)
|
|
|
|
ret = qemuMonitorJSONRemoveHostNetwork(mon, vlan, netname);
|
|
|
|
else
|
|
|
|
ret = qemuMonitorTextRemoveHostNetwork(mon, vlan, netname);
|
|
|
|
return ret;
|
2009-10-09 20:13:06 +00:00
|
|
|
}
|
2009-12-14 09:50:01 +00:00
|
|
|
|
|
|
|
int qemuMonitorGetPtyPaths(qemuMonitorPtr mon,
|
|
|
|
virHashTablePtr paths)
|
|
|
|
{
|
2010-01-22 13:22:53 +00:00
|
|
|
int ret;
|
2009-12-14 09:50:01 +00:00
|
|
|
DEBUG("mon=%p, fd=%d",
|
|
|
|
mon, mon->fd);
|
|
|
|
|
2010-01-22 13:22:53 +00:00
|
|
|
if (mon->json)
|
|
|
|
ret = qemuMonitorJSONGetPtyPaths(mon, paths);
|
|
|
|
else
|
|
|
|
ret = qemuMonitorTextGetPtyPaths(mon, paths);
|
|
|
|
return ret;
|
2009-12-14 09:50:01 +00:00
|
|
|
}
|
2009-12-07 19:28:05 +00:00
|
|
|
|
|
|
|
|
|
|
|
int qemuMonitorAttachPCIDiskController(qemuMonitorPtr mon,
|
|
|
|
const char *bus,
|
|
|
|
virDomainDevicePCIAddress *guestAddr)
|
|
|
|
{
|
|
|
|
DEBUG("mon=%p, fd=%d type=%s", mon, mon->fd, bus);
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (mon->json)
|
|
|
|
ret = qemuMonitorJSONAttachPCIDiskController(mon, bus, guestAddr);
|
|
|
|
else
|
|
|
|
ret = qemuMonitorTextAttachPCIDiskController(mon, bus, guestAddr);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
Properly support SCSI drive hotplug
The current SCSI hotplug support attaches a brand new SCSI controller
for every disk. This is broken because the semantics differ from those
used when starting the VM initially. In the latter case, each SCSI
controller is filled before a new one is added.
If the user specifies an high drive index (sdazz) then at initial
startup, many intermediate SCSI controllers may be added with no
drives.
This patch changes SCSI hotplug so that it exactly matches the
behaviour of initial startup. First the SCSI controller number is
determined for the drive to be hotplugged. If any controller upto
and including that controller number is not yet present, it is
attached. Then finally the drive is attached to the last controller.
NB, this breaks SCSI hotunplug, because there is no 'drive_del'
command in current QEMU. Previous SCSI hotunplug was broken in
any case because it was unplugging the entire controller, not
just the drive in question.
A future QEMU will allow proper SCSI hotunplug of a drive.
This patch is derived from work done by Wolfgang Mauerer on disk
controllers.
* src/qemu/qemu_driver.c: Fix SCSI hotplug to add a drive to
the correct controller, instead of just attaching a new
controller.
* src/qemu/qemu_monitor.c, src/qemu/qemu_monitor.h,
src/qemu/qemu_monitor_json.c, src/qemu/qemu_monitor_json.h,
src/qemu/qemu_monitor_text.c, src/qemu/qemu_monitor_text.h: Add
support for 'drive_add' command
2009-12-09 17:57:09 +00:00
|
|
|
|
|
|
|
|
|
|
|
int qemuMonitorAttachDrive(qemuMonitorPtr mon,
|
|
|
|
const char *drivestr,
|
|
|
|
virDomainDevicePCIAddress *controllerAddr,
|
|
|
|
virDomainDeviceDriveAddress *driveAddr)
|
|
|
|
{
|
|
|
|
DEBUG("mon=%p, fd=%d drivestr=%s domain=%d bus=%d slot=%d function=%d",
|
|
|
|
mon, mon->fd, drivestr,
|
|
|
|
controllerAddr->domain, controllerAddr->bus,
|
|
|
|
controllerAddr->slot, controllerAddr->function);
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (mon->json)
|
|
|
|
ret = qemuMonitorJSONAttachDrive(mon, drivestr, controllerAddr, driveAddr);
|
|
|
|
else
|
|
|
|
ret = qemuMonitorTextAttachDrive(mon, drivestr, controllerAddr, driveAddr);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
Detect PCI addresses at QEMU startup
Hotunplug of devices requires that we know their PCI address. Even
hotplug of SCSI drives, required that we know the PCI address of
the SCSI controller to attach the drive to. We can find this out
by running 'info pci' and then correlating the vendor/product IDs
with the devices we booted with.
Although this approach is somewhat fragile, it is the only viable
option with QEMU < 0.12, since there is no way for libvirto set
explicit PCI addresses when creating devices in the first place.
For QEMU > 0.12, this code will not be used.
* src/qemu/qemu_driver.c: Assign all dynamic PCI addresses on
startup of QEMU VM, matching vendor/product IDs
* src/qemu/qemu_monitor.c, src/qemu/qemu_monitor.h,
src/qemu/qemu_monitor_json.c, src/qemu/qemu_monitor_json.h,
src/qemu/qemu_monitor_text.c, src/qemu/qemu_monitor_text.h: Add
API for fetching PCI device address mapping
2009-12-09 21:59:04 +00:00
|
|
|
|
|
|
|
int qemuMonitorGetAllPCIAddresses(qemuMonitorPtr mon,
|
|
|
|
qemuMonitorPCIAddress **addrs)
|
|
|
|
{
|
|
|
|
DEBUG("mon=%p, fd=%d addrs=%p", mon, mon->fd, addrs);
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (mon->json)
|
|
|
|
ret = qemuMonitorJSONGetAllPCIAddresses(mon, addrs);
|
|
|
|
else
|
|
|
|
ret = qemuMonitorTextGetAllPCIAddresses(mon, addrs);
|
|
|
|
return ret;
|
|
|
|
}
|
2010-01-26 15:34:46 +00:00
|
|
|
|
|
|
|
|
|
|
|
int qemuMonitorAddDevice(qemuMonitorPtr mon,
|
|
|
|
const char *devicestr)
|
|
|
|
{
|
|
|
|
DEBUG("mon=%p, fd=%d device=%s", mon, mon->fd, devicestr);
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (mon->json)
|
|
|
|
ret = qemuMonitorJSONAddDevice(mon, devicestr);
|
|
|
|
else
|
|
|
|
ret = qemuMonitorTextAddDevice(mon, devicestr);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
int qemuMonitorAddDrive(qemuMonitorPtr mon,
|
|
|
|
const char *drivestr)
|
|
|
|
{
|
|
|
|
DEBUG("mon=%p, fd=%d drive=%s", mon, mon->fd, drivestr);
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (mon->json)
|
|
|
|
ret = qemuMonitorJSONAddDrive(mon, drivestr);
|
|
|
|
else
|
|
|
|
ret = qemuMonitorTextAddDrive(mon, drivestr);
|
|
|
|
return ret;
|
|
|
|
}
|