Skip to content

Commit 38961e3

Browse files
authored
Merge pull request #3 from firecracker-microvm/main
Merge upstream firecracker repo changes
2 parents b6d6f71 + e8e7956 commit 38961e3

File tree

311 files changed

+9756
-11569
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

311 files changed

+9756
-11569
lines changed

.dockerignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
.git/
2+
build/
3+
src/
4+
tests/
5+
docs/

.git-blame-ignore-revs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
8d2463fa21386d6c0c90b2010aaee5550b505c87
2+
ae93e49470433648b144a64514eef708cce15143

CONTRIBUTING.md

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,15 @@ If you just want to receive feedback for a contribution proposal, open an “RFC
5757
## Contribution Quality Standards
5858

5959
Most quality and style standards are enforced automatically during integration
60-
testing. Your contribution needs to meet the following standards:
60+
testing. For ease of use you can setup a git pre-commit hook by running the
61+
following in the Firecracker root directory:
62+
63+
```
64+
cargo install rusty-hook
65+
rusty-hook init
66+
```
67+
68+
Your contribution needs to meet the following standards:
6169

6270
- Separate each **logical change** into its own commit.
6371
- Each commit must pass all unit & code style tests, and the full pull request
@@ -68,6 +76,17 @@ testing. Your contribution needs to meet the following standards:
6876
- Document all your public functions.
6977
- Add a descriptive message for each commit. Follow
7078
[commit message best practices](https://github.com/erlang/otp/wiki/writing-good-commit-messages).
79+
- A good commit message may look like
80+
81+
```
82+
A descriptive title of 50 characters or fewer
83+
84+
A concise description where each line is 72 characters or fewer.
85+
86+
Signed-off-by: <A full name> <A email>
87+
Co-authored-by: <B full name> <B email>
88+
```
89+
7190
- Document your pull requests. Include the reasoning behind each change, and
7291
the testing done.
7392
- Acknowledge Firecracker's [Apache 2.0 license](LICENSE) and certify that no

Cargo.lock

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

docs/device-api.md

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,8 @@ definition, a call to one of the [API Endpoints](#api-endpoints) will succeed.
99

1010
**R** - Required: The device (column) **is required** for a Firecracker microVM
1111
API call to succeed. If the device (column) is omitted from a uVM definition,
12-
a call to one of the [API Endpoints](#api-endpoints) will return a result that
13-
depends on the device (see [issue #2173](https://github.com/firecracker-microvm/firecracker/issues/2173)).
14-
15-
- API calls related to `drives/{id}` result in 400 - BadRequest - HTTP response
16-
if the block device identified by `id` was not previously configured.
17-
- API calls related to `network-interfaces/{id}` result in 400 - BadRequest -
18-
HTTP response if the network device identified by `id` was not previously
19-
configured.
12+
a call to one of the [API Endpoints](#api-endpoints) will fail with a
13+
400 - BadRequest - HTTP response.
2014

2115
## API Endpoints
2216

docs/getting-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ curl -L ${release_url}/download/${latest}/firecracker-${latest}-${arch}.tgz \
6060
Rename the binary to "firecracker":
6161

6262
```console
63-
mv firecracker-${latest}-$(uname -m) firecracker
63+
mv release-${latest}-$(uname -m)/firecracker-${latest}-$(uname -m) firecracker
6464
```
6565

6666
If, instead, you'd like to build Firecracker yourself, you should check out

docs/kernel-policy.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ on which Firecracker is run:
6161
### ARM
6262

6363
* timekeeping - `CONFIG_ARM_AMBA`, `CONFIG_RTC_DRV_PL031`
64+
* serial console - `CONFIG_SERIAL_OF_PLATFORM`
6465

6566
### x86_64
6667

docs/mmds/mmds-user-guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ for restoring does not support persisting the version, the default will be used.
290290

291291
### MMDS formats
292292

293-
The response format can be JSON (experimental) or IMDS. The IMDS documentation
293+
The response format can be JSON or IMDS. The IMDS documentation
294294
can be found [here](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-metadata.html).
295295
The output format can be selected by specifying the optional `Accept` header.
296296
Using `Accept: application/json` will format the output to JSON, while using

0 commit comments

Comments
 (0)