Skip to content

Commit

Permalink
qemu: Assume QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT
Browse files Browse the repository at this point in the history 
All QEMU versions we support have this feature.

Signed-off-by: Andrea Bolognani <[email protected]>
Reviewed-by: Peter Krempa <[email protected]>
  • Loading branch information
@andreabolognani
andreabolognani committed Apr 19, 2022
1 parent b506874 commit 519a2c5
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 22 deletions.
8 changes: 0 additions & 8 deletions src/qemu/qemu_validate.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
18 changes: 5 additions & 13 deletions tests/qemuxml2argvtest.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand Down
1 change: 0 additions & 1 deletion tests/qemuxml2xmltest.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 519a2c5

Please sign in to comment.