Steven Sistare <steven.sist...@oracle.com> writes: > On 2/28/2024 11:05 AM, Markus Armbruster wrote: >> Steven Sistare <steven.sist...@oracle.com> writes: >> >>> On 2/28/2024 2:21 AM, Markus Armbruster wrote: >>>> Steve Sistare <steven.sist...@oracle.com> writes: >>>> >>>>> Fail the migration request if options are set that are incompatible >>>>> with cpr. >>>>> >>>>> Signed-off-by: Steve Sistare <steven.sist...@oracle.com> >> >> [...] >> >>>>> diff --git a/qapi/migration.json b/qapi/migration.json >>>>> index 0990297..c6bfe2e 100644 >>>>> --- a/qapi/migration.json >>>>> +++ b/qapi/migration.json >>>>> @@ -657,6 +657,8 @@ >>>>> # shared backend must be be non-volatile across reboot, such as by >>>>> backing >>>>> # it with a dax device. >>>>> # >>>>> +# cpr-reboot may not be used with postcopy, colo, or >>>>> background-snapshot. >>>>> +# >>>> >>>> @cpr-reboot >>>> >>>> COLO >>>> >>>> Wrap the line: >>>> >>>> # @cpr-reboot may not be used with postcopy, COLO, or >>>> # background-snapshot. >>>> >>>> This doesn't tell the reader what settings exactly do not work with >>>> @cpr-reboot. >>>> >>>> For instance "background-snapshot" is about enabling migration >>>> capability @background-snapshot. We could write something like "is >>>> incompatible with enabling migration capability @background-snapshot". >>>> >>>> Same for the other two. Worthwhile? >>> >>> I initially was more precise exactly as you suggest, but I realized that >>> postcopy encompasses multiple capabilities, and I did not want to enumerate >>> them, nor require new capabilities related to these 3 to be listed here >>> if/when they are created, so I generalized. A keyword search in this file >>> gives unambiguous matches. >>> >>> Peter pushed the patch a few hours before you sent this. >> >> Okay. >> >> A followup patch to correct @cpr-reboot, COLO and line wrapping would be >> nice. > > Will do - steve
Hmm, perhaps Peter can still squash in the corrections before posting his PR. Peter?