qemu: deprecate QEMU_CAPS_MONITOR_JSON

We require QEMU >= 1.5.0, assume every QEMU supports it.
Sadly that does not let us trivially drop qemuMonitor's
priv->monJSON bool, because of qemuDomainQemuAttach.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
This commit is contained in:
Ján Tomko 2018-03-29 00:04:58 +02:00
parent d3ad6b95f2
commit a32539dea1
634 changed files with 616 additions and 655 deletions

View File

@ -3639,7 +3639,6 @@ virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps)
{
virQEMUCapsSet(qemuCaps, QEMU_CAPS_MEM_PATH);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_SERIAL);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_MONITOR_JSON);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_SDL);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_RTC);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_VHOST_NET);

View File

@ -80,7 +80,7 @@ typedef enum {
X_QEMU_CAPS_MIGRATE_QEMU_UNIX, /* qemu migration via unix sockets */
X_QEMU_CAPS_CHARDEV, /* Is the new -chardev arg available */
QEMU_CAPS_ENABLE_KVM, /* -enable-kvm flag */
QEMU_CAPS_MONITOR_JSON, /* JSON mode for monitor */
X_QEMU_CAPS_MONITOR_JSON, /* JSON mode for monitor */
/* 25 */
X_QEMU_CAPS_BALLOON, /* -balloon available */

View File

@ -1654,15 +1654,11 @@ qemuBuildDiskThrottling(virDomainDiskDefPtr disk,
static void
qemuBuildDiskFrontendAttributeErrorPolicy(virDomainDiskDefPtr disk,
virQEMUCapsPtr qemuCaps,
virBufferPtr buf)
{
const char *wpolicy = NULL;
const char *rpolicy = NULL;
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_MONITOR_JSON))
return;
if (disk->error_policy)
wpolicy = virDomainDiskErrorPolicyTypeToString(disk->error_policy);
@ -1712,7 +1708,7 @@ qemuBuildDiskFrontendAttributes(virDomainDiskDefPtr disk,
virBufferEscape(buf, '\\', " ", "%s", disk->serial);
}
qemuBuildDiskFrontendAttributeErrorPolicy(disk, qemuCaps, buf);
qemuBuildDiskFrontendAttributeErrorPolicy(disk, buf);
}

View File

@ -2123,19 +2123,15 @@ qemuDomainReboot(virDomainPtr dom, unsigned int flags)
if ((!useAgent) ||
(ret < 0 && (acpiRequested || !flags))) {
#if WITH_YAJL
if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MONITOR_JSON)) {
if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_NO_SHUTDOWN)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("ACPI reboot is not supported with this QEMU binary"));
goto endjob;
}
} else {
#endif
virReportError(VIR_ERR_OPERATION_INVALID, "%s",
_("ACPI reboot is not supported without the JSON monitor"));
if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_NO_SHUTDOWN)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("ACPI reboot is not supported with this QEMU binary"));
goto endjob;
#if WITH_YAJL
}
#else
virReportError(VIR_ERR_OPERATION_INVALID, "%s",
_("ACPI reboot is not supported without the JSON monitor"));
goto endjob;
#endif
qemuDomainSetFakeReboot(driver, vm, isReboot);
qemuDomainObjEnterMonitor(driver, vm);

View File

@ -5722,7 +5722,7 @@ qemuProcessPrepareDomain(virQEMUDriverPtr driver,
if (qemuProcessPrepareMonitorChr(priv->monConfig, priv->libDir) < 0)
goto cleanup;
priv->monJSON = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MONITOR_JSON);
priv->monJSON = true;
priv->monError = false;
priv->monStart = 0;
priv->gotShutdown = false;

View File

@ -6,7 +6,6 @@
<flag name='kvm'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>
<flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>

View File

@ -6,7 +6,6 @@
<flag name='kvm'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>
<flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>

View File

@ -6,7 +6,6 @@
<flag name='kvm'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>
<flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>

View File

@ -6,7 +6,6 @@
<flag name='kvm'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>
<flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>

View File

@ -6,7 +6,6 @@
<flag name='kvm'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>
<flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>

View File

@ -6,7 +6,6 @@
<flag name='kvm'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>
<flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>

View File

@ -6,7 +6,6 @@
<flag name='kvm'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>
<flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>

View File

@ -6,7 +6,6 @@
<flag name='kvm'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>
<flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>

View File

@ -6,7 +6,6 @@
<flag name='kvm'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>
<flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>

View File

@ -6,7 +6,6 @@
<flag name='kvm'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>
<flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>

View File

@ -6,7 +6,6 @@
<flag name='kvm'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>
<flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>

View File

@ -6,7 +6,6 @@
<flag name='mem-path'/>
<flag name='drive-serial'/>
<flag name='enable-kvm'/>
<flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>

View File

@ -6,7 +6,6 @@
<flag name='kvm'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>
<flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>

View File

@ -6,7 +6,6 @@
<flag name='kvm'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>
<flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>

View File

@ -6,7 +6,6 @@
<flag name='kvm'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>
<flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>

View File

@ -6,7 +6,6 @@
<flag name='kvm'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>
<flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>

View File

@ -6,7 +6,6 @@
<flag name='kvm'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>
<flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>

View File

@ -6,7 +6,6 @@
<flag name='kvm'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>
<flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>

View File

@ -6,7 +6,6 @@
<flag name='kvm'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>
<flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>

View File

@ -6,7 +6,6 @@
<flag name='kvm'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>
<flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>

View File

@ -6,7 +6,6 @@
<flag name='kvm'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>
<flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>

View File

@ -6,7 +6,6 @@
<flag name='kvm'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>
<flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>

View File

@ -6,7 +6,6 @@
<flag name='kvm'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>
<flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>

View File

@ -6,7 +6,6 @@
<flag name='kvm'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>
<flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>

View File

@ -6,7 +6,6 @@
<flag name='kvm'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>
<flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>

View File

@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,\
path=/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot c \
-kernel /aarch64.kernel \

View File

@ -20,5 +20,5 @@ unit=1 \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-boot c

View File

@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,\
path=/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot c \
-drive file=/aarch64.raw,format=raw,if=none,id=drive-virtio-disk0 \

View File

@ -16,6 +16,6 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,\
path=/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot c

View File

@ -16,6 +16,6 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot c

View File

@ -16,6 +16,6 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,\
path=/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot c

View File

@ -16,6 +16,6 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,\
path=/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot c

View File

@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-armtest/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-boot c \
-kernel /arm.kernel \
-initrd /arm.initrd \

View File

@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot c \
-kernel /var/lib/libvirt/images/guest.vmlinuz \

View File

@ -20,6 +20,6 @@ unit=1 \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot c

View File

@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,\
path=/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot c \
-device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1 \

View File

@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot c \
-device pcie-root-port,port=0x8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,\

View File

@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot c \
-device nec-usb-xhci,id=usb,bus=pcie.0,addr=0x1

View File

@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot c \
-device qemu-xhci,id=usb,bus=pcie.0,addr=0x1

View File

@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,\
path=/tmp/lib/domain--1-aarch64-vgpu/monitor.sock,server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot c \
-device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1 \

View File

@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,\
path=/tmp/lib/domain--1-aarch64-vgpu/monitor.sock,server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-device ioh3420,port=0x8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,\
addr=0x1 \

View File

@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,\
path=/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot c \
-kernel /aarch64.kernel \

View File

@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,\
path=/tmp/lib/domain--1-aarch64-virt-default/monitor.sock,server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot c \
-kernel /aarch64.kernel \

View File

@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,\
path=/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot c \
-kernel /aarch64.kernel \

View File

@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,\
path=/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot c \
-kernel /aarch64.kernel \

View File

@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,\
path=/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot c \
-kernel /aarch64.kernel \

View File

@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-boot c \
-acpitable sig=SLIC,file=/var/lib/libvirt/acpi/slic.dat \
-usb

View File

@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-armtest/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-boot c \
-kernel /arm.kernel \
-initrd /arm.initrd \

View File

@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-armtest/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-boot c \
-kernel /arm.kernel \
-initrd /arm.initrd \

View File

@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-armtest/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-boot c \
-kernel /arm.kernel \
-initrd /arm.initrd \

View File

@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-armtest/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-boot c \
-kernel /arm.kernel \
-initrd /arm.initrd \

View File

@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-q35-test/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot c \
-device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \

View File

@ -16,6 +16,6 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-boot c \
-device virtio-balloon-ccw,id=balloon0,devno=fe.0.000a,deflate-on-oom=on

View File

@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot c \
-usb \

View File

@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot c \
-usb \

View File

@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot c \
-usb \

View File

@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot c \
-usb \

View File

@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot c \
-usb \

View File

@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,\
path=/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot c \
-kernel /aarch64.kernel \

View File

@ -19,7 +19,7 @@ readonly=on \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-test-bios/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-boot c \
-device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \
-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \

View File

@ -18,7 +18,7 @@ readonly=on \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-test-bios/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-boot c \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \

View File

@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \
-device sga \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-test-bios/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot c \
-usb \

View File

@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot c \
-usb \

View File

@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot c \
-usb \

View File

@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot c \
-usb \

View File

@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot c \
-usb \

View File

@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot c \
-usb \

View File

@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot c \
-usb \

View File

@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot d \
-usb \

View File

@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-usb \
-drive file=/tmp/vda.img,format=raw,if=none,id=drive-virtio-disk0 \

View File

@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot dnca \
-usb \

View File

@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot a \
-drive file=/tmp/firmware.img,format=raw,if=none,id=drive-fdc0-0-0 \

View File

@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot a \
-usb \

View File

@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot menu=off \
-usb \

View File

@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot order=d,menu=off \
-usb \

View File

@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot order=d,menu=off \
-usb \

View File

@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot menu=on \
-usb \

View File

@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot order=d,menu=on,splash-time=3000 \
-usb \

View File

@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot order=d,menu=on \
-usb \

View File

@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot order=dcna,menu=on \
-usb \

View File

@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot n \
-usb \

View File

@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \

View File

@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot strict=on \
-usb \

View File

@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-drive file=/tmp/firmware.img,format=raw,if=none,id=drive-fdc0-0-0 \
-device isa-fdc,driveA=drive-fdc0-0-0,bootindexA=1

View File

@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot c \
-usb \

View File

@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=spice \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot c \
-device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \

View File

@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=spice \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot c \
-device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \

View File

@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot c \
-device virtio-serial-pci,id=virtio-serial0,max_ports=16,vectors=4,bus=pci.0,\

View File

@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot c \
-device virtio-serial-pci,id=virtio-serial0,max_ports=4,vectors=4,bus=pci.0,\

View File

@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot c \
-device virtio-serial-pci,id=virtio-serial0,max_ports=4,vectors=4,bus=pci.0,\

View File

@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot c \
-device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \

View File

@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot c \
-device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \

View File

@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot c \
-device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \

View File

@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot c \
-device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \

View File

@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot c \
-device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \

Some files were not shown because too many files have changed in this diff Show More