提交 e114b091 编写于 作者: P Peter Krempa

qemu: caps: Always assume QEMU_CAPS_SMP_TOPOLOGY

Support for SMP topology was added by qemu commit dc6b1c09849484fbbc50
prior to 0.12.0, our minimum supported qemu version.

$ git describe --tags dc6b1c09849484fbbc50803307e4c7a3d81eab62
v0.11.0-rc0-449-gdc6b1c0
$ git describe --tags --contains dc6b1c09849484fbbc50803307e4c7a3d81eab
v0.12.0-rc0~1477
上级 6fcffcb1
......@@ -1232,10 +1232,6 @@ virQEMUCapsComputeCmdFlags(const char *help,
if (strstr(help, "-sdl"))
virQEMUCapsSet(qemuCaps, QEMU_CAPS_SDL);
if (strstr(help, "cores=") &&
strstr(help, "threads=") &&
strstr(help, "sockets="))
virQEMUCapsSet(qemuCaps, QEMU_CAPS_SMP_TOPOLOGY);
if (strstr(help, ",vhost="))
virQEMUCapsSet(qemuCaps, QEMU_CAPS_VHOST_NET);
......@@ -3384,7 +3380,6 @@ virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps)
virQEMUCapsSet(qemuCaps, QEMU_CAPS_CHARDEV);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_MONITOR_JSON);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_SDL);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_SMP_TOPOLOGY);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_NETDEV);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_RTC);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_VHOST_NET);
......
......@@ -85,7 +85,7 @@ typedef enum {
X_QEMU_CAPS_BALLOON, /* -balloon available */
X_QEMU_CAPS_DEVICE, /* Is the -device arg available */
QEMU_CAPS_SDL, /* Is the new -sdl arg available */
QEMU_CAPS_SMP_TOPOLOGY, /* -smp has sockets/cores/threads */
X_QEMU_CAPS_SMP_TOPOLOGY, /* -smp has sockets/cores/threads */
QEMU_CAPS_NETDEV, /* -netdev flag & netdev_add/remove */
/* 30 */
......
......@@ -6862,8 +6862,7 @@ qemuBuildMachineCommandLine(virCommandPtr cmd,
static int
qemuBuildSmpCommandLine(virCommandPtr cmd,
const virDomainDef *def,
virQEMUCapsPtr qemuCaps)
const virDomainDef *def)
{
char *smp;
virBuffer buf = VIR_BUFFER_INITIALIZER;
......@@ -6872,29 +6871,18 @@ qemuBuildSmpCommandLine(virCommandPtr cmd,
virBufferAsprintf(&buf, "%u", virDomainDefGetVcpus(def));
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SMP_TOPOLOGY)) {
if (virDomainDefHasVcpusOffline(def))
virBufferAsprintf(&buf, ",maxcpus=%u",
virDomainDefGetVcpusMax(def));
/* sockets, cores, and threads are either all zero
* or all non-zero, thus checking one of them is enough */
if (def->cpu && def->cpu->sockets) {
virBufferAsprintf(&buf, ",sockets=%u", def->cpu->sockets);
virBufferAsprintf(&buf, ",cores=%u", def->cpu->cores);
virBufferAsprintf(&buf, ",threads=%u", def->cpu->threads);
} else {
virBufferAsprintf(&buf, ",sockets=%u",
virDomainDefGetVcpusMax(def));
virBufferAsprintf(&buf, ",cores=%u", 1);
virBufferAsprintf(&buf, ",threads=%u", 1);
}
} else if (virDomainDefHasVcpusOffline(def)) {
virBufferFreeAndReset(&buf);
/* FIXME - consider hot-unplugging cpus after boot for older qemu */
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("setting current vcpu count less than maximum is "
"not supported with this QEMU binary"));
return -1;
if (virDomainDefHasVcpusOffline(def))
virBufferAsprintf(&buf, ",maxcpus=%u", virDomainDefGetVcpusMax(def));
/* sockets, cores, and threads are either all zero
* or all non-zero, thus checking one of them is enough */
if (def->cpu && def->cpu->sockets) {
virBufferAsprintf(&buf, ",sockets=%u", def->cpu->sockets);
virBufferAsprintf(&buf, ",cores=%u", def->cpu->cores);
virBufferAsprintf(&buf, ",threads=%u", def->cpu->threads);
} else {
virBufferAsprintf(&buf, ",sockets=%u", virDomainDefGetVcpusMax(def));
virBufferAsprintf(&buf, ",cores=%u", 1);
virBufferAsprintf(&buf, ",threads=%u", 1);
}
if (virBufferCheckError(&buf) < 0)
......@@ -9183,7 +9171,7 @@ qemuBuildCommandLine(virQEMUDriverPtr driver,
if (qemuBuildMemCommandLine(cmd, cfg, def, qemuCaps) < 0)
goto error;
if (qemuBuildSmpCommandLine(cmd, def, qemuCaps) < 0)
if (qemuBuildSmpCommandLine(cmd, def) < 0)
goto error;
if (qemuBuildIOThreadCommandLine(cmd, def, qemuCaps) < 0)
......
......@@ -9,7 +9,6 @@
<flag name='enable-kvm'/>
<flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='smp-topology'/>
<flag name='netdev'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
......
......@@ -9,7 +9,6 @@
<flag name='enable-kvm'/>
<flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='smp-topology'/>
<flag name='netdev'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
......
......@@ -9,7 +9,6 @@
<flag name='enable-kvm'/>
<flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='smp-topology'/>
<flag name='netdev'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
......
......@@ -9,7 +9,6 @@
<flag name='enable-kvm'/>
<flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='smp-topology'/>
<flag name='netdev'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
......
......@@ -9,7 +9,6 @@
<flag name='enable-kvm'/>
<flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='smp-topology'/>
<flag name='netdev'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
......
......@@ -9,7 +9,6 @@
<flag name='enable-kvm'/>
<flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='smp-topology'/>
<flag name='netdev'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
......
......@@ -9,7 +9,6 @@
<flag name='enable-kvm'/>
<flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='smp-topology'/>
<flag name='netdev'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
......
......@@ -9,7 +9,6 @@
<flag name='enable-kvm'/>
<flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='smp-topology'/>
<flag name='netdev'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
......
......@@ -9,7 +9,6 @@
<flag name='enable-kvm'/>
<flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='smp-topology'/>
<flag name='netdev'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
......
......@@ -9,7 +9,6 @@
<flag name='enable-kvm'/>
<flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='smp-topology'/>
<flag name='netdev'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
......
......@@ -9,7 +9,6 @@
<flag name='enable-kvm'/>
<flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='smp-topology'/>
<flag name='netdev'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
......
......@@ -9,7 +9,6 @@
<flag name='enable-kvm'/>
<flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='smp-topology'/>
<flag name='netdev'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
......
......@@ -9,7 +9,6 @@
<flag name='enable-kvm'/>
<flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='smp-topology'/>
<flag name='netdev'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
......
......@@ -154,7 +154,6 @@ mymain(void)
QEMU_CAPS_ENABLE_KVM,
QEMU_CAPS_SDL,
QEMU_CAPS_CHARDEV,
QEMU_CAPS_SMP_TOPOLOGY,
QEMU_CAPS_RTC,
QEMU_CAPS_NO_HPET,
QEMU_CAPS_BOOT_MENU,
......@@ -173,7 +172,6 @@ mymain(void)
QEMU_CAPS_CHARDEV,
QEMU_CAPS_ENABLE_KVM,
QEMU_CAPS_MONITOR_JSON,
QEMU_CAPS_SMP_TOPOLOGY,
QEMU_CAPS_NETDEV,
QEMU_CAPS_RTC,
QEMU_CAPS_VHOST_NET,
......@@ -214,7 +212,6 @@ mymain(void)
QEMU_CAPS_MEM_PATH,
QEMU_CAPS_SDL,
QEMU_CAPS_CHARDEV,
QEMU_CAPS_SMP_TOPOLOGY,
QEMU_CAPS_RTC,
QEMU_CAPS_VHOST_NET,
QEMU_CAPS_NO_HPET,
......@@ -239,7 +236,6 @@ mymain(void)
QEMU_CAPS_CHARDEV,
QEMU_CAPS_ENABLE_KVM,
QEMU_CAPS_MONITOR_JSON,
QEMU_CAPS_SMP_TOPOLOGY,
QEMU_CAPS_NETDEV,
QEMU_CAPS_RTC,
QEMU_CAPS_VHOST_NET,
......@@ -290,7 +286,6 @@ mymain(void)
QEMU_CAPS_CHARDEV,
QEMU_CAPS_ENABLE_KVM,
QEMU_CAPS_MONITOR_JSON,
QEMU_CAPS_SMP_TOPOLOGY,
QEMU_CAPS_NETDEV,
QEMU_CAPS_RTC,
QEMU_CAPS_VHOST_NET,
......@@ -339,7 +334,6 @@ mymain(void)
QEMU_CAPS_CHARDEV,
QEMU_CAPS_ENABLE_KVM,
QEMU_CAPS_MONITOR_JSON,
QEMU_CAPS_SMP_TOPOLOGY,
QEMU_CAPS_NETDEV,
QEMU_CAPS_RTC,
QEMU_CAPS_VHOST_NET,
......@@ -396,7 +390,6 @@ mymain(void)
QEMU_CAPS_CHARDEV,
QEMU_CAPS_ENABLE_KVM,
QEMU_CAPS_MONITOR_JSON,
QEMU_CAPS_SMP_TOPOLOGY,
QEMU_CAPS_NETDEV,
QEMU_CAPS_RTC,
QEMU_CAPS_VHOST_NET,
......@@ -470,7 +463,6 @@ mymain(void)
QEMU_CAPS_CHARDEV,
QEMU_CAPS_ENABLE_KVM,
QEMU_CAPS_MONITOR_JSON,
QEMU_CAPS_SMP_TOPOLOGY,
QEMU_CAPS_NETDEV,
QEMU_CAPS_RTC,
QEMU_CAPS_VHOST_NET,
......
......@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
-M virt \
-cpu cortex-a53 \
-m 1024 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
-nographic \
-nodefconfig \
......
......@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
-M virt \
-cpu host \
-m 1024 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
-nographic \
-nodefconfig \
......
......@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
-machine virt,accel=kvm,gic-version=host \
-cpu host \
-m 1024 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
-nographic \
-nodefaults \
......
......@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
-machine virt,accel=kvm \
-cpu host \
-m 1024 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
-nographic \
-nodefaults \
......
......@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
-machine virt,accel=kvm,gic-version=3 \
-cpu host \
-m 1024 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
-nographic \
-nodefaults \
......
......@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
-M virt \
-cpu host,aarch64=off \
-m 1024 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 496d7ea8-9739-544b-4ebd-ef08be936e6a \
-nographic \
-nodefconfig \
......
......@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
-M virt-2.6 \
-cpu cortex-a53 \
-m 1024 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
-nographic \
-nodefconfig \
......
......@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
-M virt \
-cpu cortex-a53 \
-m 1024 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
-nographic \
-nodefconfig \
......
......@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
-M virt \
-cpu cortex-a53 \
-m 1024 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
-nographic \
-nodefconfig \
......
......@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
-M virt \
-cpu cortex-a53 \
-m 1024 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
-nographic \
-nodefconfig \
......
......@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
-M virt \
-cpu cortex-a53 \
-m 1024 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
-nographic \
-nodefconfig \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M pc \
-m 214 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M vexpress-a9 \
-m 1024 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 496d7ea8-9739-544b-4ebd-ef08be936e6a \
-nographic \
-nodefconfig \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M vexpress-a9 \
-m 1024 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 496d7ea8-9739-544b-4ebd-ef08be936e6a \
-nographic \
-nodefconfig \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M vexpress-a9 \
-m 1024 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 496d7ea8-9739-544b-4ebd-ef08be936e6a \
-nographic \
-nodefconfig \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M virt \
-m 1024 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 496d7ea8-9739-544b-4ebd-ef08be936e6a \
-nographic \
-nodefconfig \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M q35 \
-m 2048 \
-smp 2 \
-smp 2,sockets=2,cores=1,threads=1 \
-uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \
-nographic \
-nodefaults \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M s390-ccw \
-m 214 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M pc \
-m 214 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M pc \
-m 214 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M pc \
-m 214 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M pc \
-m 214 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M pc \
-m 214 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
......
......@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
-M virt \
-cpu cortex-a53 \
-m 1024 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
-nographic \
-nodefconfig \
......
......@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
-drive file=/usr/share/OVMF/OVMF_CODE.fd,if=pflash,format=raw,unit=0,readonly=on \
-drive file=/usr/share/OVMF/OVMF_VARS.fd,if=pflash,format=raw,unit=1 \
-m 1024 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \
-nographic \
-nodefaults \
......
......@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-bios /usr/share/seabios/bios.bin \
-m 1024 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \
-nographic \
-nodefaults \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M pc \
-m 214 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M pc \
-m 214 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M pc \
-m 214 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M pc \
-m 214 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M pc \
-m 214 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M pc \
-m 214 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M pc \
-m 214 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M pc-q35-2.4 \
-m 214 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M pc \
-m 214 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M pc \
-m 214 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M pc \
-m 214 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M pc \
-m 214 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M pc \
-m 214 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M pc \
-m 214 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M pc \
-m 214 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M pc \
-m 214 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M pc \
-m 214 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M pc \
-m 214 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M pc \
-m 214 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M pc-q35-2.4 \
-m 214 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M pc \
-m 214 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=spice \
-S \
-M pc \
-m 214 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nodefconfig \
-nodefaults \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=spice \
-S \
-M pc \
-m 214 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nodefconfig \
-nodefaults \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M pc \
-m 214 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M pc \
-m 214 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M pc \
-m 214 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M pc \
-m 214 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M pc \
-m 214 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M pc \
-m 214 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M pc \
-m 214 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M pc \
-m 214 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
......
......@@ -10,7 +10,7 @@ TZ=Europe/Paris \
-S \
-M pc \
-m 214 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M pc \
-m 214 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M pc \
-m 214 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 1c15a1f6-f4f0-4d3c-9002-667ddb458736 \
-nographic \
-nodefaults \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M pc \
-m 214 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
......
......@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-cpu qemu32,hv_time \
-m 214 \
-smp 6 \
-smp 6,sockets=6,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M pc \
-m 214 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M pc \
-m 214 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M pc \
-m 214 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M pc \
-m 214 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M pc \
-m 214 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M s390-virtio \
-m 214 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M s390-ccw \
-m 214 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M pc \
-m 214 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M s390-virtio \
-m 214 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
......
......@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \
-M pc \
-m 214 \
-smp 1 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
......
......@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=spice \
-M rhel6.1.0 \
-enable-kvm \
-m 4096 \
-smp 4 \
-smp 4,sockets=4,cores=1,threads=1 \
-uuid d091ea82-29e6-2e34-3005-f02617b36e87 \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-fdr/monitor.sock,server,\
......
......@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-cpu Haswell-noTSX \
-m 214 \
-smp 6 \
-smp 6,sockets=6,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
......
......@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-cpu Haswell \
-m 214 \
-smp 6 \
-smp 6,sockets=6,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
......
......@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-cpu Haswell,-hle,-rtm \
-m 214 \
-smp 6 \
-smp 6,sockets=6,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
......
......@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-cpu Haswell \
-m 214 \
-smp 6 \
-smp 6,sockets=6,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
......
......@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-cpu qemu32,-kvm_pv_eoi \
-m 214 \
-smp 6 \
-smp 6,sockets=6,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
......
......@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-cpu qemu32,+kvm_pv_eoi \
-m 214 \
-smp 6 \
-smp 6,sockets=6,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
......
......@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-cpu qemu64,-mca,-pse36,-clflush,-syscall,-nx,-lm,-svm \
-m 214 \
-smp 6 \
-smp 6,sockets=6,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
......
......@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-cpu core2duo,+ds,+ht,+tm,+ds_cpl,+xtpr,+3dnowext,+lahf_lm,-nx \
-m 214 \
-smp 6 \
-smp 6,sockets=6,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
......
......@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-cpu core2duo,+ds,+ht,+tm,+ds_cpl,+xtpr,+3dnowext,+lahf_lm,-nx \
-m 214 \
-smp 6 \
-smp 6,sockets=6,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
......
......@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-cpu Penryn,-sse4.1 \
-m 214 \
-smp 6 \
-smp 6,sockets=6,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
......
此差异已折叠。
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册