Skip to content

Commit e014e82

Browse files
Merge branch 'main' into pci-hotplug
2 parents 95d01df + fe6fed7 commit e014e82

3 files changed

Lines changed: 18 additions & 1 deletion

File tree

buf.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,17 @@ lint:
1616
use:
1717
- STANDARD
1818
breaking:
19+
ignore_only:
20+
FIELD_SAME_NAME:
21+
- protect/control/v1/
22+
FIELD_SAME_JSON_NAME:
23+
- protect/control/v1/
24+
EXTENSION_NO_DELETE:
25+
- protect/control/v1/
26+
ENUM_VALUE_NO_DELETE:
27+
- protect/control/v1/
28+
FIELD_NO_DELETE:
29+
- protect/control/v1/
1930
use:
31+
- WIRE_JSON
2032
- FILE

protect/control/v1/common.proto

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,8 @@ enum ZoneState {
187187
ZONE_STATE_CREATING = 1;
188188
ZONE_STATE_CREATED = 2;
189189
ZONE_STATE_READY = 3;
190-
ZONE_STATE_EXITED = 4;
190+
reserved 4;
191+
reserved "ZONE_STATE_EXITED";
191192
ZONE_STATE_DESTROYING = 5;
192193
ZONE_STATE_DESTROYED = 6;
193194
ZONE_STATE_FAILED = 7;

protect/control/v1/control.proto

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@ message GetHostStatusReply {
6767
string host_ipv6 = 5;
6868
string host_mac = 6;
6969
optional uint64 hyp_free_mem = 7;
70+
optional string protect_git_sha = 8;
71+
optional string protect_last_tag = 9;
72+
optional uint64 protect_revs_since_tag = 10;
73+
optional string protect_branch = 11;
7074
}
7175

7276
message CreateZoneRequest {

0 commit comments

Comments
 (0)