This is way too sparse. On 05/21/2018 11:00 AM, Martin Kletzander wrote: > Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1469338 > > Signed-off-by: Martin Kletzander <mkletzan@xxxxxxxxxx> > --- > src/qemu/qemu_command.c | 18 ++++ > src/qemu/qemu_domain.c | 84 +++++++++++++++++++ > .../qemuxml2argvdata/tseg-explicit-size.args | 28 +++++++ > tests/qemuxml2argvdata/tseg-explicit-size.xml | 23 +++++ > tests/qemuxml2argvdata/tseg-i440fx.xml | 23 +++++ > tests/qemuxml2argvdata/tseg-invalid-size.xml | 23 +++++ > .../tseg-old-machine-type.args | 27 ++++++ > .../tseg-old-machine-type.xml | 21 +++++ > tests/qemuxml2argvdata/tseg.args | 28 +++++++ > tests/qemuxml2argvdata/tseg.xml | 21 +++++ > tests/qemuxml2argvtest.c | 48 +++++++++++ > .../qemuxml2xmloutdata/tseg-explicit-size.xml | 46 ++++++++++ > .../tseg-old-machine-type.xml | 44 ++++++++++ > tests/qemuxml2xmloutdata/tseg.xml | 46 ++++++++++ > tests/qemuxml2xmltest.c | 25 ++++++ > 15 files changed, 505 insertions(+) > create mode 100644 tests/qemuxml2argvdata/tseg-explicit-size.args > create mode 100644 tests/qemuxml2argvdata/tseg-explicit-size.xml > create mode 100644 tests/qemuxml2argvdata/tseg-i440fx.xml > create mode 100644 tests/qemuxml2argvdata/tseg-invalid-size.xml > create mode 100644 tests/qemuxml2argvdata/tseg-old-machine-type.args > create mode 100644 tests/qemuxml2argvdata/tseg-old-machine-type.xml > create mode 100644 tests/qemuxml2argvdata/tseg.args > create mode 100644 tests/qemuxml2argvdata/tseg.xml > create mode 100644 tests/qemuxml2xmloutdata/tseg-explicit-size.xml > create mode 100644 tests/qemuxml2xmloutdata/tseg-old-machine-type.xml > create mode 100644 tests/qemuxml2xmloutdata/tseg.xml > > diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c > index 328f3c0a2386..36f557676fb0 100644 > --- a/src/qemu/qemu_command.c > +++ b/src/qemu/qemu_command.c > @@ -7200,6 +7200,22 @@ qemuBuildMachineCommandLine(virCommandPtr cmd, > return ret; > } > > + > +static void > +qemuBuildTSEGCommandLine(virCommandPtr cmd, > + const virDomainDef *def) > +{ > + if (!def->tseg_size) Since it's not bool or pointer, prefer the tseg_size == 0 > + return; > + > + virCommandAddArg(cmd, "-global"); > + > + /* PostParse callback guarantees that the size is divisible by 1 MiB */ > + virCommandAddArgFormat(cmd, "mch.extended-tseg-mbytes=%llu", > + def->tseg_size >> 20); > +} > + > + > static int > qemuBuildSmpCommandLine(virCommandPtr cmd, > virDomainDefPtr def) > @@ -9921,6 +9937,8 @@ qemuBuildCommandLine(virQEMUDriverPtr driver, > if (qemuBuildMachineCommandLine(cmd, cfg, def, qemuCaps) < 0) > goto error; > > + qemuBuildTSEGCommandLine(cmd, def); > + > if (qemuBuildCpuCommandLine(cmd, driver, def, qemuCaps) < 0) > goto error; > > diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c > index 881d0ea46a75..3ea9e3d47344 100644 > --- a/src/qemu/qemu_domain.c > +++ b/src/qemu/qemu_domain.c > @@ -3319,6 +3319,87 @@ qemuDomainDefCPUPostParse(virDomainDefPtr def) > } > > > +static int > +qemuDomainSetDefaultTsegSize(virDomainDef *def, > + virQEMUCapsPtr qemuCaps) > +{ > + const char *machine = NULL; > + char *end_ptr = NULL; > + unsigned int major = 0; > + unsigned int minor = 0; > + > + def->tseg_size = 0; Pointless since the only way in here is "if (tseg_size == 0)" > + > + if (!qemuDomainIsQ35(def)) > + return 0; > + > + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_MCH_EXTENDED_TSEG_MBYTES)) Reading this now makes me realized _MBYTES is probably unnecessary, IDC though since it does follow the QEMU name. > + return 0; > + > + machine = STRSKIP(def->os.machine, "pc-q35-"); > + > + if (!machine) > + goto error; > + > + if (virStrToLong_uip(machine, &end_ptr, 10, &major) < 0) > + goto error; > + > + if (*end_ptr != '.') > + goto error; > + > + machine = end_ptr + 1; > + > + if (virStrToLong_uip(machine, &end_ptr, 10, &minor) < 0) > + goto error; > + if (*end_ptr != '\0') > + goto error; > + > + /* QEMU started defaulting to 16MiB after 2.9 */ > + if (major > 2 || (major == 2 && minor > 9)) > + def->tseg_size = 16 * 1024 * 1024; So, if QEMU defaults to 16MiB, then why do we need so set this at all? This seems to me we are setting policy which based on history of many patches before is a no go. I'd say NAK to this, unless there is some convincing argument made in the commit message and followup responses to the series (or you can take Jan's R-By and ignore me - your call. > + > + return 0; > + > + error: > + virReportError(VIR_ERR_INTERNAL_ERROR, > + _("Cannot parse QEMU machine type version '%s'"), > + def->os.machine); > + return -1; > +} > + > + > +static int > +qemuDomainDefTsegPostParse(virDomainDefPtr def, While TSEG is what you're adjusting, this is more a 'features' or in particular SMM features post parse callback. > + virQEMUCapsPtr qemuCaps) > +{ > + if (def->features[VIR_DOMAIN_FEATURE_SMM] != VIR_TRISTATE_SWITCH_ON) > + return 0; > + > + if (!def->tseg_size) Similar... prefer tseg_size == 0 > + return qemuDomainSetDefaultTsegSize(def, qemuCaps); > + > + if (!qemuDomainIsQ35(def)) { > + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", > + _("SMM TSEG is only supported with q35 machine type")); > + return -1; > + } > + > + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_MCH_EXTENDED_TSEG_MBYTES)) { > + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", > + _("Setting TSEG size is not supported with this QEMU binary")); > + return -1; > + } > + > + if (VIR_ROUND_UP(def->tseg_size, 1024 * 1024) != def->tseg_size) { > + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", > + _("SMM TSEG size must be divisible by 1 MiB")); > + return -1; > + } Does anywhere else that does a VIR_ROUND_UP elicit an error? Why bother. Curious that this differs from qemuDomainMemoryDeviceAlignSize which claims 1MiB rounding using qemuDomainGetMemorySizeAlignment which returns 1024 unless it's PPC64 which returns 256MiB alignments. > + > + return 0; > +} > + > + > static int > qemuDomainDefPostParseBasic(virDomainDefPtr def, > virCapsPtr caps, > @@ -3389,6 +3470,9 @@ qemuDomainDefPostParse(virDomainDefPtr def, > if (qemuDomainDefCPUPostParse(def) < 0) > goto cleanup; > > + if (qemuDomainDefTsegPostParse(def, qemuCaps) < 0) > + goto cleanup; > + > ret = 0; > cleanup: > virObjectUnref(cfg); > diff --git a/tests/qemuxml2argvdata/tseg-explicit-size.args b/tests/qemuxml2argvdata/tseg-explicit-size.args > new file mode 100644 > index 000000000000..d49c81697e43 > --- /dev/null > +++ b/tests/qemuxml2argvdata/tseg-explicit-size.args > @@ -0,0 +1,28 @@ > +LC_ALL=C \ > +PATH=/bin \ > +HOME=/home/test \ > +USER=test \ > +LOGNAME=test \ > +QEMU_AUDIO_DRV=none \ > +/usr/bin/qemu-system-x86_64 \ > +-name QEMUGuest1 \ > +-S \ > +-machine pc-q35-2.10,accel=tcg,usb=off,smm=on,dump-guest-core=off \ > +-global mch.extended-tseg-mbytes=48 \ > +-m 214 \ > +-smp 1,sockets=1,cores=1,threads=1 \ > +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ > +-display none \ > +-no-user-config \ > +-nodefaults \ > +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ > +server,nowait \ > +-mon chardev=charmonitor,id=monitor,mode=control \ > +-rtc base=utc \ > +-no-shutdown \ > +-no-acpi \ > +-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 \ > +-device ioh3420,port=0x10,chassis=3,id=pci.3,bus=pcie.0,addr=0x2 \ > +-device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x1 > diff --git a/tests/qemuxml2argvdata/tseg-explicit-size.xml b/tests/qemuxml2argvdata/tseg-explicit-size.xml > new file mode 100644 > index 000000000000..ae3121048495 > --- /dev/null > +++ b/tests/qemuxml2argvdata/tseg-explicit-size.xml > @@ -0,0 +1,23 @@ > +<domain type='qemu'> > + <name>QEMUGuest1</name> > + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> > + <memory unit='KiB'>219100</memory> > + <currentMemory unit='KiB'>219100</currentMemory> > + <vcpu placement='static'>1</vcpu> > + <os> > + <type arch='x86_64' machine='pc-q35-2.10'>hvm</type> > + <boot dev='hd'/> > + </os> > + <features> > + <smm state='on'> > + <tseg>48</tseg> The only difference here from genericxml2xmlindata/tseg.xml is that this one doesn't have "unit='MiB'" > + </smm> > + </features> > + <clock offset='utc'/> > + <on_poweroff>destroy</on_poweroff> > + <on_reboot>restart</on_reboot> > + <on_crash>destroy</on_crash> > + <devices> > + <emulator>/usr/bin/qemu-system-x86_64</emulator> > + </devices> > +</domain> > diff --git a/tests/qemuxml2argvdata/tseg-i440fx.xml b/tests/qemuxml2argvdata/tseg-i440fx.xml > new file mode 100644 > index 000000000000..5bd832d50829 > --- /dev/null > +++ b/tests/qemuxml2argvdata/tseg-i440fx.xml > @@ -0,0 +1,23 @@ > +<domain type='qemu'> > + <name>QEMUGuest1</name> > + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> > + <memory unit='KiB'>219100</memory> > + <currentMemory unit='KiB'>219100</currentMemory> > + <vcpu placement='static'>1</vcpu> > + <os> > + <type arch='x86_64' machine='pc'>hvm</type> > + <boot dev='hd'/> > + </os> > + <features> > + <smm state='on'> > + <tseg unit='MiB'>48</tseg> > + </smm> > + </features> > + <clock offset='utc'/> > + <on_poweroff>destroy</on_poweroff> > + <on_reboot>restart</on_reboot> > + <on_crash>destroy</on_crash> > + <devices> > + <emulator>/usr/bin/qemu-system-x86_64</emulator> > + </devices> > +</domain> > diff --git a/tests/qemuxml2argvdata/tseg-invalid-size.xml b/tests/qemuxml2argvdata/tseg-invalid-size.xml > new file mode 100644 > index 000000000000..3ac8069a81ce > --- /dev/null > +++ b/tests/qemuxml2argvdata/tseg-invalid-size.xml > @@ -0,0 +1,23 @@ > +<domain type='qemu'> > + <name>QEMUGuest1</name> > + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> > + <memory unit='KiB'>219100</memory> > + <currentMemory unit='KiB'>219100</currentMemory> > + <vcpu placement='static'>1</vcpu> > + <os> > + <type arch='x86_64' machine='q35'>hvm</type> > + <boot dev='hd'/> > + </os> > + <features> > + <smm state='on'> > + <tseg unit='KiB'>12345</tseg> > + </smm> > + </features> > + <clock offset='utc'/> > + <on_poweroff>destroy</on_poweroff> > + <on_reboot>restart</on_reboot> > + <on_crash>destroy</on_crash> > + <devices> > + <emulator>/usr/bin/qemu-system-x86_64</emulator> > + </devices> > +</domain> > diff --git a/tests/qemuxml2argvdata/tseg-old-machine-type.args b/tests/qemuxml2argvdata/tseg-old-machine-type.args > new file mode 100644 > index 000000000000..ebbdb15e68f2 > --- /dev/null > +++ b/tests/qemuxml2argvdata/tseg-old-machine-type.args > @@ -0,0 +1,27 @@ > +LC_ALL=C \ > +PATH=/bin \ > +HOME=/home/test \ > +USER=test \ > +LOGNAME=test \ > +QEMU_AUDIO_DRV=none \ > +/usr/bin/qemu-system-x86_64 \ > +-name QEMUGuest1 \ > +-S \ > +-machine pc-q35-2.9,accel=tcg,usb=off,smm=on,dump-guest-core=off \ > +-m 214 \ > +-smp 1,sockets=1,cores=1,threads=1 \ > +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ > +-display none \ > +-no-user-config \ > +-nodefaults \ > +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ > +server,nowait \ > +-mon chardev=charmonitor,id=monitor,mode=control \ > +-rtc base=utc \ > +-no-shutdown \ > +-no-acpi \ > +-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 \ > +-device ioh3420,port=0x10,chassis=3,id=pci.3,bus=pcie.0,addr=0x2 \ > +-device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x1 > diff --git a/tests/qemuxml2argvdata/tseg-old-machine-type.xml b/tests/qemuxml2argvdata/tseg-old-machine-type.xml > new file mode 100644 > index 000000000000..d1e42586f144 > --- /dev/null > +++ b/tests/qemuxml2argvdata/tseg-old-machine-type.xml > @@ -0,0 +1,21 @@ > +<domain type='qemu'> > + <name>QEMUGuest1</name> > + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> > + <memory unit='KiB'>219100</memory> > + <currentMemory unit='KiB'>219100</currentMemory> > + <vcpu placement='static'>1</vcpu> > + <os> > + <type arch='x86_64' machine='pc-q35-2.9'>hvm</type> > + <boot dev='hd'/> > + </os> > + <features> > + <smm state='on'/> > + </features> > + <clock offset='utc'/> > + <on_poweroff>destroy</on_poweroff> > + <on_reboot>restart</on_reboot> > + <on_crash>destroy</on_crash> > + <devices> > + <emulator>/usr/bin/qemu-system-x86_64</emulator> > + </devices> > +</domain> > diff --git a/tests/qemuxml2argvdata/tseg.args b/tests/qemuxml2argvdata/tseg.args > new file mode 100644 > index 000000000000..995957ef1d58 > --- /dev/null > +++ b/tests/qemuxml2argvdata/tseg.args > @@ -0,0 +1,28 @@ > +LC_ALL=C \ > +PATH=/bin \ > +HOME=/home/test \ > +USER=test \ > +LOGNAME=test \ > +QEMU_AUDIO_DRV=none \ > +/usr/bin/qemu-system-x86_64 \ > +-name QEMUGuest1 \ > +-S \ > +-machine pc-q35-2.10,accel=tcg,usb=off,smm=on,dump-guest-core=off \ > +-global mch.extended-tseg-mbytes=16 \ > +-m 214 \ > +-smp 1,sockets=1,cores=1,threads=1 \ > +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ > +-display none \ > +-no-user-config \ > +-nodefaults \ > +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ > +server,nowait \ > +-mon chardev=charmonitor,id=monitor,mode=control \ > +-rtc base=utc \ > +-no-shutdown \ > +-no-acpi \ > +-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 \ > +-device ioh3420,port=0x10,chassis=3,id=pci.3,bus=pcie.0,addr=0x2 \ > +-device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x1 > diff --git a/tests/qemuxml2argvdata/tseg.xml b/tests/qemuxml2argvdata/tseg.xml > new file mode 100644 > index 000000000000..7a31e348b258 > --- /dev/null > +++ b/tests/qemuxml2argvdata/tseg.xml and yet another one similr to genericxml2xmlindata/tseg.xml - same name, different directory > @@ -0,0 +1,21 @@ > +<domain type='qemu'> > + <name>QEMUGuest1</name> > + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> > + <memory unit='KiB'>219100</memory> > + <currentMemory unit='KiB'>219100</currentMemory> > + <vcpu placement='static'>1</vcpu> > + <os> > + <type arch='x86_64' machine='pc-q35-2.10'>hvm</type> > + <boot dev='hd'/> > + </os> > + <features> > + <smm state='on'/> > + </features> > + <clock offset='utc'/> > + <on_poweroff>destroy</on_poweroff> > + <on_reboot>restart</on_reboot> > + <on_crash>destroy</on_crash> > + <devices> > + <emulator>/usr/bin/qemu-system-x86_64</emulator> > + </devices> > +</domain> > diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c > index 78454acb1a41..633dfaaee9a4 100644 > --- a/tests/qemuxml2argvtest.c > +++ b/tests/qemuxml2argvtest.c > @@ -2827,6 +2827,54 @@ mymain(void) > > DO_TEST_CAPS_LATEST("disk-virtio-scsi-reservations"); > > + DO_TEST("tseg", > + QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, > + QEMU_CAPS_DEVICE_PCI_BRIDGE, > + QEMU_CAPS_DEVICE_IOH3420, > + QEMU_CAPS_ICH9_AHCI, > + QEMU_CAPS_MACHINE_SMM_OPT, > + QEMU_CAPS_VIRTIO_SCSI, > + QEMU_CAPS_MCH_EXTENDED_TSEG_MBYTES); > + DO_TEST("tseg-explicit-size", > + QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, > + QEMU_CAPS_DEVICE_PCI_BRIDGE, > + QEMU_CAPS_DEVICE_IOH3420, > + QEMU_CAPS_ICH9_AHCI, > + QEMU_CAPS_MACHINE_SMM_OPT, > + QEMU_CAPS_VIRTIO_SCSI, > + QEMU_CAPS_MCH_EXTENDED_TSEG_MBYTES); > + DO_TEST("tseg-old-machine-type", > + QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, > + QEMU_CAPS_DEVICE_PCI_BRIDGE, > + QEMU_CAPS_DEVICE_IOH3420, > + QEMU_CAPS_ICH9_AHCI, > + QEMU_CAPS_MACHINE_SMM_OPT, > + QEMU_CAPS_VIRTIO_SCSI, > + QEMU_CAPS_MCH_EXTENDED_TSEG_MBYTES); These all should use DO_TEST_CAPS_LATEST > + DO_TEST_PARSE_ERROR("tseg-i440fx", > + QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, > + QEMU_CAPS_DEVICE_PCI_BRIDGE, > + QEMU_CAPS_DEVICE_IOH3420, > + QEMU_CAPS_ICH9_AHCI, > + QEMU_CAPS_MACHINE_SMM_OPT, > + QEMU_CAPS_VIRTIO_SCSI, > + QEMU_CAPS_MCH_EXTENDED_TSEG_MBYTES); Failure wrong machine type... > + DO_TEST_PARSE_ERROR("tseg-explicit-size", > + QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, > + QEMU_CAPS_DEVICE_PCI_BRIDGE, > + QEMU_CAPS_DEVICE_IOH3420, > + QEMU_CAPS_ICH9_AHCI, > + QEMU_CAPS_MACHINE_SMM_OPT, > + QEMU_CAPS_VIRTIO_SCSI); Failure because TSEG_MBYTES not provided. > + DO_TEST_PARSE_ERROR("tseg-invalid-size", > + QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, > + QEMU_CAPS_DEVICE_PCI_BRIDGE, > + QEMU_CAPS_DEVICE_IOH3420, > + QEMU_CAPS_ICH9_AHCI, > + QEMU_CAPS_MACHINE_SMM_OPT, > + QEMU_CAPS_VIRTIO_SCSI, > + QEMU_CAPS_MCH_EXTENDED_TSEG_MBYTES); > + > /* Test disks with format probing enabled for legacy reasons. > * New tests should not go in this section. */ > driver.config->allowDiskFormatProbing = true; > diff --git a/tests/qemuxml2xmloutdata/tseg-explicit-size.xml b/tests/qemuxml2xmloutdata/tseg-explicit-size.xml > new file mode 100644 > index 000000000000..e1a6e15b610e > --- /dev/null > +++ b/tests/qemuxml2xmloutdata/tseg-explicit-size.xml > @@ -0,0 +1,46 @@ > +<domain type='qemu'> > + <name>QEMUGuest1</name> > + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> > + <memory unit='KiB'>219100</memory> > + <currentMemory unit='KiB'>219100</currentMemory> > + <vcpu placement='static'>1</vcpu> > + <os> > + <type arch='x86_64' machine='pc-q35-2.10'>hvm</type> > + <boot dev='hd'/> > + </os> > + <features> > + <smm state='on'> > + <tseg unit='MiB'>48</tseg> > + </smm> > + </features> > + <clock offset='utc'/> > + <on_poweroff>destroy</on_poweroff> > + <on_reboot>restart</on_reboot> > + <on_crash>destroy</on_crash> > + <devices> > + <emulator>/usr/bin/qemu-system-x86_64</emulator> > + <controller type='sata' index='0'> > + <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/> > + </controller> > + <controller type='pci' index='0' model='pcie-root'/> > + <controller type='pci' index='1' model='dmi-to-pci-bridge'> > + <model name='i82801b11-bridge'/> > + <address type='pci' domain='0x0000' bus='0x00' slot='0x1e' function='0x0'/> > + </controller> > + <controller type='pci' index='2' model='pci-bridge'> > + <model name='pci-bridge'/> > + <target chassisNr='2'/> > + <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/> > + </controller> > + <controller type='pci' index='3' model='pcie-root-port'> > + <model name='ioh3420'/> > + <target chassis='3' port='0x10'/> > + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> > + </controller> > + <input type='mouse' bus='ps2'/> > + <input type='keyboard' bus='ps2'/> > + <memballoon model='virtio'> > + <address type='pci' domain='0x0000' bus='0x02' slot='0x01' function='0x0'/> > + </memballoon> > + </devices> > +</domain> > diff --git a/tests/qemuxml2xmloutdata/tseg-old-machine-type.xml b/tests/qemuxml2xmloutdata/tseg-old-machine-type.xml > new file mode 100644 > index 000000000000..594c5c025d2e > --- /dev/null > +++ b/tests/qemuxml2xmloutdata/tseg-old-machine-type.xml > @@ -0,0 +1,44 @@ > +<domain type='qemu'> > + <name>QEMUGuest1</name> > + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> > + <memory unit='KiB'>219100</memory> > + <currentMemory unit='KiB'>219100</currentMemory> > + <vcpu placement='static'>1</vcpu> > + <os> > + <type arch='x86_64' machine='pc-q35-2.9'>hvm</type> > + <boot dev='hd'/> > + </os> > + <features> > + <smm state='on'/> > + </features> > + <clock offset='utc'/> > + <on_poweroff>destroy</on_poweroff> > + <on_reboot>restart</on_reboot> > + <on_crash>destroy</on_crash> > + <devices> > + <emulator>/usr/bin/qemu-system-x86_64</emulator> > + <controller type='sata' index='0'> > + <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/> > + </controller> > + <controller type='pci' index='0' model='pcie-root'/> > + <controller type='pci' index='1' model='dmi-to-pci-bridge'> > + <model name='i82801b11-bridge'/> > + <address type='pci' domain='0x0000' bus='0x00' slot='0x1e' function='0x0'/> > + </controller> > + <controller type='pci' index='2' model='pci-bridge'> > + <model name='pci-bridge'/> > + <target chassisNr='2'/> > + <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/> > + </controller> > + <controller type='pci' index='3' model='pcie-root-port'> > + <model name='ioh3420'/> > + <target chassis='3' port='0x10'/> > + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> > + </controller> > + <input type='mouse' bus='ps2'/> > + <input type='keyboard' bus='ps2'/> > + <memballoon model='virtio'> > + <address type='pci' domain='0x0000' bus='0x02' slot='0x01' function='0x0'/> > + </memballoon> > + </devices> > +</domain> > diff --git a/tests/qemuxml2xmloutdata/tseg.xml b/tests/qemuxml2xmloutdata/tseg.xml > new file mode 100644 > index 000000000000..954ee9d9ee24 > --- /dev/null > +++ b/tests/qemuxml2xmloutdata/tseg.xml > @@ -0,0 +1,46 @@ > +<domain type='qemu'> > + <name>QEMUGuest1</name> > + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> > + <memory unit='KiB'>219100</memory> > + <currentMemory unit='KiB'>219100</currentMemory> > + <vcpu placement='static'>1</vcpu> > + <os> > + <type arch='x86_64' machine='pc-q35-2.10'>hvm</type> > + <boot dev='hd'/> > + </os> > + <features> > + <smm state='on'> > + <tseg unit='MiB'>16</tseg> > + </smm> > + </features> > + <clock offset='utc'/> > + <on_poweroff>destroy</on_poweroff> > + <on_reboot>restart</on_reboot> > + <on_crash>destroy</on_crash> > + <devices> > + <emulator>/usr/bin/qemu-system-x86_64</emulator> > + <controller type='sata' index='0'> > + <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/> > + </controller> > + <controller type='pci' index='0' model='pcie-root'/> > + <controller type='pci' index='1' model='dmi-to-pci-bridge'> > + <model name='i82801b11-bridge'/> > + <address type='pci' domain='0x0000' bus='0x00' slot='0x1e' function='0x0'/> > + </controller> > + <controller type='pci' index='2' model='pci-bridge'> > + <model name='pci-bridge'/> > + <target chassisNr='2'/> > + <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/> > + </controller> > + <controller type='pci' index='3' model='pcie-root-port'> > + <model name='ioh3420'/> > + <target chassis='3' port='0x10'/> > + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> > + </controller> > + <input type='mouse' bus='ps2'/> > + <input type='keyboard' bus='ps2'/> > + <memballoon model='virtio'> > + <address type='pci' domain='0x0000' bus='0x02' slot='0x01' function='0x0'/> > + </memballoon> > + </devices> > +</domain> > diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c > index 7cedc2b999b3..14824679b81c 100644 > --- a/tests/qemuxml2xmltest.c > +++ b/tests/qemuxml2xmltest.c > @@ -1181,6 +1181,31 @@ mymain(void) > QEMU_CAPS_DEVICE_VIRTIO_MOUSE_CCW, > QEMU_CAPS_DEVICE_VIRTIO_TABLET_CCW); > > + DO_TEST("tseg", > + QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, > + QEMU_CAPS_DEVICE_PCI_BRIDGE, > + QEMU_CAPS_DEVICE_IOH3420, > + QEMU_CAPS_ICH9_AHCI, > + QEMU_CAPS_MACHINE_SMM_OPT, > + QEMU_CAPS_VIRTIO_SCSI, > + QEMU_CAPS_MCH_EXTENDED_TSEG_MBYTES); > + DO_TEST("tseg-explicit-size", > + QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, > + QEMU_CAPS_DEVICE_PCI_BRIDGE, > + QEMU_CAPS_DEVICE_IOH3420, > + QEMU_CAPS_ICH9_AHCI, > + QEMU_CAPS_MACHINE_SMM_OPT, > + QEMU_CAPS_VIRTIO_SCSI, > + QEMU_CAPS_MCH_EXTENDED_TSEG_MBYTES); > + DO_TEST("tseg-old-machine-type", > + QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, > + QEMU_CAPS_DEVICE_PCI_BRIDGE, > + QEMU_CAPS_DEVICE_IOH3420, > + QEMU_CAPS_ICH9_AHCI, > + QEMU_CAPS_MACHINE_SMM_OPT, > + QEMU_CAPS_VIRTIO_SCSI, > + QEMU_CAPS_MCH_EXTENDED_TSEG_MBYTES); > + Never quite understood why xml2xml tests need CAPS... John > /* Test disks with format probing enabled for legacy reasons. > * New tests should not go in this section. */ > driver.config->allowDiskFormatProbing = true; > -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list
