Skip to content

Commit 502be1c

Browse files
author
shenjin
committed
<fix>[kvm]: Add vmPciDeviceAddress field for better tracking
- Add vmPciDeviceAddress field to PciDeviceVO - Set vmPciDeviceAddress when loading PCI device to VM - Clear vmPciDeviceAddress when unloading PCI device - Update vmPciDeviceAddress during host reconnection Resolves: ZSTAC-67275 Change-Id: I67626e67787062616679786b6576636c73747477
1 parent ee9f20d commit 502be1c

3 files changed

Lines changed: 19 additions & 0 deletions

File tree

conf/db/upgrade/V5.5.6__schema.sql

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
CALL ADD_COLUMN('PciDeviceVO', 'vmPciDeviceAddress', 'varchar(32)', 1, NULL);

plugin/kvm/src/main/java/org/zstack/kvm/KVMAgentCommands.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2914,6 +2914,8 @@ public static class VmDevicesInfoResponse extends AgentResponse {
29142914
private VirtualDeviceInfo memBalloonInfo;
29152915
@GrayVersion(value = "5.0.0")
29162916
private VirtualizerInfoTO virtualizerInfo;
2917+
@GrayVersion(value = "5.5.6")
2918+
private Map<String, String> pciDeviceInfos;
29172919

29182920
public VirtualDeviceInfo getMemBalloonInfo() {
29192921
return memBalloonInfo;
@@ -2946,6 +2948,14 @@ public VirtualizerInfoTO getVirtualizerInfo() {
29462948
public void setVirtualizerInfo(VirtualizerInfoTO virtualizerInfo) {
29472949
this.virtualizerInfo = virtualizerInfo;
29482950
}
2951+
2952+
public Map<String, String> getPciDeviceInfos() {
2953+
return pciDeviceInfos;
2954+
}
2955+
2956+
public void setPciDeviceInfos(Map<String, String> pciDeviceInfos) {
2957+
this.pciDeviceInfos = pciDeviceInfos;
2958+
}
29492959
}
29502960

29512961
public static class SyncVmDeviceInfoCmd extends AgentCommand {

sdk/src/main/java/org/zstack/sdk/PciDeviceInventory.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,14 @@ public java.lang.String getDependentDevices() {
193193
return this.dependentDevices;
194194
}
195195

196+
public java.lang.String vmPciDeviceAddress;
197+
public void setVmPciDeviceAddress(java.lang.String vmPciDeviceAddress) {
198+
this.vmPciDeviceAddress = vmPciDeviceAddress;
199+
}
200+
public java.lang.String getVmPciDeviceAddress() {
201+
return this.vmPciDeviceAddress;
202+
}
203+
196204
public java.sql.Timestamp createDate;
197205
public void setCreateDate(java.sql.Timestamp createDate) {
198206
this.createDate = createDate;

0 commit comments

Comments
 (0)