Skip to content

Commit 69ee626

Browse files
gaojiaqi7jyao1
authored andcommitted
Cargo.toml: disable default features of x86_64
Default features of `x86_64` use unstable feature which depends on nightly toolchain. Signed-off-by: Jiaqi Gao <[email protected]>
1 parent 513add2 commit 69ee626

File tree

6 files changed

+6
-7
lines changed

6 files changed

+6
-7
lines changed

devtools/test-runner-client/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ edition = "2018"
1111
linked_list_allocator = "0.10.4"
1212
spin = { version = "0.9.2", features = ["lazy"]}
1313
uart_16550 = "0.2.17"
14-
x86_64 = "0.14.9"
14+
x86_64 = { version = "0.14.9", default-features = false, features = ["instructions"] }

td-exception/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ bitflags = "1.2.1"
1212
lazy_static = { version = "1.0", features = ["spin_no_std"] }
1313
log = "0.4.13"
1414
tdx-tdcall = { path = "../tdx-tdcall", optional = true }
15-
x86_64 = "0.14.9"
15+
x86_64 = { version = "0.14.9", default-features = false, features = ["instructions"] }
1616
spin = "0.9.2"
1717

1818
[features]

td-paging/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ spin = "0.9.2"
1414
td-layout = { path = "../td-layout" }
1515
# Lock down to 0.44, otherwise it depends on inline asm
1616
x86 = "0.47.0"
17-
x86_64 = "0.14.9"
17+
x86_64 = { version = "0.14.9", default-features = false, features = ["instructions"] }

td-payload/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ td-shim-interface = { path = "../td-shim-interface" }
2727
td-exception = { path = "../td-exception" }
2828
td-paging = { path = "../td-paging" }
2929
x86 = "0.47.0"
30-
x86_64 = "0.14"
30+
x86_64 = { version = "0.14.9", default-features = false, features = ["instructions"] }
3131
td-benchmark = { path = "../devtools/td-benchmark", optional = true }
3232
tdx-tdcall = { path = "../tdx-tdcall", optional = true }
3333
zerocopy = { version = "0.7.31", features = ["derive"] }

td-shim/Cargo.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@ td-exception = { path = "../td-exception", features = ["tdx"], optional = true
3636
td-logger = { path = "../td-logger", optional = true }
3737
td-paging = { path = "../td-paging", optional = true }
3838
x86 = { version ="0.47.0", optional = true }
39-
# Lock down to 0.44, otherwise it depends on inline asm
40-
x86_64 = { version = "0.14.9", optional = true }
39+
x86_64 = { version = "0.14.9", default-features = false, features = ["instructions"], optional = true }
4140

4241
# secure boot
4342
der = {version = "0.4.5", features = ["derive", "alloc"], optional = true}

tests/test-td-paging/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ bootloader = "0.10.12"
1515
td-paging = { path = "../../td-paging" }
1616
td-layout = { path = "../../td-layout" }
1717
test-runner-client = { path = "../../devtools/test-runner-client" }
18-
x86_64 = "0.14.9"
18+
x86_64 = { version = "0.14.9", default-features = false, features = ["instructions"] }
1919

2020
[package.metadata.bootloader]
2121
map-physical-memory = true

0 commit comments

Comments
 (0)