vioscsi: fix issue with SCSI adapter surprise removal not taking effect #1350
Conversation
This file contains hidden or 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
|
Can one of the admins verify this patch? |
YanVugenfirer
requested changes
Apr 23, 2025
vioscsi/vioscsi.c
Outdated
| @@ -1169,7 +1169,7 @@ VioScsiAdapterControl(IN PVOID DeviceExtension, IN SCSI_ADAPTER_CONTROL_TYPE Con | |||
| { | |||
| RhelDbgPrint(TRACE_LEVEL_VERBOSE, " ScsiQuerySupportedControlTypes\n"); | |||
| ControlTypeList = (PSCSI_SUPPORTED_CONTROL_TYPE_LIST)Parameters; | |||
| AdjustedMaxControlType = (ControlTypeList->MaxControlType < 5) ? ControlTypeList->MaxControlType : 5; | |||
| AdjustedMaxControlType = (ControlTypeList->MaxControlType < 17) ? ControlTypeList->MaxControlType : 17; | |||
There was a problem hiding this comment.
Let’s switch to using MS defined enums for a better code readability:
typedef enum _SCSI_ADAPTER_CONTROL_TYPE {
ScsiQuerySupportedControlTypes = 0,
ScsiStopAdapter,
ScsiRestartAdapter,
ScsiSetBootConfig,
ScsiSetRunningConfig,
ScsiPowerSettingNotification,
ScsiAdapterPower,
ScsiAdapterPoFxPowerRequired,
ScsiAdapterPoFxPowerActive,
ScsiAdapterPoFxPowerSetFState,
ScsiAdapterPoFxPowerControl,
ScsiAdapterPrepareForBusReScan,
ScsiAdapterSystemPowerHints,
ScsiAdapterFilterResourceRequirements,
ScsiAdapterPoFxMaxOperationalPower,
ScsiAdapterPoFxSetPerfState,
ScsiAdapterSurpriseRemoval,
ScsiAdapterSerialNumber,
ScsiAdapterCryptoOperation,
ScsiAdapterQueryFruId,
ScsiAdapterSetEventLogging,
ScsiAdapterReportInternalData,
ScsiAdapterControlMax,
MakeAdapterControlTypeSizeOfUlong = 0xffffffff
} SCSI_ADAPTER_CONTROL_TYPE, *PSCSI_ADAPTER_CONTROL_TYPE;
There was a problem hiding this comment.
@YanVugenfirer ,I have changed one of the implementations to use MS-defined enums. This version will result in some additional iterations in the for loop compared to the previous version; however, I understand that this part of the code is not performance-sensitive, so it shouldn't be a major concern.
Additionally, I believe there is another method of implementation that is quite good, as demonstrated in Microsoft's miniport sample. I chose the current modification mainly to maintain consistency with the previous style.
zjmletang
force-pushed
the
fix_vioscsi
branch
2 times, most recently
from
8d69943 to
7699db5
Compare
for the problem description please visit virtio-win#1331 Signed-off-by: Zhang JianMing [email protected]
|
ok to test |
YanVugenfirer
approved these changes
May 26, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
for the problem description
please visit #1331
Signed-off-by: Zhang JianMing [email protected]