Introduce virt-xml into disk APIs #394
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -31,9 +31,6 @@ import { | |
| undefineVm, | ||
| updateOrAddVm, | ||
| } from '../actions/store-actions.js'; | ||
| import { | ||
| setVmCreateInProgress, | ||
| setVmInstallInProgress, | ||
|
|
@@ -42,6 +39,7 @@ import { | |
| } from '../components/create-vm-dialog/uiState.js'; | ||
| import { | ||
| DOMAINSTATE, | ||
| getNextAvailableTarget, | ||
| fileDownload, | ||
| getHostDevSourceObject, | ||
| getNodeDevSource, | ||
|
|
@@ -63,7 +61,6 @@ import { | |
| import { | ||
| changeMedia, | ||
| updateBootOrder, | ||
| updateMaxMemory, | ||
| } from '../libvirt-xml-update.js'; | ||
| import { storagePoolRefresh } from './storagePool.js'; | ||
|
|
@@ -101,17 +98,6 @@ function buildConsoleVVFile(consoleDetail) { | |
| 'fullscreen=0\n'; | ||
| } | ||
|
|
||
| export function getPythonPath() { | ||
| return cockpit.spawn(["/bin/sh", "-c", "command -v /usr/libexec/platform-python || command -v python3 || command -v python"]).then(pyexe => { pythonPath = pyexe.trim() }); | ||
| } | ||
|
|
@@ -125,7 +111,6 @@ export function domainAttachDisk({ | |
| volumeName, | ||
| format, | ||
| target, | ||
| vmName, | ||
| permanent, | ||
| hotplug, | ||
|
|
@@ -134,9 +119,31 @@ export function domainAttachDisk({ | |
| busType, | ||
| serial, | ||
| }) { | ||
| const options = { err: "message" }; | ||
| if (connectionName === "system") | ||
| options.superuser = "try"; | ||
| let define = "--define"; | ||
| if (hotplug && !permanent) | ||
| define = "--no-define"; | ||
| let source = ""; | ||
| if (type === 'file') | ||
| source = `,source.file=${file}`; | ||
| else | ||
| source = `,source.pool=${poolName},source.volume=${volumeName}`; | ||
| let driverType = ""; | ||
| if (format && ['qcow2', 'raw'].includes(format)) | ||
| driverType = `,driver.type=${format}`; | ||
| let serialNum = ""; | ||
| if (serial) | ||
| serialNum = `,serial=${serial}`; | ||
| const shareableOption = shareable ? "yes" : "no"; | ||
|
|
||
| const args = ["virt-xml", "-c", `qemu:///${connectionName}`, vmName, "--add-device", "--disk", `type=${type},shareable=${shareableOption},target.bus=${busType},target.dev=${target},driver.name=qemu,driver.discard=unmap,cache=${cacheMode},device=${device}${source}${driverType}${serialNum}`, define]; | ||
|
|
||
| if (hotplug) | ||
| args.push("--update"); | ||
|
|
||
| return cockpit.spawn(args, options); | ||
| } | ||
|
|
||
| export function domainAttachHostDevices({ connectionName, vmName, live, devices }) { | ||
|
|
@@ -1101,10 +1108,45 @@ export function domainStart({ connectionName, id: objPath }) { | |
| return call(connectionName, objPath, 'org.libvirt.Domain', 'Create', [0], { timeout, type: 'u' }); | ||
| } | ||
|
|
||
| export function domainUpdateDiskAttributes({ connectionName, vmName, target, readonly, shareable, busType, oldBusType, existingTargets, cache }) { | ||
| const options = { err: "message" }; | ||
| if (connectionName === "system") | ||
| options.superuser = "try"; | ||
|
|
||
| const shareableOption = shareable ? "yes" : "no"; | ||
| const readonlyOption = readonly ? "yes" : "no"; | ||
| let newTarget = target; | ||
| let addressBus; | ||
| let addressType; | ||
| if (busType !== oldBusType) { | ||
| newTarget = getNextAvailableTarget(existingTargets, busType); | ||
| // Workaround for https://github.com/virt-manager/virt-manager/issues/430 | ||
| // Until that issue is fixed, we have to change address type and address bus manually | ||
| if (busType === "virtio") | ||
| addressType = "pci"; | ||
| if (busType === "usb" || busType === "scsi" || busType === "sata") { | ||
| // The only allowed bus value is '0' as defined in function qemuValidateDomainDeviceDefAddressDrive at | ||
| // https://gitlab.com/libvirt/libvirt/-/blob/master/src/qemu/qemu_validate.c | ||
| addressBus = 0; | ||
| if (busType === "usb") | ||
| addressType = "usb"; | ||
|
There was a problem hiding this comment. This added line is not executed by any test. Details |
||
| else | ||
| addressType = "drive"; | ||
| } | ||
| } | ||
| let cacheMode = ""; | ||
| if (cache) | ||
| cacheMode = `,cache=${cache}`; | ||
|
|
||
| const args = [ | ||
| "virt-xml", "-c", `qemu:///${connectionName}`, | ||
| vmName, "--edit", `target.dev=${target}`, "--disk", | ||
| `shareable=${shareableOption},readonly=${readonlyOption},target.bus=${busType},target.dev=${newTarget}${cacheMode}` | ||
| ]; | ||
| if (addressType) | ||
| args[args.length - 1] += (`,address.type=${addressType}`); | ||
| if (!isNaN(addressBus)) // addressBus can also be 0 | ||
| args[args.length - 1] += (`,address.bus=${addressBus}`); | ||
|
|
||
| return cockpit.spawn(args, options); | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These 2 added lines are not executed by any test. Details