mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-02-22 19:32:19 +00:00
qemu: Assume QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT
All QEMU versions we support have this feature. Signed-off-by: Andrea Bolognani <abologna@redhat.com> Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
parent
b506874f9f
commit
519a2c5577
@ -62,14 +62,6 @@ qemuValidateDomainDefPSeriesFeature(const virDomainDef *def,
|
||||
break;
|
||||
|
||||
if (def->hpt_resizing != VIR_DOMAIN_HPT_RESIZING_NONE) {
|
||||
if (!virQEMUCapsGet(qemuCaps,
|
||||
QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT)) {
|
||||
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
|
||||
_("HTP resizing is not supported by this "
|
||||
"QEMU binary"));
|
||||
return -1;
|
||||
}
|
||||
|
||||
str = virDomainHPTResizingTypeToString(def->hpt_resizing);
|
||||
if (!str) {
|
||||
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
|
||||
|
@ -2267,8 +2267,7 @@ mymain(void)
|
||||
QEMU_CAPS_MACHINE_PSERIES_CAP_CCF_ASSIST,
|
||||
QEMU_CAPS_MACHINE_PSERIES_CAP_CFPC,
|
||||
QEMU_CAPS_MACHINE_PSERIES_CAP_SBBC,
|
||||
QEMU_CAPS_MACHINE_PSERIES_CAP_IBS,
|
||||
QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT);
|
||||
QEMU_CAPS_MACHINE_PSERIES_CAP_IBS);
|
||||
|
||||
/* parse error: no QEMU_CAPS_MACHINE_PSERIES_CAP_HPT_MAX_PAGE_SIZE */
|
||||
DO_TEST_PARSE_ERROR("pseries-features-hpt-pagesize",
|
||||
@ -2278,8 +2277,7 @@ mymain(void)
|
||||
QEMU_CAPS_MACHINE_PSERIES_CAP_CCF_ASSIST,
|
||||
QEMU_CAPS_MACHINE_PSERIES_CAP_CFPC,
|
||||
QEMU_CAPS_MACHINE_PSERIES_CAP_SBBC,
|
||||
QEMU_CAPS_MACHINE_PSERIES_CAP_IBS,
|
||||
QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT);
|
||||
QEMU_CAPS_MACHINE_PSERIES_CAP_IBS);
|
||||
|
||||
/* parse error: no QEMU_CAPS_MACHINE_PSERIES_CAP_HTM */
|
||||
DO_TEST_PARSE_ERROR("pseries-features-htm",
|
||||
@ -2289,8 +2287,7 @@ mymain(void)
|
||||
QEMU_CAPS_MACHINE_PSERIES_CAP_CCF_ASSIST,
|
||||
QEMU_CAPS_MACHINE_PSERIES_CAP_CFPC,
|
||||
QEMU_CAPS_MACHINE_PSERIES_CAP_SBBC,
|
||||
QEMU_CAPS_MACHINE_PSERIES_CAP_IBS,
|
||||
QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT);
|
||||
QEMU_CAPS_MACHINE_PSERIES_CAP_IBS);
|
||||
|
||||
/* parse error: no QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV */
|
||||
DO_TEST_PARSE_ERROR("pseries-features-nested-hv",
|
||||
@ -2300,8 +2297,7 @@ mymain(void)
|
||||
QEMU_CAPS_MACHINE_PSERIES_CAP_CCF_ASSIST,
|
||||
QEMU_CAPS_MACHINE_PSERIES_CAP_CFPC,
|
||||
QEMU_CAPS_MACHINE_PSERIES_CAP_SBBC,
|
||||
QEMU_CAPS_MACHINE_PSERIES_CAP_IBS,
|
||||
QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT);
|
||||
QEMU_CAPS_MACHINE_PSERIES_CAP_IBS);
|
||||
|
||||
/* parse error: no QEMU_CAPS_MACHINE_PSERIES_CAP_CCF_ASSIST */
|
||||
DO_TEST_PARSE_ERROR("pseries-features-ccf",
|
||||
@ -2311,13 +2307,11 @@ mymain(void)
|
||||
QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV,
|
||||
QEMU_CAPS_MACHINE_PSERIES_CAP_CFPC,
|
||||
QEMU_CAPS_MACHINE_PSERIES_CAP_SBBC,
|
||||
QEMU_CAPS_MACHINE_PSERIES_CAP_IBS,
|
||||
QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT);
|
||||
QEMU_CAPS_MACHINE_PSERIES_CAP_IBS);
|
||||
|
||||
/* parse error: no QEMU_CAPS_MACHINE_PSERIES_CFPC */
|
||||
DO_TEST_PARSE_ERROR("pseries-features-cfpc",
|
||||
QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
|
||||
QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT,
|
||||
QEMU_CAPS_MACHINE_PSERIES_CAP_HPT_MAX_PAGE_SIZE,
|
||||
QEMU_CAPS_MACHINE_PSERIES_CAP_HTM,
|
||||
QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV,
|
||||
@ -2328,7 +2322,6 @@ mymain(void)
|
||||
/* parse error: no QEMU_CAPS_MACHINE_PSERIES_SBBC */
|
||||
DO_TEST_PARSE_ERROR("pseries-features-sbbc",
|
||||
QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
|
||||
QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT,
|
||||
QEMU_CAPS_MACHINE_PSERIES_CAP_HPT_MAX_PAGE_SIZE,
|
||||
QEMU_CAPS_MACHINE_PSERIES_CAP_HTM,
|
||||
QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV,
|
||||
@ -2339,7 +2332,6 @@ mymain(void)
|
||||
/* parse error: no QEMU_CAPS_MACHINE_PSERIES_IBS */
|
||||
DO_TEST_PARSE_ERROR("pseries-features-ibs",
|
||||
QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
|
||||
QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT,
|
||||
QEMU_CAPS_MACHINE_PSERIES_CAP_HPT_MAX_PAGE_SIZE,
|
||||
QEMU_CAPS_MACHINE_PSERIES_CAP_HTM,
|
||||
QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV,
|
||||
|
@ -711,7 +711,6 @@ mymain(void)
|
||||
QEMU_CAPS_MACHINE_PSERIES_CAP_HTM,
|
||||
QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV,
|
||||
QEMU_CAPS_MACHINE_PSERIES_CAP_CCF_ASSIST,
|
||||
QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT,
|
||||
QEMU_CAPS_MACHINE_PSERIES_CAP_CFPC,
|
||||
QEMU_CAPS_MACHINE_PSERIES_CAP_SBBC,
|
||||
QEMU_CAPS_MACHINE_PSERIES_CAP_IBS);
|
||||
|
Loading…
x
Reference in New Issue
Block a user