@@ -4060,7 +4060,7 @@ index 0000000000..fd6a56241c
40604060+ DECLCALLBACK(void) vbvavirtioGpuPortReportHostCursorCapabilities(PPDMIDISPLAYPORT, bool, bool);
40614061+ DECLCALLBACK(void) vbvavirtioGpuPortReportHostCursorPosition(PPDMIDISPLAYPORT, uint32_t, uint32_t, bool);
40624062diff --git a/src/VBox/Devices/Makefile.kmk b/src/VBox/Devices/Makefile.kmk
4063- index d2bef9129d..a4caa91016 100644
4063+ index 90f01dbd20..69e96a4d82 100644
40644064--- a/src/VBox/Devices/Makefile.kmk
40654065+++ b/src/VBox/Devices/Makefile.kmk
40664066@@ -197,6 +197,10 @@ if !defined(VBOX_ONLY_EXTPACKS) && "$(intersects $(KBUILD_TARGET_ARCH),$(VBOX_SU
@@ -4088,10 +4088,10 @@ index d2bef9129d..a4caa91016 100644
40884088 VBoxDD_SOURCES += Storage/HBDMgmt-generic.cpp
40894089 endif
40904090diff --git a/src/VBox/Devices/VirtIO/VirtioCore.cpp b/src/VBox/Devices/VirtIO/VirtioCore.cpp
4091- index f0ed6e4219..6e33955f09 100644
4091+ index a0deddd698..669cf335c0 100644
40924092--- a/src/VBox/Devices/VirtIO/VirtioCore.cpp
40934093+++ b/src/VBox/Devices/VirtIO/VirtioCore.cpp
4094- @@ -1446 ,7 +1446 ,7 @@ static int virtioNudgeGuest(PPDMDEVINS pDevIns, PVIRTIOCORE pVirtio, uint8_t uCa
4094+ @@ -1451 ,7 +1451 ,7 @@ static int virtioNudgeGuest(PPDMDEVINS pDevIns, PVIRTIOCORE pVirtio, uint8_t uCa
40954095
40964096 if (!pVirtio->fMsiSupport)
40974097 {
@@ -4101,10 +4101,10 @@ index f0ed6e4219..6e33955f09 100644
41014101 }
41024102 else if (uMsixVector != VIRTIO_MSI_NO_VECTOR)
41034103diff --git a/src/VBox/Devices/build/VBoxDD.cpp b/src/VBox/Devices/build/VBoxDD.cpp
4104- index d601e45546..e7497c649f 100644
4104+ index 8e51da7c4f..ea4353a2c7 100644
41054105--- a/src/VBox/Devices/build/VBoxDD.cpp
41064106+++ b/src/VBox/Devices/build/VBoxDD.cpp
4107- @@ -250 ,6 +250 ,9 @@ extern "C" DECLEXPORT(int) VBoxDevicesRegister(PPDMDEVREGCB pCallbacks, uint32_t
4107+ @@ -254 ,6 +254 ,9 @@ extern "C" DECLEXPORT(int) VBoxDevicesRegister(PPDMDEVREGCB pCallbacks, uint32_t
41084108 if (RT_FAILURE(rc))
41094109 return rc;
41104110 #endif
@@ -4115,7 +4115,7 @@ index d601e45546..e7497c649f 100644
41154115 return VINF_SUCCESS;
41164116 }
41174117diff --git a/src/VBox/Devices/build/VBoxDD.h b/src/VBox/Devices/build/VBoxDD.h
4118- index d208ea1e7f..63dedfaa64 100644
4118+ index 0927d8a327..fbd4f800c9 100644
41194119--- a/src/VBox/Devices/build/VBoxDD.h
41204120+++ b/src/VBox/Devices/build/VBoxDD.h
41214121@@ -109,6 +109,7 @@ extern const PDMDEVREG g_DevicePciRaw;
@@ -4957,10 +4957,10 @@ index b4665d696c..1085b52865 100644
49574957 /* ISA/LPC controller */
49584958 {"lpc", 0, 31, 0, 0},
49594959diff --git a/src/VBox/Main/src-client/ConsoleImpl2.cpp b/src/VBox/Main/src-client/ConsoleImpl2.cpp
4960- index 7a4ee5db5f..b571253e26 100644
4960+ index cc919754dc..112341cefe 100644
49614961--- a/src/VBox/Main/src-client/ConsoleImpl2.cpp
49624962+++ b/src/VBox/Main/src-client/ConsoleImpl2.cpp
4963- @@ -674 ,7 +674 ,7 @@ HRESULT Console::i_attachRawPCIDevices(PUVM pUVM, BusAssignmentManager *pBusMgr,
4963+ @@ -677 ,7 +677 ,7 @@ HRESULT Console::i_attachRawPCIDevices(PUVM pUVM, BusAssignmentManager *pBusMgr,
49644964 #endif
49654965
49664966
@@ -4969,7 +4969,7 @@ index 7a4ee5db5f..b571253e26 100644
49694969 {
49704970 HRESULT hrc {S_OK};
49714971 PCFGMNODE pInst{NULL};
4972- @@ -734 ,6 +734 ,39 @@ HRESULT Console::i_attachVfioDevices(BusAssignmentManager *pBusMgr, PCFGMNODE pD
4972+ @@ -737 ,6 +737 ,39 @@ HRESULT Console::i_attachVfioDevices(BusAssignmentManager *pBusMgr, PCFGMNODE pD
49734973 return hrc;
49744974 }
49754975
@@ -5009,7 +5009,7 @@ index 7a4ee5db5f..b571253e26 100644
50095009 /**
50105010 * Updates the device type for a LED.
50115011 *
5012- @@ -1482 ,6 +1515 ,26 @@ int Console::i_configConstructorInner(PUVM pUVM, PVM pVM, PCVMMR3VTABLE pVMM, Au
5012+ @@ -1485 ,6 +1518 ,26 @@ int Console::i_configConstructorInner(PUVM pUVM, PVM pVM, PCVMMR3VTABLE pVMM, Au
50135013 bool fGimDebug = false;
50145014 com::Utf8Str strGimDebugAddress = "127.0.0.1";
50155015 uint32_t uGimDebugPort = 50000;
@@ -5036,7 +5036,7 @@ index 7a4ee5db5f..b571253e26 100644
50365036 if (strParavirtDebug.isNotEmpty())
50375037 {
50385038 /* Hyper-V debug options. */
5039- @@ -1534 ,8 +1587 ,6 @@ int Console::i_configConstructorInner(PUVM pUVM, PVM pVM, PCVMMR3VTABLE pVMM, Au
5039+ @@ -1537 ,8 +1590 ,6 @@ int Console::i_configConstructorInner(PUVM pUVM, PVM pVM, PCVMMR3VTABLE pVMM, Au
50405040 /* Update HyperV CFGM node with active debug options. */
50415041 if (fGimHvDebug)
50425042 {
@@ -5045,7 +5045,7 @@ index 7a4ee5db5f..b571253e26 100644
50455045 InsertConfigString(pHvNode, "VendorID", strGimHvVendor);
50465046 InsertConfigInteger(pHvNode, "VSInterface", fGimHvVsIf ? 1 : 0);
50475047 InsertConfigInteger(pHvNode, "HypercallDebugInterface", fGimHvHypercallIf ? 1 : 0);
5048- @@ -1984 ,6 +2035 ,23 @@ int Console::i_configConstructorInner(PUVM pUVM, PVM pVM, PCVMMR3VTABLE pVMM, Au
5048+ @@ -1987 ,6 +2038 ,23 @@ int Console::i_configConstructorInner(PUVM pUVM, PVM pVM, PCVMMR3VTABLE pVMM, Au
50495049 if (FAILED(vrc))
50505050 return vrc;
50515051 break;
@@ -5069,7 +5069,7 @@ index 7a4ee5db5f..b571253e26 100644
50695069 default:
50705070 AssertMsgFailed(("Invalid graphicsController=%d\n", enmGraphicsController));
50715071 return pVMM->pfnVMR3SetError(pUVM, VERR_INVALID_PARAMETER, RT_SRC_POS,
5072- @@ -4374 ,7 +4442 ,8 @@ int Console::i_configGraphicsController(PCFGMNODE pDevices,
5072+ @@ -4387 ,7 +4455 ,8 @@ int Console::i_configGraphicsController(PCFGMNODE pDevices,
50735073 const ComPtr<IMachine> &ptrMachine,
50745074 const ComPtr<IGraphicsAdapter> &ptrGraphicsAdapter,
50755075 const ComPtr<IBIOSSettings> &ptrBiosSettings,
@@ -5079,7 +5079,7 @@ index 7a4ee5db5f..b571253e26 100644
50795079 {
50805080 // InsertConfig* throws
50815081 try
5082- @@ -4391 ,11 +4460 ,24 @@ int Console::i_configGraphicsController(PCFGMNODE pDevices,
5082+ @@ -4404 ,11 +4473 ,24 @@ int Console::i_configGraphicsController(PCFGMNODE pDevices,
50835083
50845084 hrc = pBusMgr->assignPCIDevice(pcszDevice, pInst); H();
50855085 InsertConfigNode(pInst, "Config", &pCfg);
0 commit comments