2010-12-16 15:07:07 +00:00
|
|
|
/*
|
|
|
|
|
* qemu_capabilities.h: QEMU capabilities generation
|
|
|
|
|
*
|
2014-01-30 11:19:12 +00:00
|
|
|
* Copyright (C) 2006-2014 Red Hat, Inc.
|
2010-12-16 15:07:07 +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/>.
|
2010-12-16 15:07:07 +00:00
|
|
|
*
|
|
|
|
|
* Author: Daniel P. Berrange <berrange@redhat.com>
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#ifndef __QEMU_CAPABILITIES_H__
|
|
|
|
|
# define __QEMU_CAPABILITIES_H__
|
|
|
|
|
|
2012-08-20 16:44:14 +00:00
|
|
|
# include "virobject.h"
|
2010-12-16 15:07:07 +00:00
|
|
|
# include "capabilities.h"
|
2012-12-12 16:27:01 +00:00
|
|
|
# include "vircommand.h"
|
2012-09-13 14:54:02 +00:00
|
|
|
# include "qemu_monitor.h"
|
2010-12-16 15:07:07 +00:00
|
|
|
|
|
|
|
|
/* Internal flags to keep track of qemu command line capabilities */
|
2014-06-15 16:32:56 +00:00
|
|
|
typedef enum {
|
2012-01-20 23:30:44 +00:00
|
|
|
QEMU_CAPS_KQEMU = 0, /* Whether KQEMU is compiled in */
|
|
|
|
|
QEMU_CAPS_VNC_COLON = 1, /* VNC takes or address + display */
|
|
|
|
|
QEMU_CAPS_NO_REBOOT = 2, /* Is the -no-reboot flag available */
|
|
|
|
|
QEMU_CAPS_DRIVE = 3, /* Is the new -drive arg available */
|
|
|
|
|
QEMU_CAPS_DRIVE_BOOT = 4, /* Does -drive support boot=on */
|
|
|
|
|
QEMU_CAPS_NAME = 5, /* Is the -name flag available */
|
|
|
|
|
QEMU_CAPS_UUID = 6, /* Is the -uuid flag available */
|
|
|
|
|
QEMU_CAPS_DOMID = 7, /* Xenner: -domid flag available */
|
|
|
|
|
QEMU_CAPS_VNET_HDR = 8,
|
|
|
|
|
QEMU_CAPS_MIGRATE_KVM_STDIO = 9, /* avoid kvm tcp migration bug */
|
|
|
|
|
QEMU_CAPS_MIGRATE_QEMU_TCP = 10, /* have qemu tcp migration */
|
|
|
|
|
QEMU_CAPS_MIGRATE_QEMU_EXEC = 11, /* have qemu exec migration */
|
|
|
|
|
QEMU_CAPS_DRIVE_CACHE_V2 = 12, /* cache= flag wanting new v2 values */
|
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
|
|
|
QEMU_CAPS_KVM = 13, /* Whether KVM is enabled by default */
|
2012-01-20 23:30:44 +00:00
|
|
|
QEMU_CAPS_DRIVE_FORMAT = 14, /* Is -drive format= avail */
|
|
|
|
|
QEMU_CAPS_VGA = 15, /* Is -vga avail */
|
2010-12-16 15:07:07 +00:00
|
|
|
|
|
|
|
|
/* features added in qemu-0.10.0 or later */
|
2012-01-20 23:30:44 +00:00
|
|
|
QEMU_CAPS_0_10 = 16,
|
|
|
|
|
QEMU_CAPS_NET_NAME = QEMU_CAPS_0_10, /* -net ...,name=str */
|
|
|
|
|
QEMU_CAPS_HOST_NET_ADD = QEMU_CAPS_0_10, /* host_net_add command */
|
|
|
|
|
|
|
|
|
|
QEMU_CAPS_PCIDEVICE = 17, /* PCI device assignment supported */
|
|
|
|
|
QEMU_CAPS_MEM_PATH = 18, /* mmap'ped guest backing supported */
|
|
|
|
|
QEMU_CAPS_DRIVE_SERIAL = 19, /* -driver serial= available */
|
|
|
|
|
QEMU_CAPS_XEN_DOMID = 20, /* -xen-domid */
|
|
|
|
|
QEMU_CAPS_MIGRATE_QEMU_UNIX = 21, /* qemu migration via unix sockets */
|
|
|
|
|
QEMU_CAPS_CHARDEV = 22, /* Is the new -chardev arg available */
|
|
|
|
|
QEMU_CAPS_ENABLE_KVM = 23, /* -enable-kvm flag */
|
|
|
|
|
QEMU_CAPS_MONITOR_JSON = 24, /* JSON mode for monitor */
|
|
|
|
|
QEMU_CAPS_BALLOON = 25, /* -balloon available */
|
|
|
|
|
QEMU_CAPS_DEVICE = 26, /* Is the new -device arg available */
|
|
|
|
|
QEMU_CAPS_SDL = 27, /* Is the new -sdl arg available */
|
|
|
|
|
QEMU_CAPS_SMP_TOPOLOGY = 28, /* -smp has sockets/cores/threads */
|
|
|
|
|
QEMU_CAPS_NETDEV = 29, /* -netdev flag & netdev_add/remove */
|
|
|
|
|
QEMU_CAPS_RTC = 30, /* The -rtc flag for clock options */
|
|
|
|
|
QEMU_CAPS_VHOST_NET = 31, /* vhost-net support available */
|
|
|
|
|
QEMU_CAPS_RTC_TD_HACK = 32, /* -rtc-td-hack available */
|
|
|
|
|
QEMU_CAPS_NO_HPET = 33, /* -no-hpet flag is supported */
|
|
|
|
|
QEMU_CAPS_NO_KVM_PIT = 34, /* -no-kvm-pit-reinjection supported */
|
|
|
|
|
QEMU_CAPS_TDF = 35, /* -tdf flag (user-mode pit catchup) */
|
|
|
|
|
QEMU_CAPS_PCI_CONFIGFD = 36, /* pci-assign.configfd */
|
|
|
|
|
QEMU_CAPS_NODEFCONFIG = 37, /* -nodefconfig */
|
|
|
|
|
QEMU_CAPS_BOOT_MENU = 38, /* -boot menu=on support */
|
|
|
|
|
QEMU_CAPS_ENABLE_KQEMU = 39, /* -enable-kqemu flag */
|
|
|
|
|
QEMU_CAPS_FSDEV = 40, /* -fstype filesystem passthrough */
|
|
|
|
|
QEMU_CAPS_NESTING = 41, /* -enable-nesting (SVM/VMX) */
|
|
|
|
|
QEMU_CAPS_NAME_PROCESS = 42, /* Is -name process= available */
|
|
|
|
|
QEMU_CAPS_DRIVE_READONLY = 43, /* -drive readonly=on|off */
|
|
|
|
|
QEMU_CAPS_SMBIOS_TYPE = 44, /* Is -smbios type= available */
|
|
|
|
|
QEMU_CAPS_VGA_QXL = 45, /* The 'qxl' arg for '-vga' */
|
|
|
|
|
QEMU_CAPS_SPICE = 46, /* Is -spice avail */
|
|
|
|
|
QEMU_CAPS_VGA_NONE = 47, /* The 'none' arg for '-vga' */
|
|
|
|
|
QEMU_CAPS_MIGRATE_QEMU_FD = 48, /* -incoming fd:n */
|
|
|
|
|
QEMU_CAPS_BOOTINDEX = 49, /* -device bootindex property */
|
|
|
|
|
QEMU_CAPS_HDA_DUPLEX = 50, /* -device hda-duplex */
|
|
|
|
|
QEMU_CAPS_DRIVE_AIO = 51, /* -drive aio= supported */
|
|
|
|
|
QEMU_CAPS_PCI_MULTIBUS = 52, /* bus=pci.0 vs bus=pci */
|
|
|
|
|
QEMU_CAPS_PCI_BOOTINDEX = 53, /* pci-assign.bootindex */
|
|
|
|
|
QEMU_CAPS_CCID_EMULATED = 54, /* -device ccid-card-emulated */
|
|
|
|
|
QEMU_CAPS_CCID_PASSTHRU = 55, /* -device ccid-card-passthru */
|
|
|
|
|
QEMU_CAPS_CHARDEV_SPICEVMC = 56, /* newer -chardev spicevmc */
|
|
|
|
|
QEMU_CAPS_DEVICE_SPICEVMC = 57, /* older -device spicevmc*/
|
|
|
|
|
QEMU_CAPS_VIRTIO_TX_ALG = 58, /* -device virtio-net-pci,tx=string */
|
|
|
|
|
QEMU_CAPS_DEVICE_QXL_VGA = 59, /* primary qxl device named qxl-vga? */
|
|
|
|
|
QEMU_CAPS_PCI_MULTIFUNCTION = 60, /* -device multifunction=on|off */
|
|
|
|
|
QEMU_CAPS_VIRTIO_IOEVENTFD = 61, /* virtio-{net|blk}-pci.ioeventfd=on */
|
|
|
|
|
QEMU_CAPS_SGA = 62, /* Serial Graphics Adapter */
|
2011-08-13 06:32:45 +00:00
|
|
|
QEMU_CAPS_VIRTIO_BLK_EVENT_IDX = 63, /* virtio-blk-pci.event_idx */
|
|
|
|
|
QEMU_CAPS_VIRTIO_NET_EVENT_IDX = 64, /* virtio-net-pci.event_idx */
|
2011-09-02 13:36:58 +00:00
|
|
|
QEMU_CAPS_DRIVE_CACHE_DIRECTSYNC = 65, /* Is cache=directsync supported? */
|
2012-01-20 23:30:44 +00:00
|
|
|
QEMU_CAPS_PIIX3_USB_UHCI = 66, /* -device piix3-usb-uhci */
|
|
|
|
|
QEMU_CAPS_PIIX4_USB_UHCI = 67, /* -device piix4-usb-uhci */
|
|
|
|
|
QEMU_CAPS_USB_EHCI = 68, /* -device usb-ehci */
|
|
|
|
|
QEMU_CAPS_ICH9_USB_EHCI1 = 69, /* -device ich9-usb-ehci1 and friends */
|
2011-09-02 14:20:40 +00:00
|
|
|
QEMU_CAPS_VT82C686B_USB_UHCI = 70, /* -device vt82c686b-usb-uhci */
|
2012-01-20 23:30:44 +00:00
|
|
|
QEMU_CAPS_PCI_OHCI = 71, /* -device pci-ohci */
|
|
|
|
|
QEMU_CAPS_USB_REDIR = 72, /* -device usb-redir */
|
|
|
|
|
QEMU_CAPS_USB_HUB = 73, /* -device usb-hub */
|
|
|
|
|
QEMU_CAPS_NO_SHUTDOWN = 74, /* usable -no-shutdown */
|
2011-09-22 19:33:47 +00:00
|
|
|
QEMU_CAPS_DRIVE_CACHE_UNSAFE = 75, /* Is cache=unsafe supported? */
|
2011-09-20 17:31:52 +00:00
|
|
|
QEMU_CAPS_PCI_ROMBAR = 76, /* -device rombar=0|1 */
|
2012-01-20 23:30:44 +00:00
|
|
|
QEMU_CAPS_ICH9_AHCI = 77, /* -device ich9-ahci */
|
|
|
|
|
QEMU_CAPS_NO_ACPI = 78, /* -no-acpi */
|
|
|
|
|
QEMU_CAPS_FSDEV_READONLY = 79, /* -fsdev readonly supported */
|
2011-11-29 18:37:27 +00:00
|
|
|
QEMU_CAPS_VIRTIO_BLK_SCSI = 80, /* virtio-blk-pci.scsi */
|
2012-01-20 23:30:44 +00:00
|
|
|
QEMU_CAPS_VIRTIO_BLK_SG_IO = 81, /* SG_IO commands, since 0.11 */
|
2012-01-12 09:31:14 +00:00
|
|
|
QEMU_CAPS_DRIVE_COPY_ON_READ = 82, /* -drive copy-on-read */
|
2012-01-20 23:30:44 +00:00
|
|
|
QEMU_CAPS_CPU_HOST = 83, /* support for -cpu host */
|
2012-01-17 12:44:18 +00:00
|
|
|
QEMU_CAPS_FSDEV_WRITEOUT = 84, /* -fsdev writeout supported */
|
2012-01-20 23:30:44 +00:00
|
|
|
QEMU_CAPS_DRIVE_IOTUNE = 85, /* -drive bps= and friends */
|
2012-02-13 11:19:24 +00:00
|
|
|
QEMU_CAPS_WAKEUP = 86, /* system_wakeup monitor command */
|
2012-02-27 10:20:21 +00:00
|
|
|
QEMU_CAPS_SCSI_DISK_CHANNEL = 87, /* Is scsi-disk.channel available? */
|
2012-03-12 14:19:56 +00:00
|
|
|
QEMU_CAPS_SCSI_BLOCK = 88, /* -device scsi-block */
|
2012-03-14 22:29:21 +00:00
|
|
|
QEMU_CAPS_TRANSACTION = 89, /* transaction monitor command */
|
2012-04-11 21:40:16 +00:00
|
|
|
QEMU_CAPS_BLOCKJOB_SYNC = 90, /* RHEL 6.2 block_job_cancel */
|
|
|
|
|
QEMU_CAPS_BLOCKJOB_ASYNC = 91, /* qemu 1.1 block-job-cancel */
|
2012-04-17 09:08:05 +00:00
|
|
|
QEMU_CAPS_SCSI_CD = 92, /* -device scsi-cd */
|
2012-04-17 09:16:52 +00:00
|
|
|
QEMU_CAPS_IDE_CD = 93, /* -device ide-cd */
|
2012-04-26 10:11:49 +00:00
|
|
|
QEMU_CAPS_NO_USER_CONFIG = 94, /* -no-user-config */
|
2012-05-15 22:55:08 +00:00
|
|
|
QEMU_CAPS_HDA_MICRO = 95, /* -device hda-micro */
|
2012-06-12 03:06:33 +00:00
|
|
|
QEMU_CAPS_DUMP_GUEST_MEMORY = 96, /* dump-guest-memory command */
|
2012-06-21 13:45:25 +00:00
|
|
|
QEMU_CAPS_NEC_USB_XHCI = 97, /* -device nec-usb-xhci */
|
2012-06-29 15:02:05 +00:00
|
|
|
QEMU_CAPS_VIRTIO_S390 = 98, /* -device virtio-*-s390 */
|
2012-07-12 15:45:57 +00:00
|
|
|
QEMU_CAPS_BALLOON_EVENT = 99, /* Async event for balloon changes */
|
2012-08-03 20:33:05 +00:00
|
|
|
QEMU_CAPS_NETDEV_BRIDGE = 100, /* bridge helper support */
|
2012-08-08 06:25:24 +00:00
|
|
|
QEMU_CAPS_SCSI_LSI = 101, /* -device lsi */
|
2013-03-14 18:32:24 +00:00
|
|
|
QEMU_CAPS_VIRTIO_SCSI = 102, /* -device virtio-scsi-* */
|
2012-09-04 14:30:55 +00:00
|
|
|
QEMU_CAPS_BLOCKIO = 103, /* -device ...logical_block_size & co */
|
2012-08-02 10:14:39 +00:00
|
|
|
QEMU_CAPS_DISABLE_S3 = 104, /* S3 BIOS Advertisement on/off */
|
|
|
|
|
QEMU_CAPS_DISABLE_S4 = 105, /* S4 BIOS Advertisement on/off */
|
2012-08-19 15:42:44 +00:00
|
|
|
QEMU_CAPS_USB_REDIR_FILTER = 106, /* usb-redir.filter */
|
2012-09-18 02:12:11 +00:00
|
|
|
QEMU_CAPS_IDE_DRIVE_WWN = 107, /* Is ide-drive.wwn available? */
|
|
|
|
|
QEMU_CAPS_SCSI_DISK_WWN = 108, /* Is scsi-disk.wwn available? */
|
2012-09-18 07:24:51 +00:00
|
|
|
QEMU_CAPS_SECCOMP_SANDBOX = 109, /* -sandbox */
|
2012-09-18 10:31:30 +00:00
|
|
|
QEMU_CAPS_REBOOT_TIMEOUT = 110, /* -boot reboot-timeout */
|
2012-08-15 07:59:24 +00:00
|
|
|
QEMU_CAPS_DUMP_GUEST_CORE = 111, /* dump-guest-core-parameter */
|
2012-09-20 09:15:31 +00:00
|
|
|
QEMU_CAPS_SEAMLESS_MIGRATION = 112, /* seamless-migration for SPICE */
|
2012-10-03 21:13:21 +00:00
|
|
|
QEMU_CAPS_BLOCK_COMMIT = 113, /* block-commit */
|
2012-10-19 19:40:52 +00:00
|
|
|
QEMU_CAPS_VNC = 114, /* Is -vnc available? */
|
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
|
|
|
QEMU_CAPS_DRIVE_MIRROR = 115, /* drive-mirror monitor command */
|
2012-11-14 14:51:30 +00:00
|
|
|
QEMU_CAPS_USB_REDIR_BOOTINDEX = 116, /* usb-redir.bootindex */
|
|
|
|
|
QEMU_CAPS_USB_HOST_BOOTINDEX = 117, /* usb-host.bootindex */
|
2012-12-03 21:25:30 +00:00
|
|
|
QEMU_CAPS_DISK_SNAPSHOT = 118, /* blockdev-snapshot-sync command */
|
2012-12-14 07:06:31 +00:00
|
|
|
QEMU_CAPS_DEVICE_QXL = 119, /* -device qxl */
|
|
|
|
|
QEMU_CAPS_DEVICE_VGA = 120, /* -device VGA */
|
|
|
|
|
QEMU_CAPS_DEVICE_CIRRUS_VGA = 121, /* -device cirrus-vga */
|
|
|
|
|
QEMU_CAPS_DEVICE_VMWARE_SVGA = 122, /* -device vmware-svga */
|
|
|
|
|
QEMU_CAPS_DEVICE_VIDEO_PRIMARY = 123, /* safe to use -device XXX
|
|
|
|
|
for primary video device */
|
2013-01-07 17:17:15 +00:00
|
|
|
QEMU_CAPS_SCLP_S390 = 124, /* -device sclp* */
|
2013-01-03 06:57:25 +00:00
|
|
|
QEMU_CAPS_DEVICE_USB_SERIAL = 125, /* -device usb-serial */
|
2013-01-03 07:13:05 +00:00
|
|
|
QEMU_CAPS_DEVICE_USB_NET = 126, /* -device usb-net */
|
2013-01-29 16:52:17 +00:00
|
|
|
QEMU_CAPS_ADD_FD = 127, /* -add-fd */
|
2012-11-21 13:28:44 +00:00
|
|
|
QEMU_CAPS_NBD_SERVER = 128, /* nbd-server-start QMP command */
|
2013-01-11 16:48:21 +00:00
|
|
|
QEMU_CAPS_DEVICE_VIRTIO_RNG = 129, /* virtio-rng device */
|
|
|
|
|
QEMU_CAPS_OBJECT_RNG_RANDOM = 130, /* the rng-random backend for
|
|
|
|
|
virtio rng */
|
2013-02-13 10:22:23 +00:00
|
|
|
QEMU_CAPS_OBJECT_RNG_EGD = 131, /* EGD protocol daemon for rng */
|
2013-03-05 15:44:21 +00:00
|
|
|
QEMU_CAPS_VIRTIO_CCW = 132, /* -device virtio-*-ccw */
|
2013-03-14 04:49:43 +00:00
|
|
|
QEMU_CAPS_DTB = 133, /* -dtb file */
|
2013-03-21 14:11:39 +00:00
|
|
|
QEMU_CAPS_SCSI_MEGASAS = 134, /* -device megasas */
|
2013-03-22 13:52:25 +00:00
|
|
|
QEMU_CAPS_IPV6_MIGRATION = 135, /* -incoming [::] */
|
2013-03-29 05:22:46 +00:00
|
|
|
QEMU_CAPS_MACHINE_OPT = 136, /* -machine xxxx*/
|
2013-04-07 08:31:57 +00:00
|
|
|
QEMU_CAPS_MACHINE_USB_OPT = 137, /* -machine xxx,usb=on/off */
|
2013-04-12 20:55:45 +00:00
|
|
|
QEMU_CAPS_DEVICE_TPM_PASSTHROUGH = 138, /* -tpmdev passthrough */
|
|
|
|
|
QEMU_CAPS_DEVICE_TPM_TIS = 139, /* -device tpm_tis */
|
2013-04-25 08:46:04 +00:00
|
|
|
QEMU_CAPS_DEVICE_NVRAM = 140, /* -global spapr-nvram.reg=xxxx */
|
2013-03-07 11:03:41 +00:00
|
|
|
QEMU_CAPS_DEVICE_PCI_BRIDGE = 141, /* -device pci-bridge */
|
2013-04-17 18:16:28 +00:00
|
|
|
QEMU_CAPS_DEVICE_VFIO_PCI = 142, /* -device vfio-pci */
|
|
|
|
|
QEMU_CAPS_VFIO_PCI_BOOTINDEX = 143, /* bootindex param for vfio-pci device */
|
2013-05-03 18:07:21 +00:00
|
|
|
QEMU_CAPS_DEVICE_SCSI_GENERIC = 144, /* -device scsi-generic */
|
|
|
|
|
QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX = 145, /* -device scsi-generic.bootindex */
|
2013-05-14 05:25:49 +00:00
|
|
|
QEMU_CAPS_MEM_MERGE = 146, /* -machine mem-merge */
|
2013-04-30 14:26:43 +00:00
|
|
|
QEMU_CAPS_VNC_WEBSOCKET = 147, /* -vnc x:y,websocket */
|
2013-05-14 12:44:54 +00:00
|
|
|
QEMU_CAPS_DRIVE_DISCARD = 148, /* -drive discard=off(ignore)|on(unmap) */
|
2013-05-16 20:01:05 +00:00
|
|
|
QEMU_CAPS_MLOCK = 149, /* -realtime mlock=on|off */
|
2013-05-21 14:31:47 +00:00
|
|
|
QEMU_CAPS_VNC_SHARE_POLICY = 150, /* set display sharing policy */
|
2013-07-11 15:07:26 +00:00
|
|
|
QEMU_CAPS_DEVICE_DEL_EVENT = 151, /* DEVICE_DELETED event */
|
qemu: add dmi-to-pci-bridge controller
This PCI controller, named "dmi-to-pci-bridge" in the libvirt config,
and implemented with qemu's "i82801b11-bridge" device, connects to a
PCI Express slot (e.g. one of the slots provided by the pcie-root
controller, aka "pcie.0" on the qemu commandline), and provides 31
*non-hot-pluggable* PCI (*not* PCIe) slots, numbered 1-31.
Any time a machine is defined which has a pcie-root controller
(i.e. any q35-based machinetype), libvirt will automatically add a
dmi-to-pci-bridge controller if one doesn't exist, and also add a
pci-bridge controller. The reasoning here is that any useful domain
will have either an immediate (startup time) or eventual (subsequent
hot-plug) need for a standard PCI slot; since the pcie-root controller
only provides PCIe slots, we need to connect a dmi-to-pci-bridge
controller to it in order to get a non-hot-plug PCI slot that we can
then use to connect a pci-bridge - the slots provided by the
pci-bridge will be both standard PCI and hot-pluggable.
Since pci-bridge devices themselves can not be hot-plugged into a
running system (although you can hot-plug other devices into a
pci-bridge's slots), any new pci-bridge controller that is added can
(and will) be plugged into the dmi-to-pci-bridge as long as it has
empty slots available.
This patch is also changing the qemuxml2xml-pcie test from a "DO_TEST"
to a "DO_DIFFERENT_TEST". This is so that the "before" xml can omit
the automatically added dmi-to-pci-bridge and pci-bridge devices, and
the "after" xml can include it - this way we are testing if libvirt is
properly adding these devices.
2013-07-31 01:37:32 +00:00
|
|
|
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE = 152, /* -device i82801b11-bridge */
|
2013-08-12 11:48:34 +00:00
|
|
|
QEMU_CAPS_I440FX_PCI_HOLE64_SIZE = 153, /* i440FX-pcihost.pci-hole64-size */
|
|
|
|
|
QEMU_CAPS_Q35_PCI_HOLE64_SIZE = 154, /* q35-pcihost.pci-hole64-size */
|
2013-08-23 10:38:10 +00:00
|
|
|
QEMU_CAPS_DEVICE_USB_STORAGE = 155, /* -device usb-storage */
|
2013-08-23 10:38:11 +00:00
|
|
|
QEMU_CAPS_USB_STORAGE_REMOVABLE = 156, /* usb-storage.removable */
|
2013-08-01 01:40:35 +00:00
|
|
|
QEMU_CAPS_DEVICE_VIRTIO_MMIO = 157, /* -device virtio-mmio */
|
2013-09-24 14:17:38 +00:00
|
|
|
QEMU_CAPS_DEVICE_ICH9_INTEL_HDA = 158, /* -device ich9-intel-hda */
|
2013-07-01 16:28:50 +00:00
|
|
|
QEMU_CAPS_KVM_PIT_TICK_POLICY = 159, /* kvm-pit.lost_tick_policy */
|
qemu: add "-boot strict" to commandline whenever possible
This resolves:
https://bugzilla.redhat.com/show_bug.cgi?id=888635
(which was already closed as CANTFIX because the qemu "-boot strict"
commandline option wasn't available at the time).
Problem: you couldn't have a domain that used PXE to boot, but also
had an un-bootable disk device *even if that disk wasn't listed in the
boot order*, because if PXE timed out (e.g. due to the bridge
forwarding delay), the BIOS would move on to the next target, which
would be the unbootable disk device (again - even though it wasn't
given a boot order), and get stuck at a "BOOT DISK FAILURE, PRESS ANY
KEY" message until a user intervened.
The solution available since sometime around QEMU 1.5, is to add
"-boot strict=on" to *every* qemu command. When this is done, if any
devices have a boot order specified, then QEMU will *only* attempt to
boot from those devices that have an explicit boot order, ignoring the
rest.
2013-12-02 12:07:12 +00:00
|
|
|
QEMU_CAPS_BOOT_STRICT = 160, /* -boot strict */
|
2013-12-09 09:11:15 +00:00
|
|
|
QEMU_CAPS_DEVICE_PANIC = 161, /* -device pvpanic */
|
qemu: ask for -enable-fips when FIPS is required
On a system that is enforcing FIPS, most libraries honor the
current mode by default. Qemu, on the other hand, refused to
honor FIPS mode unless you add the '-enable-fips' command
line option; worse, this option is not discoverable via QMP,
and is only present on binaries built for Linux. So, if we
detect FIPS mode, then we unconditionally ask for FIPS; either
qemu is new enough to have the option and then correctly
cripple insecure VNC passwords, or it is so old that we are
correctly avoiding a FIPS violation by preventing qemu from
starting. Meanwhile, if we don't detect FIPS mode, then
omitting the argument is safe whether the qemu has the option
(but it would do nothing because FIPS is disabled) or whether
qemu lacks the option (including in the case where we are not
running on Linux).
The testsuite was a bit interesting: we don't want our test
to depend on whether it is being run in FIPS mode, so I had
to tweak things to set the capability bit outside of our
normal interaction with capability parsing.
This fixes https://bugzilla.redhat.com/show_bug.cgi?id=1035474
* src/qemu/qemu_capabilities.h (QEMU_CAPS_ENABLE_FIPS): New bit.
* src/qemu/qemu_capabilities.c (virQEMUCapsInitQMP): Conditionally
set capability according to detection of FIPS mode.
* src/qemu/qemu_command.c (qemuBuildCommandLine): Use it.
* tests/qemucapabilitiestest.c (testQemuCaps): Conditionally set
capability to test expected output.
* tests/qemucapabilitiesdata/caps_1.2.2-1.caps: Update list.
* tests/qemucapabilitiesdata/caps_1.6.0-1.caps: Likewise.
Signed-off-by: Eric Blake <eblake@redhat.com>
2013-12-05 21:47:09 +00:00
|
|
|
QEMU_CAPS_ENABLE_FIPS = 162, /* -enable-fips */
|
2014-01-16 16:11:14 +00:00
|
|
|
QEMU_CAPS_SPICE_FILE_XFER_DISABLE = 163, /* -spice disable-agent-file-xfer */
|
2014-01-30 11:19:12 +00:00
|
|
|
QEMU_CAPS_CHARDEV_SPICEPORT = 164, /* -chardev spiceport */
|
2014-02-17 10:17:55 +00:00
|
|
|
QEMU_CAPS_DEVICE_USB_KBD = 165, /* -device usb-kbd */
|
qemu: add host-pci-multidomain capability
Quite a long time ago, (apparently between qemu 0.12 and 0.13) qemu
quietly began supporting the optional specification of a domain in the
host-side address of all pci passthrough commands (by simply
prepending it to the bus:slot.function format, as
"dddd:bb:ss.f"). Since machines with multiple PCI domains are very
rare, this never came up in practice, so libvirt was never updated to
support it.
This patch takes the first step to supporting specification of a non-0
domain in the host-side address of PCI devices being assigned to a
domain, by adding a capability bit to indicate support
"QEMU_CAPS_HOST_PCI_MULTIDOMAIN", and detect it. Since this support
was added in a version prior to the minimum version required for
QMP-style capabilities detection, the capability is always enabled for
any qemu that uses QMP for capabilities detection. For older qemus,
the only clue that a domain can be specified in the host pci address
is the presence of the string "[seg:]" in the help string for
-pcidevice. (Ironically, libvirt will not be modified to support
specification of domain for -pcidevice, since any qemu new enough for
us to care about also supports "-device pci-assign" or "-device
vfio-pci", which are greatly preferred).
2014-04-29 15:11:45 +00:00
|
|
|
QEMU_CAPS_HOST_PCI_MULTIDOMAIN = 166, /* support domain > 0 in host pci address */
|
2014-04-09 13:23:45 +00:00
|
|
|
QEMU_CAPS_MSG_TIMESTAMP = 167, /* -msg timestamp */
|
2013-04-25 08:46:04 +00:00
|
|
|
|
2011-02-08 14:22:39 +00:00
|
|
|
QEMU_CAPS_LAST, /* this must always be the last item */
|
2014-06-15 16:32:56 +00:00
|
|
|
} virQEMUCapsFlags;
|
2010-12-16 15:07:07 +00:00
|
|
|
|
2013-02-01 13:48:58 +00:00
|
|
|
typedef struct _virQEMUCaps virQEMUCaps;
|
|
|
|
|
typedef virQEMUCaps *virQEMUCapsPtr;
|
2011-02-08 14:22:39 +00:00
|
|
|
|
2013-02-01 13:48:58 +00:00
|
|
|
typedef struct _virQEMUCapsCache virQEMUCapsCache;
|
|
|
|
|
typedef virQEMUCapsCache *virQEMUCapsCachePtr;
|
2012-08-22 12:54:13 +00:00
|
|
|
|
2013-02-01 13:48:58 +00:00
|
|
|
virQEMUCapsPtr virQEMUCapsNew(void);
|
|
|
|
|
virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps);
|
|
|
|
|
virQEMUCapsPtr virQEMUCapsNewForBinary(const char *binary,
|
|
|
|
|
const char *libDir,
|
2014-03-05 16:51:59 +00:00
|
|
|
const char *cacheDir,
|
2013-02-01 13:48:58 +00:00
|
|
|
uid_t runUid,
|
|
|
|
|
gid_t runGid);
|
2011-02-08 14:22:39 +00:00
|
|
|
|
2013-09-19 11:14:25 +00:00
|
|
|
int virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps,
|
|
|
|
|
qemuMonitorPtr mon);
|
|
|
|
|
|
2013-02-01 13:48:58 +00:00
|
|
|
int virQEMUCapsProbeQMP(virQEMUCapsPtr qemuCaps,
|
|
|
|
|
qemuMonitorPtr mon);
|
2012-09-13 14:54:02 +00:00
|
|
|
|
2013-02-01 13:48:58 +00:00
|
|
|
void virQEMUCapsSet(virQEMUCapsPtr qemuCaps,
|
2014-06-15 16:32:56 +00:00
|
|
|
virQEMUCapsFlags flag) ATTRIBUTE_NONNULL(1);
|
2011-02-08 14:22:39 +00:00
|
|
|
|
2013-02-01 13:48:58 +00:00
|
|
|
void virQEMUCapsSetList(virQEMUCapsPtr qemuCaps, ...) ATTRIBUTE_NONNULL(1);
|
2011-02-08 14:08:12 +00:00
|
|
|
|
2013-02-01 13:48:58 +00:00
|
|
|
void virQEMUCapsClear(virQEMUCapsPtr qemuCaps,
|
2014-06-15 16:32:56 +00:00
|
|
|
virQEMUCapsFlags flag) ATTRIBUTE_NONNULL(1);
|
2011-02-08 14:08:12 +00:00
|
|
|
|
2013-02-01 13:48:58 +00:00
|
|
|
bool virQEMUCapsGet(virQEMUCapsPtr qemuCaps,
|
2014-06-15 16:32:56 +00:00
|
|
|
virQEMUCapsFlags flag);
|
2011-02-08 14:08:12 +00:00
|
|
|
|
2014-04-23 15:35:37 +00:00
|
|
|
bool virQEMUCapsHasPCIMultiBus(virQEMUCapsPtr qemuCaps,
|
|
|
|
|
virDomainDefPtr def);
|
|
|
|
|
|
2013-02-01 13:48:58 +00:00
|
|
|
char *virQEMUCapsFlagsString(virQEMUCapsPtr qemuCaps);
|
2012-08-20 16:44:14 +00:00
|
|
|
|
2013-02-01 13:48:58 +00:00
|
|
|
const char *virQEMUCapsGetBinary(virQEMUCapsPtr qemuCaps);
|
|
|
|
|
virArch virQEMUCapsGetArch(virQEMUCapsPtr qemuCaps);
|
|
|
|
|
unsigned int virQEMUCapsGetVersion(virQEMUCapsPtr qemuCaps);
|
|
|
|
|
unsigned int virQEMUCapsGetKVMVersion(virQEMUCapsPtr qemuCaps);
|
|
|
|
|
int virQEMUCapsAddCPUDefinition(virQEMUCapsPtr qemuCaps,
|
|
|
|
|
const char *name);
|
|
|
|
|
size_t virQEMUCapsGetCPUDefinitions(virQEMUCapsPtr qemuCaps,
|
|
|
|
|
char ***names);
|
|
|
|
|
size_t virQEMUCapsGetMachineTypes(virQEMUCapsPtr qemuCaps,
|
|
|
|
|
char ***names);
|
|
|
|
|
const char *virQEMUCapsGetCanonicalMachine(virQEMUCapsPtr qemuCaps,
|
|
|
|
|
const char *name);
|
2013-06-26 15:46:35 +00:00
|
|
|
int virQEMUCapsGetMachineMaxCpus(virQEMUCapsPtr qemuCaps,
|
|
|
|
|
const char *name);
|
2013-02-01 13:48:58 +00:00
|
|
|
int virQEMUCapsGetMachineTypesCaps(virQEMUCapsPtr qemuCaps,
|
|
|
|
|
size_t *nmachines,
|
|
|
|
|
virCapsGuestMachinePtr **machines);
|
2012-08-22 13:37:05 +00:00
|
|
|
|
2013-02-01 13:48:58 +00:00
|
|
|
bool virQEMUCapsIsValid(virQEMUCapsPtr qemuCaps);
|
2012-09-10 10:47:56 +00:00
|
|
|
|
2012-08-22 12:54:13 +00:00
|
|
|
|
2013-02-01 13:48:58 +00:00
|
|
|
virQEMUCapsCachePtr virQEMUCapsCacheNew(const char *libDir,
|
2014-03-05 16:51:59 +00:00
|
|
|
const char *cacheDir,
|
2013-02-01 13:48:58 +00:00
|
|
|
uid_t uid, gid_t gid);
|
|
|
|
|
virQEMUCapsPtr virQEMUCapsCacheLookup(virQEMUCapsCachePtr cache,
|
|
|
|
|
const char *binary);
|
|
|
|
|
virQEMUCapsPtr virQEMUCapsCacheLookupCopy(virQEMUCapsCachePtr cache,
|
|
|
|
|
const char *binary);
|
2014-06-30 14:12:07 +00:00
|
|
|
virQEMUCapsPtr virQEMUCapsCacheLookupByArch(virQEMUCapsCachePtr cache,
|
|
|
|
|
virArch arch);
|
2013-02-01 13:48:58 +00:00
|
|
|
void virQEMUCapsCacheFree(virQEMUCapsCachePtr cache);
|
2012-08-22 12:54:13 +00:00
|
|
|
|
2013-02-01 13:48:58 +00:00
|
|
|
virCapsPtr virQEMUCapsInit(virQEMUCapsCachePtr cache);
|
2010-12-16 15:07:07 +00:00
|
|
|
|
2013-02-01 13:48:58 +00:00
|
|
|
int virQEMUCapsGetDefaultVersion(virCapsPtr caps,
|
|
|
|
|
virQEMUCapsCachePtr capsCache,
|
|
|
|
|
unsigned int *version);
|
2010-12-16 15:07:07 +00:00
|
|
|
|
2012-08-22 16:23:00 +00:00
|
|
|
/* Only for use by test suite */
|
2013-02-01 13:48:58 +00:00
|
|
|
int virQEMUCapsParseHelpStr(const char *qemu,
|
|
|
|
|
const char *str,
|
|
|
|
|
virQEMUCapsPtr qemuCaps,
|
|
|
|
|
unsigned int *version,
|
2013-05-24 10:47:17 +00:00
|
|
|
bool *is_kvm,
|
2013-02-01 13:48:58 +00:00
|
|
|
unsigned int *kvm_version,
|
|
|
|
|
bool check_yajl);
|
2012-08-22 16:23:00 +00:00
|
|
|
/* Only for use by test suite */
|
2013-02-01 13:48:58 +00:00
|
|
|
int virQEMUCapsParseDeviceStr(virQEMUCapsPtr qemuCaps, const char *str);
|
2010-12-16 15:07:07 +00:00
|
|
|
|
2013-02-01 13:48:58 +00:00
|
|
|
VIR_ENUM_DECL(virQEMUCaps);
|
2010-12-16 15:07:07 +00:00
|
|
|
|
2013-02-01 13:48:58 +00:00
|
|
|
bool virQEMUCapsUsedQMP(virQEMUCapsPtr qemuCaps);
|
2013-07-30 21:49:11 +00:00
|
|
|
bool virQEMUCapsSupportsChardev(virDomainDefPtr def,
|
|
|
|
|
virQEMUCapsPtr qemuCaps,
|
|
|
|
|
virDomainChrDefPtr chr);
|
|
|
|
|
|
2014-03-17 15:19:45 +00:00
|
|
|
int virQEMUCapsInitGuestFromBinary(virCapsPtr caps,
|
|
|
|
|
const char *binary,
|
|
|
|
|
virQEMUCapsPtr qemubinCaps,
|
|
|
|
|
const char *kvmbin,
|
|
|
|
|
virQEMUCapsPtr kvmbinCaps,
|
|
|
|
|
virArch guestarch);
|
|
|
|
|
|
2010-12-16 15:07:07 +00:00
|
|
|
#endif /* __QEMU_CAPABILITIES_H__*/
|
