Skip to content

Commit 5eb1337

Browse files
authored
Bump Propolis once more (#9682)
only two changes that are actually interesting for Omicron, but the full set: * ASpace should allow spaces with size 1 (propolis#1020) * run header-check in CI (propolis#1017) * small typo that I couldn't ignore (propolis#1018) * Indicator should allow stopping instances at Init (propolis#1007) The first one fixes a Propolis panic when guests use fixed interrupts for VirtIO NICs (so far as we know the only currently-relevant case of this is iPXE) That last one fixes an issue where stopping a started-but-not-running VM crashes Propolis. I haven't tried to reach that issue via Neuxs, but I imagine it is reachable you stop an instance at the right moment after trying to start it. Either way, Propolis shouldn't die like that.
1 parent c17bdd2 commit 5eb1337

File tree

3 files changed

+23
-23
lines changed

3 files changed

+23
-23
lines changed

Cargo.lock

Lines changed: 17 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -678,10 +678,10 @@ progenitor-client = "0.10.0"
678678
# NOTE: if you change the pinned revision of the `bhyve_api` and propolis
679679
# dependencies, you must also update the references in package-manifest.toml to
680680
# match the new revision.
681-
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "ff31c527515d65886e599fc07eb41240aeb767c6" }
682-
propolis_api_types = { git = "https://github.com/oxidecomputer/propolis", rev = "ff31c527515d65886e599fc07eb41240aeb767c6" }
683-
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "ff31c527515d65886e599fc07eb41240aeb767c6" }
684-
propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "ff31c527515d65886e599fc07eb41240aeb767c6" }
681+
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "2aa7f9d0ee84a1c45e821d6444b1d2f0e69b743e" }
682+
propolis_api_types = { git = "https://github.com/oxidecomputer/propolis", rev = "2aa7f9d0ee84a1c45e821d6444b1d2f0e69b743e" }
683+
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "2aa7f9d0ee84a1c45e821d6444b1d2f0e69b743e" }
684+
propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "2aa7f9d0ee84a1c45e821d6444b1d2f0e69b743e" }
685685
# NOTE: see above!
686686
proptest = "1.7.0"
687687
qorb = "0.4.1"

package-manifest.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -650,10 +650,10 @@ service_name = "propolis-server"
650650
only_for_targets.image = "standard"
651651
source.type = "prebuilt"
652652
source.repo = "propolis"
653-
source.commit = "ff31c527515d65886e599fc07eb41240aeb767c6"
653+
source.commit = "2aa7f9d0ee84a1c45e821d6444b1d2f0e69b743e"
654654
# The SHA256 digest is automatically posted to:
655655
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/propolis/image/<commit>/propolis-server.sha256.txt
656-
source.sha256 = "8e361311d7f53aaa34c0bd5ee868274703dcbb7380e8dcc06d56c271e1748f41"
656+
source.sha256 = "32bd7ec72221b16c1b4705192e13f665deea9d9b4a1c80b2bd558463d94f5f6e"
657657
output.type = "zone"
658658

659659
[package.mg-ddm-gz]

0 commit comments

Comments
 (0)