Skip to content

L
libvirt

openeuler / libvirt

通知 3
Star 0
Fork 0
L
libvirt
提交 dc7f6c3d 编写于 作者: D Daniel P. Berrange
浏览文件
操作

qemu: assume -uuid is always available 

The -uuid arg was added in QEMU 0.10.0, so the QEMU driver can
assume it is always available.
Signed-off-by: NDaniel P. Berrange <berrange@redhat.com>
上级 4588c2ce
展开全部 隐藏空白更改
内联 并排
Showing with 458 addition and 25 deletion
src/qemu/qemu_capabilities.c
浏览文件 @ dc7f6c3d
......@@ -1096,8 +1096,6 @@ virQEMUCapsComputeCmdFlags(const char *help,
virQEMUCapsSet(qemuCaps, QEMU_CAPS_ENABLE_KVM);
if (strstr(help, ",process="))
virQEMUCapsSet(qemuCaps, QEMU_CAPS_NAME_PROCESS);
if (strstr(help, "-uuid"))
virQEMUCapsSet(qemuCaps, QEMU_CAPS_UUID);
if (strstr(help, "-xen-domid"))
virQEMUCapsSet(qemuCaps, QEMU_CAPS_XEN_DOMID);
else if (strstr(help, "-domid"))
......@@ -3210,7 +3208,6 @@ static qemuMonitorCallbacks callbacks = {
static void
virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps)
{
virQEMUCapsSet(qemuCaps, QEMU_CAPS_UUID);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_VNET_HDR);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_MIGRATE_QEMU_TCP);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_MIGRATE_QEMU_EXEC);
......
src/qemu/qemu_capabilities.h
浏览文件 @ dc7f6c3d
......@@ -54,7 +54,7 @@ typedef enum {
/* 5 */
X_QEMU_CAPS_NAME, /* Is the -name flag available */
QEMU_CAPS_UUID, /* Is the -uuid flag available */
X_QEMU_CAPS_UUID, /* Is the -uuid flag available */
QEMU_CAPS_DOMID, /* Xenner: -domid flag available */
QEMU_CAPS_VNET_HDR,
QEMU_CAPS_MIGRATE_KVM_STDIO, /* avoid kvm tcp migration bug */
......
src/qemu/qemu_command.c
浏览文件 @ dc7f6c3d
......@@ -9460,8 +9460,7 @@ qemuBuildCommandLine(virConnectPtr conn,
}
}
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_UUID))
virCommandAddArgList(cmd, "-uuid", uuid, NULL);
virCommandAddArgList(cmd, "-uuid", uuid, NULL);
if (def->virtType == VIR_DOMAIN_VIRT_XEN ||
def->os.type == VIR_DOMAIN_OSTYPE_XEN ||
def->os.type == VIR_DOMAIN_OSTYPE_LINUX) {
......
tests/qemucapabilitiesdata/caps_1.2.2-1.caps
浏览文件 @ dc7f6c3d
<qemuCaps>
<flag name='uuid'/>
<flag name='vnet-hdr'/>
<flag name='migrate-qemu-tcp'/>
<flag name='migrate-qemu-exec'/>
......
tests/qemucapabilitiesdata/caps_1.3.1-1.caps
浏览文件 @ dc7f6c3d
<qemuCaps>
<flag name='uuid'/>
<flag name='vnet-hdr'/>
<flag name='migrate-qemu-tcp'/>
<flag name='migrate-qemu-exec'/>
......
tests/qemucapabilitiesdata/caps_1.4.2-1.caps
浏览文件 @ dc7f6c3d
<qemuCaps>
<flag name='uuid'/>
<flag name='vnet-hdr'/>
<flag name='migrate-qemu-tcp'/>
<flag name='migrate-qemu-exec'/>
......
tests/qemucapabilitiesdata/caps_1.5.3-1.caps
浏览文件 @ dc7f6c3d
<qemuCaps>
<flag name='uuid'/>
<flag name='vnet-hdr'/>
<flag name='migrate-qemu-tcp'/>
<flag name='migrate-qemu-exec'/>
......
tests/qemucapabilitiesdata/caps_1.6.0-1.caps
浏览文件 @ dc7f6c3d
<qemuCaps>
<flag name='uuid'/>
<flag name='vnet-hdr'/>
<flag name='migrate-qemu-tcp'/>
<flag name='migrate-qemu-exec'/>
......
tests/qemucapabilitiesdata/caps_1.6.50-1.caps
浏览文件 @ dc7f6c3d
<qemuCaps>
<flag name='uuid'/>
<flag name='vnet-hdr'/>
<flag name='migrate-qemu-tcp'/>
<flag name='migrate-qemu-exec'/>
......
tests/qemucapabilitiesdata/caps_2.1.1-1.caps
浏览文件 @ dc7f6c3d
<qemuCaps>
<flag name='uuid'/>
<flag name='vnet-hdr'/>
<flag name='migrate-qemu-tcp'/>
<flag name='migrate-qemu-exec'/>
......
tests/qemucaps2xmldata/all_1.6.0-1.caps
浏览文件 @ dc7f6c3d
<qemuCaps>
<flag name='uuid'/>
<flag name='vnet-hdr'/>
<flag name='migrate-qemu-tcp'/>
<flag name='migrate-qemu-exec'/>
......
tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps
浏览文件 @ dc7f6c3d
<qemuCaps>
<flag name='uuid'/>
<flag name='vnet-hdr'/>
<flag name='migrate-qemu-tcp'/>
<flag name='migrate-qemu-exec'/>
......
tests/qemuhelptest.c
浏览文件 @ dc7f6c3d
......@@ -152,7 +152,6 @@ mymain(void)
DO_TEST_FULL(name, version, is_kvm, kvm_version, VIR_ERR_OK, __VA_ARGS__)
DO_TEST("qemu-0.12.1", 12001, 0, 0,
QEMU_CAPS_UUID,
QEMU_CAPS_MIGRATE_QEMU_TCP,
QEMU_CAPS_MIGRATE_QEMU_EXEC,
QEMU_CAPS_DRIVE_CACHE_V2,
......@@ -185,7 +184,6 @@ mymain(void)
QEMU_CAPS_VNC);
DO_TEST("qemu-kvm-0.12.1.2-rhel60", 12001, 1, 0,
QEMU_CAPS_DRIVE_BOOT,
QEMU_CAPS_UUID,
QEMU_CAPS_VNET_HDR,
QEMU_CAPS_MIGRATE_QEMU_TCP,
QEMU_CAPS_MIGRATE_QEMU_EXEC,
......@@ -244,7 +242,6 @@ mymain(void)
QEMU_CAPS_DEVICE_VIRTIO_NET);
DO_TEST("qemu-kvm-0.12.3", 12003, 1, 0,
QEMU_CAPS_DRIVE_BOOT,
QEMU_CAPS_UUID,
QEMU_CAPS_VNET_HDR,
QEMU_CAPS_MIGRATE_QEMU_TCP,
QEMU_CAPS_MIGRATE_QEMU_EXEC,
......@@ -283,7 +280,6 @@ mymain(void)
QEMU_CAPS_VNC);
DO_TEST("qemu-kvm-0.13.0", 13000, 1, 0,
QEMU_CAPS_DRIVE_BOOT,
QEMU_CAPS_UUID,
QEMU_CAPS_VNET_HDR,
QEMU_CAPS_MIGRATE_QEMU_TCP,
QEMU_CAPS_MIGRATE_QEMU_EXEC,
......@@ -353,7 +349,6 @@ mymain(void)
QEMU_CAPS_DEVICE_E1000,
QEMU_CAPS_DEVICE_VIRTIO_NET);
DO_TEST("qemu-kvm-0.12.1.2-rhel61", 12001, 1, 0,
QEMU_CAPS_UUID,
QEMU_CAPS_VNET_HDR,
QEMU_CAPS_MIGRATE_QEMU_TCP,
QEMU_CAPS_MIGRATE_QEMU_EXEC,
......@@ -419,7 +414,6 @@ mymain(void)
QEMU_CAPS_DEVICE_E1000,
QEMU_CAPS_DEVICE_VIRTIO_NET);
DO_TEST("qemu-kvm-0.12.1.2-rhel62-beta", 12001, 1, 0,
QEMU_CAPS_UUID,
QEMU_CAPS_VNET_HDR,
QEMU_CAPS_MIGRATE_QEMU_TCP,
QEMU_CAPS_MIGRATE_QEMU_EXEC,
......@@ -493,7 +487,6 @@ mymain(void)
QEMU_CAPS_DEVICE_E1000,
QEMU_CAPS_DEVICE_VIRTIO_NET);
DO_TEST("qemu-1.0", 1000000, 0, 0,
QEMU_CAPS_UUID,
QEMU_CAPS_MIGRATE_QEMU_TCP,
QEMU_CAPS_MIGRATE_QEMU_EXEC,
QEMU_CAPS_DRIVE_CACHE_V2,
......@@ -582,7 +575,6 @@ mymain(void)
QEMU_CAPS_DEVICE_E1000,
QEMU_CAPS_DEVICE_VIRTIO_NET);
DO_TEST("qemu-1.1.0", 1001000, 0, 0,
QEMU_CAPS_UUID,
QEMU_CAPS_MIGRATE_QEMU_TCP,
QEMU_CAPS_MIGRATE_QEMU_EXEC,
QEMU_CAPS_DRIVE_CACHE_V2,
......
tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args
浏览文件 @ dc7f6c3d
......@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu cortex-a53 \
-m 1024 \
-smp 1 \
-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
-nographic \
-nodefconfig \
-nodefaults \
......
tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.args
浏览文件 @ dc7f6c3d
......@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu host \
-m 1024 \
-smp 1 \
-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
-nographic \
-nodefconfig \
-nodefaults \
......
tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic.args
浏览文件 @ dc7f6c3d
......@@ -12,6 +12,7 @@ QEMU_AUDIO_DRV=none \
-cpu cortex-a53 \
-m 1024 \
-smp 1 \
-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
......
tests/qemuxml2argvdata/qemuxml2argv-aarch64-gicv3.args
浏览文件 @ dc7f6c3d
......@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu cortex-a53 \
-m 1024 \
-smp 1 \
-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
......
tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.args
浏览文件 @ dc7f6c3d
......@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu host,aarch64=off \
-m 1024 \
-smp 1 \
-uuid 496d7ea8-9739-544b-4ebd-ef08be936e6a \
-nographic \
-nodefconfig \
-nodefaults \
......
tests/qemuxml2argvdata/qemuxml2argv-aarch64-mmio-default-pci.args
浏览文件 @ dc7f6c3d
......@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu cortex-a53 \
-m 1024 \
-smp 1 \
-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
-nographic \
-nodefconfig \
-nodefaults \
......
tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.args
浏览文件 @ dc7f6c3d
......@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu cortex-a53 \
-m 1024 \
-smp 1 \
-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
-nographic \
-nodefconfig \
-nodefaults \
......
tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.args
浏览文件 @ dc7f6c3d
......@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu cortex-a53 \
-m 1024 \
-smp 1 \
-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
-nographic \
-nodefconfig \
-nodefaults \
......
tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci.args
浏览文件 @ dc7f6c3d
......@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu cortex-a53 \
-m 1024 \
-smp 1 \
-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
-nographic \
-nodefconfig \
-nodefaults \
......
tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-basic.args
浏览文件 @ dc7f6c3d
......@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M vexpress-a9 \
-m 1024 \
-smp 1 \
-uuid 496d7ea8-9739-544b-4ebd-ef08be936e6a \
-nographic \
-nodefconfig \
-nodefaults \
......
tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-nodevs.args
浏览文件 @ dc7f6c3d
......@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M vexpress-a9 \
-m 1024 \
-smp 1 \
-uuid 496d7ea8-9739-544b-4ebd-ef08be936e6a \
-nographic \
-nodefconfig \
-nodefaults \
......
tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-virtio.args
浏览文件 @ dc7f6c3d
......@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M vexpress-a9 \
-m 1024 \
-smp 1 \
-uuid 496d7ea8-9739-544b-4ebd-ef08be936e6a \
-nographic \
-nodefconfig \
-nodefaults \
......
tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.args
浏览文件 @ dc7f6c3d
......@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M virt \
-m 1024 \
-smp 1 \
-uuid 496d7ea8-9739-544b-4ebd-ef08be936e6a \
-nographic \
-nodefconfig \
-nodefaults \
......
tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.args
浏览文件 @ dc7f6c3d
......@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
......
tests/qemuxml2argvdata/qemuxml2argv-balloon-device-period.args
浏览文件 @ dc7f6c3d
......@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
......
tests/qemuxml2argvdata/qemuxml2argv-balloon-device.args
浏览文件 @ dc7f6c3d
......@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
......
tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.args
浏览文件 @ dc7f6c3d
......@@ -12,6 +12,7 @@ QEMU_AUDIO_DRV=none \
-drive file=/usr/share/OVMF/OVMF_VARS.fd,if=pflash,format=raw,unit=1 \
-m 1024 \
-smp 1 \
-uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
......
tests/qemuxml2argvdata/qemuxml2argv-bios.args
浏览文件 @ dc7f6c3d
......@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-bios /usr/share/seabios/bios.bin \
-m 1024 \
-smp 1 \
-uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \
-nographic \
-nodefaults \
-device sga \
......
tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max.args
浏览文件 @ dc7f6c3d
......@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
......
tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args
浏览文件 @ dc7f6c3d
......@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
......
tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.args
浏览文件 @ dc7f6c3d
......@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
......
tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args
浏览文件 @ dc7f6c3d
......@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
......
tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args
浏览文件 @ dc7f6c3d
......@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
......
tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.args
浏览文件 @ dc7f6c3d
......@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
......
tests/qemuxml2argvdata/qemuxml2argv-boot-complex.args
浏览文件 @ dc7f6c3d
......@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
......
tests/qemuxml2argvdata/qemuxml2argv-boot-floppy-q35.args
浏览文件 @ dc7f6c3d
......@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc-q35-2.4 \
-m 214 \
-smp 1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
......
tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args
浏览文件 @ dc7f6c3d
......@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
......
tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.args
浏览文件 @ dc7f6c3d
......@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
......
tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.args
浏览文件 @ dc7f6c3d
......@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
......
tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.args
浏览文件 @ dc7f6c3d
......@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
......
tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout.args
浏览文件 @ dc7f6c3d
......@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
......
tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.args
浏览文件 @ dc7f6c3d
......@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
......
tests/qemuxml2argvdata/qemuxml2argv-boot-multi.args
浏览文件 @ dc7f6c3d
......@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
......
tests/qemuxml2argvdata/qemuxml2argv-boot-network.args
浏览文件 @ dc7f6c3d
......@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
......
tests/qemuxml2argvdata/qemuxml2argv-boot-order.args
浏览文件 @ dc7f6c3d
......@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
......
tests/qemuxml2argvdata/qemuxml2argv-boot-strict.args
浏览文件 @ dc7f6c3d
......@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
......
tests/qemuxml2argvdata/qemuxml2argv-bootindex-floppy-q35.args
浏览文件 @ dc7f6c3d
......@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc-q35-2.4 \
-m 214 \
-smp 1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
......
tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args
浏览文件 @ dc7f6c3d
......@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
......
tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.args
浏览文件 @ dc7f6c3d
......@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=spice \
-M pc \
-m 214 \
-smp 1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nodefconfig \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
......
tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.args
浏览文件 @ dc7f6c3d
......@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=spice \
-M pc \
-m 214 \
-smp 1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nodefconfig \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
......
tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args
浏览文件 @ dc7f6c3d
......@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
......
tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoadd.args
浏览文件 @ dc7f6c3d
......@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
......
tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoassign.args
浏览文件 @ dc7f6c3d
......@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
......
tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.args
浏览文件 @ dc7f6c3d
......@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
......
tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-state.args
浏览文件 @ dc7f6c3d
......@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
......
tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args
浏览文件 @ dc7f6c3d
......@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
......
tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args
浏览文件 @ dc7f6c3d
......@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
......
tests/qemuxml2argvdata/qemuxml2argv-clock-catchup.args
浏览文件 @ dc7f6c3d
......@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-rtc base=utc,driftfix=slew \
......
tests/qemuxml2argvdata/qemuxml2argv-clock-france.args
浏览文件 @ dc7f6c3d
......@@ -11,6 +11,7 @@ TZ=Europe/Paris \
-M pc \
-m 214 \
-smp 1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-rtc base=localtime \
......
tests/qemuxml2argvdata/qemuxml2argv-clock-hpet-off.args
浏览文件 @ dc7f6c3d
......@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-rtc base=utc,driftfix=slew \
......
tests/qemuxml2argvdata/qemuxml2argv-clock-localtime-basis-localtime.args
浏览文件 @ dc7f6c3d
......@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
-uuid 1c15a1f6-f4f0-4d3c-9002-667ddb458736 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-rtc base=2009-02-14T00:01:30 \
......
tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args
浏览文件 @ dc7f6c3d
......@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-localtime \
......
tests/qemuxml2argvdata/qemuxml2argv-clock-timer-hyperv-rtc.args
浏览文件 @ dc7f6c3d
......@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu qemu32,hv_time \
-m 214 \
-smp 6 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
......
tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args
浏览文件 @ dc7f6c3d
......@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
......
tests/qemuxml2argvdata/qemuxml2argv-clock-variable.args
浏览文件 @ dc7f6c3d
......@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-rtc base=2009-02-15T09:49:06 \
......
tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args
浏览文件 @ dc7f6c3d
......@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
......
tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args
浏览文件 @ dc7f6c3d
......@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
......
tests/qemuxml2argvdata/qemuxml2argv-console-compat.args
浏览文件 @ dc7f6c3d
......@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
......
tests/qemuxml2argvdata/qemuxml2argv-console-sclp.args
浏览文件 @ dc7f6c3d
......@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M s390-virtio \
-m 214 \
-smp 1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
......
tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.args
浏览文件 @ dc7f6c3d
......@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M s390-ccw \
-m 214 \
-smp 1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
......
tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.args
浏览文件 @ dc7f6c3d
......@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
......
tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args
浏览文件 @ dc7f6c3d
......@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M s390-virtio \
-m 214 \
-smp 1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
......
tests/qemuxml2argvdata/qemuxml2argv-console-virtio.args
浏览文件 @ dc7f6c3d
......@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
......
tests/qemuxml2argvdata/qemuxml2argv-controller-order.args
浏览文件 @ dc7f6c3d
......@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=spice \
-enable-kvm \
-m 4096 \
-smp 4 \
-uuid d091ea82-29e6-2e34-3005-f02617b36e87 \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
......
tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell-noTSX.args
浏览文件 @ dc7f6c3d
......@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu Haswell-noTSX \
-m 214 \
-smp 6 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
......
tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell.args
浏览文件 @ dc7f6c3d
......@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu Haswell \
-m 214 \
-smp 6 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
......
tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.args
浏览文件 @ dc7f6c3d
......@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu Haswell,-rtm,-hle \
-m 214 \
-smp 6 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
......
tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell3.args
浏览文件 @ dc7f6c3d
......@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu Haswell \
-m 214 \
-smp 6 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
......
tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-disabled.args
浏览文件 @ dc7f6c3d
......@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu qemu32,-kvm_pv_eoi \
-m 214 \
-smp 6 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-boot n \
......
tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-enabled.args
浏览文件 @ dc7f6c3d
......@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu qemu32,+kvm_pv_eoi \
-m 214 \
-smp 6 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-boot n \
......
tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.args
浏览文件 @ dc7f6c3d
......@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu qemu64,-svm,-lm,-nx,-syscall,-clflush,-pse36,-mca \
-m 214 \
-smp 6 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
......
tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.args
浏览文件 @ dc7f6c3d
......@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu core2duo,+lahf_lm,+3dnowext,+xtpr,+ds_cpl,+tm,+ht,+ds,-nx \
-m 214 \
-smp 6 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
......
tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.args
浏览文件 @ dc7f6c3d
......@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu core2duo,+lahf_lm,+3dnowext,+xtpr,+ds_cpl,+tm,+ht,+ds,-nx \
-m 214 \
-smp 6 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
......
tests/qemuxml2argvdata/qemuxml2argv-cpu-fallback.args
浏览文件 @ dc7f6c3d
......@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu Penryn,-sse4.1 \
-m 214 \
-smp 6 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
......
tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.args
浏览文件 @ dc7f6c3d
......@@ -12,6 +12,7 @@ QEMU_AUDIO_DRV=none \
-cpu host,-kvmclock \
-m 214 \
-smp 6 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
......
tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-fallback.args
浏览文件 @ dc7f6c3d
......@@ -12,6 +12,7 @@ QEMU_AUDIO_DRV=none \
+vme,-sse4.1 \
-m 214 \
-smp 6 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
......
tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-vendor.args
浏览文件 @ dc7f6c3d
......@@ -12,6 +12,7 @@ QEMU_AUDIO_DRV=none \
+pbe,+tm,+ht,+ss,+acpi,+ds' \
-m 214 \
-smp 6 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
......
tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model.args
浏览文件 @ dc7f6c3d
......@@ -12,6 +12,7 @@ QEMU_AUDIO_DRV=none \
+ds \
-m 214 \
-smp 6 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
......
tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features.args
浏览文件 @ dc7f6c3d
......@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu host,+abm,+ds,-invtsc \
-m 214 \
-smp 1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
......
tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough.args
浏览文件 @ dc7f6c3d
......@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu host \
-m 214 \
-smp 6 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
......
tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.args
浏览文件 @ dc7f6c3d
......@@ -12,6 +12,7 @@ QEMU_AUDIO_DRV=none \
-cpu core2duo,-kvmclock \
-m 214 \
-smp 6 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
......
tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.args
浏览文件 @ dc7f6c3d
......@@ -12,6 +12,7 @@ QEMU_AUDIO_DRV=none \
+ds \
-m 214 \
-smp 6 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
......
tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.args
浏览文件 @ dc7f6c3d
......@@ -12,6 +12,7 @@ QEMU_AUDIO_DRV=none \
+ds,-lm,-nx,-syscall \
-m 214 \
-smp 6 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
......
tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disjoint.args
浏览文件 @ dc7f6c3d
......@@ -12,6 +12,7 @@ QEMU_AUDIO_DRV=none \
-smp 16 \
-numa node,nodeid=0,cpus=0-3,cpus=8-11,mem=107 \
-numa node,nodeid=1,cpus=4-7,cpus=12-15,mem=107 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
......
tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-no-memory-element.args
浏览文件 @ dc7f6c3d
......@@ -12,6 +12,7 @@ QEMU_AUDIO_DRV=none \
-smp 16,sockets=2,cores=4,threads=2 \
-numa node,nodeid=0,cpus=0-7,mem=107 \
-numa node,nodeid=1,cpus=8-15,mem=107 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
......
tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.args
浏览文件 @ dc7f6c3d
......@@ -12,6 +12,7 @@ QEMU_AUDIO_DRV=none \
-smp 16 \
-numa node,nodeid=0,cpus=0-7,mem=107 \
-numa node,nodeid=1,cpus=8-15,mem=107 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
......
tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.args
浏览文件 @ dc7f6c3d
......@@ -12,6 +12,7 @@ QEMU_AUDIO_DRV=none \
-smp 16,sockets=2,cores=4,threads=2 \
-numa node,nodeid=0,cpus=0-7,mem=107 \
-numa node,nodeid=1,cpus=8-15,mem=107 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
......
tests/qemuxml2argvtest.c
浏览文件 @ dc7f6c3d
此差异已折叠。
tests/qemuxml2xmltest.c
浏览文件 @ dc7f6c3d
此差异已折叠。
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或