2009-11-03 18:59:18 +00:00
|
|
|
/*
|
|
|
|
|
* qemu_monitor_json.h: interaction with QEMU monitor console
|
|
|
|
|
*
|
qemu: don't munge user input during block commit
While investigating https://bugzilla.redhat.com/show_bug.cgi?id=1061827
I noticed that we pass user input unscathed for block-pull, but
always pass a canonical absolute name through for block-commit.
[Note that we probably _ought_ to validate that the user's request
for block-pull actually matches the backing chain, the way we already
do for block-commit - but that's a separate issue. Further note that
the ability to pass user input through unscathed allows backdoors
such as specifying a backing image that is a network URI such as
a gluster disk, instead of forcing things to the local file system;
which is an area still under active investigation on whether libvirt
needs to behave differently for network disks.]
Since qemu may write the name that the user passed in as the backing
file, a user may have a reason to want a relative file name passed
through to qemu, and always munging things to absolute prevents that.
Put another way, if you have the backing chain:
[A] <- [B(back=./A)] <- [C(back=./B)]
and commit B into A (virsh blockcommit $dom vda --base A --top B),
the metadata of C will have to be re-written. But should it be
rewritten as [C(back=./A)] or as [C(back=/path/to/A)]? Still up in
the air is whether qemu's decision should be based on whether B
and/or C had relative paths, or on whether the --base and/or
--top arguments to the command were relative paths; but if we always
pass a canonical name, we've prevented the spelling of the command
arguments from being part of the hueristics that qemu uses.
I also audited the code, and verified that we never call
qemuMonitorBlockCommit() with a NULL base, either before or after
the change to qemu_driver.c.
* src/qemu/qemu_driver.c (qemuDomainBlockCommit): Preserve user's
spelling, since absolute vs. relative matters to qemu.
* src/qemu/qemu_monitor.h (qemuMonitorBlockCommit): Base is never
null.
* src/qemu/qemu_monitor.c (qemuMonitorBlockCommit): Likewise.
* src/qemu/qemu_monitor_json.h (qemuMonitorJSONBlockCommit):
Likewise.
* src/qemu/qemu_monitor_json.c (qemuMonitorJSONBlockCommit):
Likewise.
Signed-off-by: Eric Blake <eblake@redhat.com>
2014-03-06 23:33:16 +00:00
|
|
|
* Copyright (C) 2006-2009, 2011-2014 Red Hat, Inc.
|
2009-11-03 18:59:18 +00:00
|
|
|
* 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
|
2012-09-20 22:30:55 +00:00
|
|
|
* License along with this library. If not, see
|
2012-07-21 10:06:23 +00:00
|
|
|
* <http://www.gnu.org/licenses/>.
|
2009-11-03 18:59:18 +00:00
|
|
|
*
|
|
|
|
|
* Author: Daniel P. Berrange <berrange@redhat.com>
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#ifndef QEMU_MONITOR_JSON_H
|
2010-03-09 18:22:22 +00:00
|
|
|
# define QEMU_MONITOR_JSON_H
|
2009-11-03 18:59:18 +00:00
|
|
|
|
2010-03-09 18:22:22 +00:00
|
|
|
# include "internal.h"
|
2009-11-03 18:59:18 +00:00
|
|
|
|
2010-03-09 18:22:22 +00:00
|
|
|
# include "qemu_monitor.h"
|
2012-12-04 11:56:32 +00:00
|
|
|
# include "virbitmap.h"
|
2013-07-22 11:07:23 +00:00
|
|
|
# include "cpu/cpu.h"
|
2009-11-03 18:59:18 +00:00
|
|
|
|
|
|
|
|
int qemuMonitorJSONIOProcess(qemuMonitorPtr mon,
|
|
|
|
|
const char *data,
|
|
|
|
|
size_t len,
|
|
|
|
|
qemuMonitorMessagePtr msg);
|
|
|
|
|
|
2011-03-09 20:24:04 +00:00
|
|
|
int qemuMonitorJSONHumanCommandWithFd(qemuMonitorPtr mon,
|
|
|
|
|
const char *cmd,
|
|
|
|
|
int scm_fd,
|
|
|
|
|
char **reply);
|
|
|
|
|
|
2010-02-12 13:45:20 +00:00
|
|
|
int qemuMonitorJSONSetCapabilities(qemuMonitorPtr mon);
|
|
|
|
|
|
2009-11-03 18:59:18 +00:00
|
|
|
int qemuMonitorJSONStartCPUs(qemuMonitorPtr mon,
|
|
|
|
|
virConnectPtr conn);
|
|
|
|
|
int qemuMonitorJSONStopCPUs(qemuMonitorPtr mon);
|
2011-09-27 09:42:04 +00:00
|
|
|
int qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
|
|
|
|
|
bool *running,
|
|
|
|
|
virDomainPausedReason *reason);
|
2009-11-03 18:59:18 +00:00
|
|
|
|
|
|
|
|
int qemuMonitorJSONSystemPowerdown(qemuMonitorPtr mon);
|
2011-06-15 16:49:58 +00:00
|
|
|
int qemuMonitorJSONSystemReset(qemuMonitorPtr mon);
|
2009-11-03 18:59:18 +00:00
|
|
|
|
|
|
|
|
int qemuMonitorJSONGetCPUInfo(qemuMonitorPtr mon,
|
|
|
|
|
int **pids);
|
2011-06-17 14:31:45 +00:00
|
|
|
int qemuMonitorJSONGetVirtType(qemuMonitorPtr mon,
|
|
|
|
|
int *virtType);
|
2009-11-03 18:59:18 +00:00
|
|
|
int qemuMonitorJSONGetBalloonInfo(qemuMonitorPtr mon,
|
2012-03-02 20:27:39 +00:00
|
|
|
unsigned long long *currmem);
|
2010-04-12 11:31:15 +00:00
|
|
|
int qemuMonitorJSONGetMemoryStats(qemuMonitorPtr mon,
|
2013-07-11 23:18:48 +00:00
|
|
|
char *balloonpath,
|
2010-04-12 11:31:15 +00:00
|
|
|
virDomainMemoryStatPtr stats,
|
|
|
|
|
unsigned int nr_stats);
|
2013-06-27 15:00:31 +00:00
|
|
|
int qemuMonitorJSONSetMemoryStatsPeriod(qemuMonitorPtr mon,
|
|
|
|
|
char *balloonpath,
|
|
|
|
|
int period);
|
2011-09-13 13:49:50 +00:00
|
|
|
int qemuMonitorJSONGetBlockInfo(qemuMonitorPtr mon,
|
2012-01-18 21:01:30 +00:00
|
|
|
virHashTablePtr table);
|
2009-11-03 18:59:18 +00:00
|
|
|
int qemuMonitorJSONGetBlockStatsInfo(qemuMonitorPtr mon,
|
2011-09-16 12:05:58 +00:00
|
|
|
const char *dev_name,
|
2009-11-03 18:59:18 +00:00
|
|
|
long long *rd_req,
|
|
|
|
|
long long *rd_bytes,
|
2011-09-05 08:22:17 +00:00
|
|
|
long long *rd_total_times,
|
2009-11-03 18:59:18 +00:00
|
|
|
long long *wr_req,
|
|
|
|
|
long long *wr_bytes,
|
2011-09-05 08:22:17 +00:00
|
|
|
long long *wr_total_times,
|
|
|
|
|
long long *flush_req,
|
|
|
|
|
long long *flush_total_times,
|
2009-11-03 18:59:18 +00:00
|
|
|
long long *errs);
|
2011-09-05 08:22:17 +00:00
|
|
|
int qemuMonitorJSONGetBlockStatsParamsNumber(qemuMonitorPtr mon,
|
|
|
|
|
int *nparams);
|
2010-05-14 13:10:01 +00:00
|
|
|
int qemuMonitorJSONGetBlockExtent(qemuMonitorPtr mon,
|
2011-09-16 12:05:58 +00:00
|
|
|
const char *dev_name,
|
2010-05-14 13:10:01 +00:00
|
|
|
unsigned long long *extent);
|
2011-11-29 07:34:53 +00:00
|
|
|
int qemuMonitorJSONBlockResize(qemuMonitorPtr mon,
|
|
|
|
|
const char *devce,
|
|
|
|
|
unsigned long long size);
|
2009-11-03 18:59:18 +00:00
|
|
|
|
|
|
|
|
int qemuMonitorJSONSetVNCPassword(qemuMonitorPtr mon,
|
|
|
|
|
const char *password);
|
2011-01-10 11:12:32 +00:00
|
|
|
int qemuMonitorJSONSetPassword(qemuMonitorPtr mon,
|
|
|
|
|
const char *protocol,
|
|
|
|
|
const char *password,
|
|
|
|
|
const char *action_if_connected);
|
|
|
|
|
int qemuMonitorJSONExpirePassword(qemuMonitorPtr mon,
|
|
|
|
|
const char *protocol,
|
|
|
|
|
const char *expire_time);
|
2009-11-03 18:59:18 +00:00
|
|
|
int qemuMonitorJSONSetBalloon(qemuMonitorPtr mon,
|
|
|
|
|
unsigned long newmem);
|
2013-05-27 13:35:35 +00:00
|
|
|
int qemuMonitorJSONSetCPU(qemuMonitorPtr mon, int cpu, bool online);
|
2009-11-03 18:59:18 +00:00
|
|
|
|
|
|
|
|
int qemuMonitorJSONEjectMedia(qemuMonitorPtr mon,
|
2011-09-16 12:05:58 +00:00
|
|
|
const char *dev_name,
|
2010-11-08 17:52:48 +00:00
|
|
|
bool force);
|
2009-11-03 18:59:18 +00:00
|
|
|
int qemuMonitorJSONChangeMedia(qemuMonitorPtr mon,
|
2011-09-16 12:05:58 +00:00
|
|
|
const char *dev_name,
|
2009-11-03 18:59:18 +00:00
|
|
|
const char *newmedia,
|
|
|
|
|
const char *format);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
int qemuMonitorJSONSaveVirtualMemory(qemuMonitorPtr mon,
|
|
|
|
|
unsigned long long offset,
|
|
|
|
|
size_t length,
|
|
|
|
|
const char *path);
|
|
|
|
|
int qemuMonitorJSONSavePhysicalMemory(qemuMonitorPtr mon,
|
|
|
|
|
unsigned long long offset,
|
|
|
|
|
size_t length,
|
|
|
|
|
const char *path);
|
|
|
|
|
|
|
|
|
|
int qemuMonitorJSONSetMigrationSpeed(qemuMonitorPtr mon,
|
|
|
|
|
unsigned long bandwidth);
|
|
|
|
|
|
2010-03-17 15:53:14 +00:00
|
|
|
int qemuMonitorJSONSetMigrationDowntime(qemuMonitorPtr mon,
|
|
|
|
|
unsigned long long downtime);
|
|
|
|
|
|
2013-02-18 20:54:58 +00:00
|
|
|
int qemuMonitorJSONGetMigrationCacheSize(qemuMonitorPtr mon,
|
|
|
|
|
unsigned long long *cacheSize);
|
|
|
|
|
int qemuMonitorJSONSetMigrationCacheSize(qemuMonitorPtr mon,
|
|
|
|
|
unsigned long long cacheSize);
|
|
|
|
|
|
2009-11-03 18:59:18 +00:00
|
|
|
int qemuMonitorJSONGetMigrationStatus(qemuMonitorPtr mon,
|
2013-02-08 08:58:03 +00:00
|
|
|
qemuMonitorMigrationStatusPtr status);
|
2009-11-03 18:59:18 +00:00
|
|
|
|
2013-01-14 11:45:20 +00:00
|
|
|
int qemuMonitorJSONGetMigrationCapability(qemuMonitorPtr mon,
|
|
|
|
|
qemuMonitorMigrationCaps capability);
|
|
|
|
|
int qemuMonitorJSONSetMigrationCapability(qemuMonitorPtr mon,
|
|
|
|
|
qemuMonitorMigrationCaps capability);
|
|
|
|
|
|
2011-03-04 18:51:48 +00:00
|
|
|
int qemuMonitorJSONMigrate(qemuMonitorPtr mon,
|
|
|
|
|
unsigned int flags,
|
|
|
|
|
const char *uri);
|
2012-09-20 09:15:31 +00:00
|
|
|
int qemuMonitorJSONGetSpiceMigrationStatus(qemuMonitorPtr mon,
|
|
|
|
|
bool *spice_migrated);
|
|
|
|
|
|
2009-11-03 18:59:18 +00:00
|
|
|
|
|
|
|
|
int qemuMonitorJSONMigrateCancel(qemuMonitorPtr mon);
|
|
|
|
|
|
2014-03-23 03:51:13 +00:00
|
|
|
int qemuMonitorJSONGetDumpGuestMemoryCapability(qemuMonitorPtr mon,
|
|
|
|
|
const char *capability);
|
|
|
|
|
|
2012-06-12 03:04:51 +00:00
|
|
|
int qemuMonitorJSONDump(qemuMonitorPtr mon,
|
2014-03-23 03:51:14 +00:00
|
|
|
const char *protocol,
|
|
|
|
|
const char *dumpformat);
|
2012-06-12 03:04:51 +00:00
|
|
|
|
2011-02-17 13:39:36 +00:00
|
|
|
int qemuMonitorJSONGraphicsRelocate(qemuMonitorPtr mon,
|
|
|
|
|
int type,
|
|
|
|
|
const char *hostname,
|
|
|
|
|
int port,
|
|
|
|
|
int tlsPort,
|
|
|
|
|
const char *tlsSubject);
|
|
|
|
|
|
2009-11-03 18:59:18 +00:00
|
|
|
int qemuMonitorJSONAddUSBDisk(qemuMonitorPtr mon,
|
|
|
|
|
const char *path);
|
|
|
|
|
|
|
|
|
|
int qemuMonitorJSONAddUSBDeviceExact(qemuMonitorPtr mon,
|
|
|
|
|
int bus,
|
|
|
|
|
int dev);
|
|
|
|
|
int qemuMonitorJSONAddUSBDeviceMatch(qemuMonitorPtr mon,
|
|
|
|
|
int vendor,
|
|
|
|
|
int product);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
int qemuMonitorJSONAddPCIHostDevice(qemuMonitorPtr mon,
|
2012-08-16 15:41:06 +00:00
|
|
|
virDevicePCIAddress *hostAddr,
|
|
|
|
|
virDevicePCIAddress *guestAddr);
|
2009-11-03 18:59:18 +00:00
|
|
|
|
|
|
|
|
int qemuMonitorJSONAddPCIDisk(qemuMonitorPtr mon,
|
|
|
|
|
const char *path,
|
|
|
|
|
const char *bus,
|
2012-08-16 15:41:06 +00:00
|
|
|
virDevicePCIAddress *guestAddr);
|
2009-11-03 18:59:18 +00:00
|
|
|
|
|
|
|
|
int qemuMonitorJSONAddPCINetwork(qemuMonitorPtr mon,
|
|
|
|
|
const char *nicstr,
|
2012-08-16 15:41:06 +00:00
|
|
|
virDevicePCIAddress *guestAddr);
|
2009-11-03 18:59:18 +00:00
|
|
|
|
|
|
|
|
int qemuMonitorJSONRemovePCIDevice(qemuMonitorPtr mon,
|
2012-08-16 15:41:06 +00:00
|
|
|
virDevicePCIAddress *guestAddr);
|
2009-11-03 18:59:18 +00:00
|
|
|
|
|
|
|
|
int qemuMonitorJSONSendFileHandle(qemuMonitorPtr mon,
|
|
|
|
|
const char *fdname,
|
|
|
|
|
int fd);
|
2013-01-31 00:18:44 +00:00
|
|
|
int qemuMonitorJSONAddFd(qemuMonitorPtr mon, int fdset, int fd,
|
|
|
|
|
const char *name);
|
2009-11-03 18:59:18 +00:00
|
|
|
|
|
|
|
|
int qemuMonitorJSONCloseFileHandle(qemuMonitorPtr mon,
|
|
|
|
|
const char *fdname);
|
2013-01-31 00:18:44 +00:00
|
|
|
int qemuMonitorJSONRemoveFd(qemuMonitorPtr mon, int fdset, int fd);
|
2009-11-03 18:59:18 +00:00
|
|
|
|
2010-04-15 13:52:03 +00:00
|
|
|
int qemuMonitorJSONAddNetdev(qemuMonitorPtr mon,
|
|
|
|
|
const char *netdevstr);
|
|
|
|
|
|
|
|
|
|
int qemuMonitorJSONRemoveNetdev(qemuMonitorPtr mon,
|
|
|
|
|
const char *alias);
|
|
|
|
|
|
2010-01-22 13:22:53 +00:00
|
|
|
int qemuMonitorJSONGetPtyPaths(qemuMonitorPtr mon,
|
|
|
|
|
virHashTablePtr paths);
|
|
|
|
|
|
2009-12-07 19:28:05 +00:00
|
|
|
int qemuMonitorJSONAttachPCIDiskController(qemuMonitorPtr mon,
|
|
|
|
|
const char *bus,
|
2012-08-16 15:41:06 +00:00
|
|
|
virDevicePCIAddress *guestAddr);
|
2009-12-07 19:28:05 +00:00
|
|
|
|
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 qemuMonitorJSONGetAllPCIAddresses(qemuMonitorPtr mon,
|
|
|
|
|
qemuMonitorPCIAddress **addrs);
|
|
|
|
|
|
2010-01-26 15:34:46 +00:00
|
|
|
int qemuMonitorJSONAddDevice(qemuMonitorPtr mon,
|
|
|
|
|
const char *devicestr);
|
|
|
|
|
|
2010-03-02 08:40:51 +00:00
|
|
|
int qemuMonitorJSONDelDevice(qemuMonitorPtr mon,
|
2010-04-14 14:36:42 +00:00
|
|
|
const char *devalias);
|
2010-03-02 08:40:51 +00:00
|
|
|
|
2010-01-26 15:34:46 +00:00
|
|
|
int qemuMonitorJSONAddDrive(qemuMonitorPtr mon,
|
|
|
|
|
const char *drivestr);
|
|
|
|
|
|
2010-12-08 21:30:12 +00:00
|
|
|
int qemuMonitorJSONDriveDel(qemuMonitorPtr mon,
|
2010-10-22 14:14:22 +00:00
|
|
|
const char *drivestr);
|
|
|
|
|
|
2010-02-11 14:28:16 +00:00
|
|
|
int qemuMonitorJSONSetDrivePassphrase(qemuMonitorPtr mon,
|
|
|
|
|
const char *alias,
|
|
|
|
|
const char *passphrase);
|
|
|
|
|
|
2010-04-02 14:10:37 +00:00
|
|
|
int qemuMonitorJSONCreateSnapshot(qemuMonitorPtr mon, const char *name);
|
|
|
|
|
int qemuMonitorJSONLoadSnapshot(qemuMonitorPtr mon, const char *name);
|
|
|
|
|
int qemuMonitorJSONDeleteSnapshot(qemuMonitorPtr mon, const char *name);
|
|
|
|
|
|
2011-08-15 23:25:54 +00:00
|
|
|
int qemuMonitorJSONDiskSnapshot(qemuMonitorPtr mon,
|
2012-03-17 04:17:28 +00:00
|
|
|
virJSONValuePtr actions,
|
2011-08-15 23:25:54 +00:00
|
|
|
const char *device,
|
snapshot: improve qemu handling of reused snapshot targets
The oVirt developers have stated that the real reasons they want
to have qemu reuse existing volumes when creating a snapshot are:
1. the management framework is set up so that creation has to be
done from a central node for proper resource tracking, and having
libvirt and/or qemu create things violates the framework, and
2. qemu defaults to creating snapshots with an absolute path to
the backing file, but oVirt wants to manage a backing chain that
uses just relative names, to allow for easier migration of a chain
across storage locations.
When 0.9.10 added VIR_DOMAIN_SNAPSHOT_CREATE_REUSE_EXT (commit
4e9953a4), it only addressed point 1, but libvirt was still using
O_TRUNC which violates point 2. Meanwhile, the new qemu
'transaction' monitor command includes a new optional mode argument
that will force qemu to reuse the metadata of the file it just
opened (with the burden on the caller to have valid metadata there
in the first place). So, this tweaks the meaning of the flag to
cover both points as intended for use by oVirt. It is not strictly
backward-compatible to 0.9.10 behavior, but it can be argued that
the O_TRUNC of 0.9.10 was a bug.
Note that this flag is all-or-nothing, and only selects between
'existing' and the default 'absolute-paths'. A more flexible
approach that would allow per-disk selections, as well as adding
support for the 'no-backing-file' mode, would be possible by
extending the <domainsnapshot> xml to have a per-disk mode, but
until we have a management application expressing a need for that
additional complexity, it is not worth doing.
* src/libvirt.c (virDomainSnapshotCreateXML): Tweak documentation.
* src/qemu/qemu_monitor.h (qemuMonitorDiskSnapshot): Add
parameters.
* src/qemu/qemu_monitor_json.h (qemuMonitorJSONDiskSnapshot):
Likewise.
* src/qemu/qemu_monitor.c (qemuMonitorDiskSnapshot): Pass them
through.
* src/qemu/qemu_monitor_json.c (qemuMonitorJSONDiskSnapshot): Use
new monitor command arguments.
* src/qemu/qemu_driver.c (qemuDomainSnapshotCreateDiskActive)
(qemuDomainSnapshotCreateSingleDiskActive): Adjust callers.
(qemuDomainSnapshotDiskPrepare): Allow qed, modify rules on reuse.
2012-03-20 21:03:45 +00:00
|
|
|
const char *file,
|
|
|
|
|
const char *format,
|
blockjob: add qemu capabilities related to block jobs
Upstream qemu 1.3 is adding two new monitor commands, 'drive-mirror'
and 'block-job-complete'[1], which can drive live block copy and
storage migration. [Additionally, RHEL 6.3 had backported an earlier
version of most of the same functionality, but under the names
'__com.redhat_drive-mirror' and '__com.redhat_drive-reopen' and with
slightly different JSON arguments, and has been using patches similar
to these upstream patches for several months now.]
The libvirt API virDomainBlockRebase as already committed for 0.9.12
is flexible enough to expose the basics of block copy, but some
additional features in the 'drive-mirror' qemu command, such as
setting error policy, setting granularity, or using a persistent
bitmap, may later require a new libvirt API virDomainBlockCopy. I
will wait to add that API until we know more about what qemu 1.3
will finally provide.
This patch caters only to the upstream qemu 1.3 interface, although
I have proven that the changes for RHEL 6.3 can be isolated to
just qemu_monitor_json.c, and the rest of this series will
gracefully handle either interface once the JSON differences are
papered over in a downstream patch.
For consistency with other block job commands, libvirt must handle
the bandwidth argument as MiB/sec from the user, even though qemu
exposes the speed argument as bytes/sec; then again, qemu rounds
up to cluster size internally, so using MiB hides the worst effects
of that rounding if you pass small numbers.
[1]https://lists.gnu.org/archive/html/qemu-devel/2012-10/msg04123.html
* src/qemu/qemu_capabilities.h (QEMU_CAPS_DRIVE_MIRROR)
(QEMU_CAPS_DRIVE_REOPEN): New bits.
* src/qemu/qemu_capabilities.c (qemuCaps): Name them.
* src/qemu/qemu_monitor_json.c (qemuMonitorJSONCheckCommands): Set
them.
(qemuMonitorJSONDriveMirror, qemuMonitorDrivePivot): New functions.
* src/qemu/qemu_monitor_json.h (qemuMonitorJSONDriveMirror)
(qemuMonitorDrivePivot): Declare them.
* src/qemu/qemu_monitor.c (qemuMonitorDriveMirror)
(qemuMonitorDrivePivot): New passthroughs.
* src/qemu/qemu_monitor.h (qemuMonitorDriveMirror)
(qemuMonitorDrivePivot): Declare them.
2012-09-28 23:29:53 +00:00
|
|
|
bool reuse)
|
|
|
|
|
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3)
|
|
|
|
|
ATTRIBUTE_NONNULL(4) ATTRIBUTE_NONNULL(5);
|
|
|
|
|
int qemuMonitorJSONTransaction(qemuMonitorPtr mon, virJSONValuePtr actions)
|
|
|
|
|
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
|
|
|
|
|
int qemuMonitorJSONDriveMirror(qemuMonitorPtr mon,
|
|
|
|
|
const char *device,
|
|
|
|
|
const char *file,
|
|
|
|
|
const char *format,
|
|
|
|
|
unsigned long long speed,
|
|
|
|
|
unsigned int flags)
|
|
|
|
|
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3);
|
|
|
|
|
int qemuMonitorJSONDrivePivot(qemuMonitorPtr mon,
|
|
|
|
|
const char *device,
|
|
|
|
|
const char *file,
|
|
|
|
|
const char *format)
|
2013-10-17 13:21:46 +00:00
|
|
|
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
|
2011-08-15 23:25:54 +00:00
|
|
|
|
2012-10-03 21:13:21 +00:00
|
|
|
int qemuMonitorJSONBlockCommit(qemuMonitorPtr mon,
|
|
|
|
|
const char *device,
|
|
|
|
|
const char *top,
|
|
|
|
|
const char *base,
|
|
|
|
|
unsigned long long bandwidth)
|
qemu: don't munge user input during block commit
While investigating https://bugzilla.redhat.com/show_bug.cgi?id=1061827
I noticed that we pass user input unscathed for block-pull, but
always pass a canonical absolute name through for block-commit.
[Note that we probably _ought_ to validate that the user's request
for block-pull actually matches the backing chain, the way we already
do for block-commit - but that's a separate issue. Further note that
the ability to pass user input through unscathed allows backdoors
such as specifying a backing image that is a network URI such as
a gluster disk, instead of forcing things to the local file system;
which is an area still under active investigation on whether libvirt
needs to behave differently for network disks.]
Since qemu may write the name that the user passed in as the backing
file, a user may have a reason to want a relative file name passed
through to qemu, and always munging things to absolute prevents that.
Put another way, if you have the backing chain:
[A] <- [B(back=./A)] <- [C(back=./B)]
and commit B into A (virsh blockcommit $dom vda --base A --top B),
the metadata of C will have to be re-written. But should it be
rewritten as [C(back=./A)] or as [C(back=/path/to/A)]? Still up in
the air is whether qemu's decision should be based on whether B
and/or C had relative paths, or on whether the --base and/or
--top arguments to the command were relative paths; but if we always
pass a canonical name, we've prevented the spelling of the command
arguments from being part of the hueristics that qemu uses.
I also audited the code, and verified that we never call
qemuMonitorBlockCommit() with a NULL base, either before or after
the change to qemu_driver.c.
* src/qemu/qemu_driver.c (qemuDomainBlockCommit): Preserve user's
spelling, since absolute vs. relative matters to qemu.
* src/qemu/qemu_monitor.h (qemuMonitorBlockCommit): Base is never
null.
* src/qemu/qemu_monitor.c (qemuMonitorBlockCommit): Likewise.
* src/qemu/qemu_monitor_json.h (qemuMonitorJSONBlockCommit):
Likewise.
* src/qemu/qemu_monitor_json.c (qemuMonitorJSONBlockCommit):
Likewise.
Signed-off-by: Eric Blake <eblake@redhat.com>
2014-03-06 23:33:16 +00:00
|
|
|
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3)
|
|
|
|
|
ATTRIBUTE_NONNULL(4);
|
2012-10-03 21:13:21 +00:00
|
|
|
|
2010-04-17 02:12:45 +00:00
|
|
|
int qemuMonitorJSONArbitraryCommand(qemuMonitorPtr mon,
|
|
|
|
|
const char *cmd_str,
|
2011-02-02 15:37:10 +00:00
|
|
|
char **reply_str,
|
|
|
|
|
bool hmp);
|
2010-04-17 02:12:45 +00:00
|
|
|
|
2011-05-10 08:26:06 +00:00
|
|
|
int qemuMonitorJSONInjectNMI(qemuMonitorPtr mon);
|
2011-04-01 06:23:58 +00:00
|
|
|
|
2011-07-21 07:55:56 +00:00
|
|
|
int qemuMonitorJSONSendKey(qemuMonitorPtr mon,
|
|
|
|
|
unsigned int holdtime,
|
|
|
|
|
unsigned int *keycodes,
|
|
|
|
|
unsigned int nkeycodes);
|
|
|
|
|
|
2011-04-01 06:23:58 +00:00
|
|
|
int qemuMonitorJSONScreendump(qemuMonitorPtr mon,
|
|
|
|
|
const char *file);
|
|
|
|
|
|
2011-07-22 05:39:37 +00:00
|
|
|
int qemuMonitorJSONBlockJob(qemuMonitorPtr mon,
|
|
|
|
|
const char *device,
|
2012-02-18 16:20:01 +00:00
|
|
|
const char *base,
|
blockjob: fix block-stream bandwidth race
With RHEL 6.2, virDomainBlockPull(dom, dev, bandwidth, 0) has a race
with non-zero bandwidth: there is a window between the block_stream
and block_job_set_speed monitor commands where an unlimited amount
of data was let through, defeating the point of a throttle.
This race was first identified in commit a9d3495e, and libvirt was
able to reduce the size of the window for that race. In the meantime,
the qemu developers decided to fix things properly; per this message:
https://lists.gnu.org/archive/html/qemu-devel/2012-04/msg03793.html
the fix will be in qemu 1.1, and changes block-job-set-speed to use
a different parameter name, as well as adding a new optional parameter
to block-stream, which eliminates the race altogether.
Since our documentation already mentioned that we can refuse a non-zero
bandwidth for some hypervisors, I think the best solution is to do
just that for RHEL 6.2 qemu, so that the race is obvious to the user
(anyone using stock RHEL 6.2 binaries won't have this patch, and anyone
building their own libvirt with this patch for RHEL can also rebuild
qemu to get the modern semantics, so it is no real loss in behavior).
Meanwhile the code must be fixed to honor actual qemu 1.1 naming.
Rename the parameter to 'modern', since the naming difference now
covers more than just 'async' block-job-cancel. And while at it,
fix an unchecked integer overflow.
* src/qemu/qemu_monitor.h (enum BLOCK_JOB_CMD): Drop unused value,
rename enum to match conventions.
* src/qemu/qemu_monitor.c (qemuMonitorBlockJob): Reflect enum rename.
* src/qemu_qemu_monitor_json.h (qemuMonitorJSONBlockJob): Likewise.
* src/qemu/qemu_monitor_json.c (qemuMonitorJSONBlockJob): Likewise,
and support difference between RHEL 6.2 and qemu 1.1 block pull.
* src/qemu/qemu_driver.c (qemuDomainBlockJobImpl): Reject
bandwidth during pull with too-old qemu.
* src/libvirt.c (virDomainBlockPull, virDomainBlockRebase):
Document this.
2012-04-25 22:49:44 +00:00
|
|
|
unsigned long long speed,
|
2011-07-22 05:39:37 +00:00
|
|
|
virDomainBlockJobInfoPtr info,
|
blockjob: fix block-stream bandwidth race
With RHEL 6.2, virDomainBlockPull(dom, dev, bandwidth, 0) has a race
with non-zero bandwidth: there is a window between the block_stream
and block_job_set_speed monitor commands where an unlimited amount
of data was let through, defeating the point of a throttle.
This race was first identified in commit a9d3495e, and libvirt was
able to reduce the size of the window for that race. In the meantime,
the qemu developers decided to fix things properly; per this message:
https://lists.gnu.org/archive/html/qemu-devel/2012-04/msg03793.html
the fix will be in qemu 1.1, and changes block-job-set-speed to use
a different parameter name, as well as adding a new optional parameter
to block-stream, which eliminates the race altogether.
Since our documentation already mentioned that we can refuse a non-zero
bandwidth for some hypervisors, I think the best solution is to do
just that for RHEL 6.2 qemu, so that the race is obvious to the user
(anyone using stock RHEL 6.2 binaries won't have this patch, and anyone
building their own libvirt with this patch for RHEL can also rebuild
qemu to get the modern semantics, so it is no real loss in behavior).
Meanwhile the code must be fixed to honor actual qemu 1.1 naming.
Rename the parameter to 'modern', since the naming difference now
covers more than just 'async' block-job-cancel. And while at it,
fix an unchecked integer overflow.
* src/qemu/qemu_monitor.h (enum BLOCK_JOB_CMD): Drop unused value,
rename enum to match conventions.
* src/qemu/qemu_monitor.c (qemuMonitorBlockJob): Reflect enum rename.
* src/qemu_qemu_monitor_json.h (qemuMonitorJSONBlockJob): Likewise.
* src/qemu/qemu_monitor_json.c (qemuMonitorJSONBlockJob): Likewise,
and support difference between RHEL 6.2 and qemu 1.1 block pull.
* src/qemu/qemu_driver.c (qemuDomainBlockJobImpl): Reject
bandwidth during pull with too-old qemu.
* src/libvirt.c (virDomainBlockPull, virDomainBlockRebase):
Document this.
2012-04-25 22:49:44 +00:00
|
|
|
qemuMonitorBlockJobCmd mode,
|
|
|
|
|
bool modern)
|
2012-04-11 21:40:16 +00:00
|
|
|
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
|
2011-04-01 06:23:58 +00:00
|
|
|
|
2011-09-06 08:18:57 +00:00
|
|
|
int qemuMonitorJSONSetLink(qemuMonitorPtr mon,
|
|
|
|
|
const char *name,
|
|
|
|
|
enum virDomainNetInterfaceLinkState state);
|
|
|
|
|
|
2011-10-21 08:00:13 +00:00
|
|
|
int qemuMonitorJSONOpenGraphics(qemuMonitorPtr mon,
|
|
|
|
|
const char *protocol,
|
|
|
|
|
const char *fdname,
|
|
|
|
|
bool skipauth);
|
|
|
|
|
|
2011-11-15 09:02:45 +00:00
|
|
|
int qemuMonitorJSONSetBlockIoThrottle(qemuMonitorPtr mon,
|
|
|
|
|
const char *device,
|
|
|
|
|
virDomainBlockIoTuneInfoPtr info);
|
|
|
|
|
|
|
|
|
|
int qemuMonitorJSONGetBlockIoThrottle(qemuMonitorPtr mon,
|
|
|
|
|
const char *device,
|
|
|
|
|
virDomainBlockIoTuneInfoPtr reply);
|
|
|
|
|
|
2012-02-10 12:33:52 +00:00
|
|
|
int qemuMonitorJSONSystemWakeup(qemuMonitorPtr mon);
|
|
|
|
|
|
2012-08-15 14:04:09 +00:00
|
|
|
int qemuMonitorJSONGetVersion(qemuMonitorPtr mon,
|
|
|
|
|
int *major,
|
|
|
|
|
int *minor,
|
|
|
|
|
int *micro,
|
|
|
|
|
char **package)
|
|
|
|
|
ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4);
|
|
|
|
|
|
2012-08-15 15:18:41 +00:00
|
|
|
int qemuMonitorJSONGetMachines(qemuMonitorPtr mon,
|
|
|
|
|
qemuMonitorMachineInfoPtr **machines)
|
|
|
|
|
ATTRIBUTE_NONNULL(2);
|
|
|
|
|
|
2012-08-20 14:58:20 +00:00
|
|
|
int qemuMonitorJSONGetCPUDefinitions(qemuMonitorPtr mon,
|
|
|
|
|
char ***cpus)
|
|
|
|
|
ATTRIBUTE_NONNULL(2);
|
|
|
|
|
|
2012-08-22 09:25:20 +00:00
|
|
|
int qemuMonitorJSONGetCommands(qemuMonitorPtr mon,
|
|
|
|
|
char ***commands)
|
|
|
|
|
ATTRIBUTE_NONNULL(2);
|
2012-08-22 09:48:41 +00:00
|
|
|
int qemuMonitorJSONGetEvents(qemuMonitorPtr mon,
|
|
|
|
|
char ***events)
|
|
|
|
|
ATTRIBUTE_NONNULL(2);
|
2013-04-26 17:13:45 +00:00
|
|
|
int qemuMonitorJSONGetCommandLineOptionParameters(qemuMonitorPtr mon,
|
|
|
|
|
const char *option,
|
|
|
|
|
char ***params)
|
|
|
|
|
ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3);
|
2012-08-22 09:25:20 +00:00
|
|
|
|
Make non-KVM machines work with QMP probing
When there is no 'qemu-kvm' binary and the emulator used for a machine
is, for example, 'qemu-system-x86_64' that, by default, runs without
kvm enabled, libvirt still supplies '-no-kvm' option to this process,
even though it does not recognize such option (making the start of a
domain fail in that case).
This patch fixes building a command-line for QEMU machines without KVM
acceleration and is based on following assumptions:
- QEMU_CAPS_KVM flag means that QEMU is running KVM accelerated
machines by default (without explicitly requesting that using a
command-line option). It is the closest to the truth according to
the code with the only exception being the comment next to the
flag, so it's fixed in this patch as well.
- QEMU_CAPS_ENABLE_KVM flag means that QEMU is, by default, running
without KVM acceleration and in case we need KVM acceleration it
needs to be explicitly instructed to do so. This is partially
true for the past (this option essentially means that QEMU
recognizes the '-enable-kvm' option, even though it's almost the
same).
2012-10-31 07:31:49 +00:00
|
|
|
int qemuMonitorJSONGetKVMState(qemuMonitorPtr mon,
|
|
|
|
|
bool *enabled,
|
|
|
|
|
bool *present)
|
|
|
|
|
ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3);
|
|
|
|
|
|
2012-08-22 09:48:41 +00:00
|
|
|
int qemuMonitorJSONGetObjectTypes(qemuMonitorPtr mon,
|
|
|
|
|
char ***types)
|
|
|
|
|
ATTRIBUTE_NONNULL(2);
|
2013-06-24 17:51:56 +00:00
|
|
|
|
|
|
|
|
/* ListPath structures and API's are public only for qemumonitorjsontest */
|
|
|
|
|
typedef struct _qemuMonitorJSONListPath qemuMonitorJSONListPath;
|
|
|
|
|
typedef qemuMonitorJSONListPath *qemuMonitorJSONListPathPtr;
|
|
|
|
|
|
|
|
|
|
struct _qemuMonitorJSONListPath {
|
|
|
|
|
char *name;
|
|
|
|
|
char *type;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
int qemuMonitorJSONGetObjectListPaths(qemuMonitorPtr mon,
|
|
|
|
|
const char *path,
|
|
|
|
|
qemuMonitorJSONListPathPtr **paths)
|
|
|
|
|
ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3);
|
|
|
|
|
|
|
|
|
|
void qemuMonitorJSONListPathFree(qemuMonitorJSONListPathPtr paths);
|
|
|
|
|
|
2013-07-03 18:42:40 +00:00
|
|
|
/* ObjectProperty structures and Get/Set API's are public only
|
|
|
|
|
* for qemumonitorjsontest
|
|
|
|
|
*/
|
2013-07-03 18:15:07 +00:00
|
|
|
/* Flags for the 'type' field in _qemuMonitorJSONObjectProperty */
|
|
|
|
|
typedef enum {
|
|
|
|
|
QEMU_MONITOR_OBJECT_PROPERTY_BOOLEAN=1,
|
|
|
|
|
QEMU_MONITOR_OBJECT_PROPERTY_INT,
|
|
|
|
|
QEMU_MONITOR_OBJECT_PROPERTY_LONG,
|
|
|
|
|
QEMU_MONITOR_OBJECT_PROPERTY_UINT,
|
|
|
|
|
QEMU_MONITOR_OBJECT_PROPERTY_ULONG,
|
|
|
|
|
QEMU_MONITOR_OBJECT_PROPERTY_DOUBLE,
|
|
|
|
|
QEMU_MONITOR_OBJECT_PROPERTY_STRING,
|
|
|
|
|
|
|
|
|
|
QEMU_MONITOR_OBJECT_PROPERTY_LAST
|
|
|
|
|
} qemuMonitorJSONObjectPropertyType;
|
|
|
|
|
|
|
|
|
|
typedef struct _qemuMonitorJSONObjectProperty qemuMonitorJSONObjectProperty;
|
|
|
|
|
typedef qemuMonitorJSONObjectProperty *qemuMonitorJSONObjectPropertyPtr;
|
|
|
|
|
struct _qemuMonitorJSONObjectProperty {
|
|
|
|
|
int type; /* qemuMonitorJSONObjectPropertyType */
|
|
|
|
|
union {
|
|
|
|
|
bool b;
|
|
|
|
|
int iv;
|
|
|
|
|
long long l;
|
|
|
|
|
unsigned int ui;
|
|
|
|
|
unsigned long long ul;
|
|
|
|
|
double d;
|
|
|
|
|
char *str;
|
|
|
|
|
} val;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
int qemuMonitorJSONGetObjectProperty(qemuMonitorPtr mon,
|
|
|
|
|
const char *path,
|
|
|
|
|
const char *property,
|
|
|
|
|
qemuMonitorJSONObjectPropertyPtr prop)
|
|
|
|
|
ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4);
|
|
|
|
|
|
2013-07-03 18:42:40 +00:00
|
|
|
int qemuMonitorJSONSetObjectProperty(qemuMonitorPtr mon,
|
|
|
|
|
const char *path,
|
|
|
|
|
const char *property,
|
|
|
|
|
qemuMonitorJSONObjectPropertyPtr prop)
|
|
|
|
|
ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4);
|
|
|
|
|
|
2012-08-22 09:48:41 +00:00
|
|
|
int qemuMonitorJSONGetObjectProps(qemuMonitorPtr mon,
|
|
|
|
|
const char *type,
|
|
|
|
|
char ***props)
|
|
|
|
|
ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3);
|
2012-08-22 09:48:41 +00:00
|
|
|
char *qemuMonitorJSONGetTargetArch(qemuMonitorPtr mon);
|
2012-08-22 09:48:41 +00:00
|
|
|
|
2012-11-22 15:08:52 +00:00
|
|
|
int qemuMonitorJSONNBDServerStart(qemuMonitorPtr mon,
|
|
|
|
|
const char *host,
|
|
|
|
|
unsigned int port);
|
2012-11-22 15:17:13 +00:00
|
|
|
int qemuMonitorJSONNBDServerAdd(qemuMonitorPtr mon,
|
|
|
|
|
const char *deviceID,
|
|
|
|
|
bool writable);
|
2013-01-31 13:47:49 +00:00
|
|
|
int qemuMonitorJSONNBDServerStop(qemuMonitorPtr mon);
|
2013-04-12 20:55:45 +00:00
|
|
|
int qemuMonitorJSONGetTPMModels(qemuMonitorPtr mon,
|
|
|
|
|
char ***tpmmodels)
|
|
|
|
|
ATTRIBUTE_NONNULL(2);
|
|
|
|
|
|
|
|
|
|
int qemuMonitorJSONGetTPMTypes(qemuMonitorPtr mon,
|
|
|
|
|
char ***tpmtypes)
|
|
|
|
|
ATTRIBUTE_NONNULL(2);
|
|
|
|
|
|
2013-03-12 18:48:04 +00:00
|
|
|
int qemuMonitorJSONAttachCharDev(qemuMonitorPtr mon,
|
|
|
|
|
const char *chrID,
|
|
|
|
|
virDomainChrSourceDefPtr chr);
|
2013-03-12 18:57:48 +00:00
|
|
|
int qemuMonitorJSONDetachCharDev(qemuMonitorPtr mon,
|
|
|
|
|
const char *chrID);
|
2013-07-19 13:01:38 +00:00
|
|
|
|
|
|
|
|
int qemuMonitorJSONGetDeviceAliases(qemuMonitorPtr mon,
|
|
|
|
|
char ***aliases);
|
|
|
|
|
|
2013-11-11 13:47:08 +00:00
|
|
|
int qemuMonitorJSONGetGuestCPU(qemuMonitorPtr mon,
|
|
|
|
|
virArch arch,
|
|
|
|
|
virCPUDataPtr *data);
|
2009-11-03 18:59:18 +00:00
|
|
|
#endif /* QEMU_MONITOR_JSON_H */
|
