Skip to content

qemu-vm device name cleanup#92205

Merged
nh2 merged 3 commits intoNixOS:masterfrom
chkno:qemu-vm-cleanup
Jul 4, 2020
Merged

qemu-vm device name cleanup#92205
nh2 merged 3 commits intoNixOS:masterfrom
chkno:qemu-vm-cleanup

Conversation

@chkno
Copy link
Member

@chkno chkno commented Jul 3, 2020

Motivation for this change

This is just the cleanup & refactor pieces from #72354 as a separate PR so that #92122 can build atop them without waiting for #72354 to be merged.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Jul 3, 2020
@chkno chkno mentioned this pull request Jul 3, 2020
Merged
12 tasks
worldofpeace
worldofpeace reviewed Jul 3, 2020
View reviewed changes
@chkno chkno force-pushed the qemu-vm-cleanup branch from 3648507 to 710827b Compare July 3, 2020 19:41
nh2
nh2 reviewed Jul 3, 2020
View reviewed changes
nh2
nh2 requested changes Jul 4, 2020
View reviewed changes
@nh2 nh2 mentioned this pull request Jul 4, 2020
Merged
13 tasks
@chkno chkno force-pushed the qemu-vm-cleanup branch 2 times, most recently from 41e2c7f to 5a0d2d6 Compare July 4, 2020 02:21
@chkno chkno requested a review from nh2 July 4, 2020 02:23
@chkno chkno force-pushed the qemu-vm-cleanup branch from 5a0d2d6 to 987c8b3 Compare July 4, 2020 02:37
@chkno
Copy link
Member Author

chkno commented Jul 4, 2020

After seeing another driveDeviceName usage example in #92122 in which 0-based indices were potentially confusing, I have changed driveDeviceName to use 1-based indices instead. Thanks, @nh2!

nh2
nh2 reviewed Jul 4, 2020
View reviewed changes
nixos/modules/virtualisation/qemu-vm.nix Outdated
Copy link
Contributor

@nh2 nh2 Jul 4, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Multiple typo pointed out by #92122 (review)

Copy link
Contributor

@nh2 nh2 Jul 4, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have force-pushed a fix to this into your PR (top commit).

@nh2 nh2 force-pushed the qemu-vm-cleanup branch from 987c8b3 to e74755c Compare July 4, 2020 12:42
nh2
nh2 approved these changes Jul 4, 2020
View reviewed changes
Copy link
Contributor

@nh2 nh2 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My VM tests show that this is working.

@nh2 nh2 merged commit 7c903ca into NixOS:master Jul 4, 2020
@chkno chkno mentioned this pull request Jul 6, 2020
Closed
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nh2 nh2 nh2 approved these changes

+1 more reviewer

@worldofpeace worldofpeace worldofpeace left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@chkno @nh2 @worldofpeace