8026296455
- util: introduce object for holding a system inhibitor lock (RHEL-83064) - src: convert drivers over to new virInhibitor APIs (RHEL-83064) - rpc: remove logind support for virNetDaemon (RHEL-83064) - util: fix off-by-1 in inhibitor constants (RHEL-83064) - util: don't attempt to acquire logind inhibitor if not requested (RHEL-83064) - network: Free inhibitor in networkStateCleanup() (RHEL-83064) - conf: introduce support for multiple ACPI tables (RHEL-81041) - src: validate permitted ACPI table types in libxl/qemu drivers (RHEL-81041) - src: introduce 'raw' and 'rawset' ACPI table types (RHEL-81041) - qemu: support 'raw' ACPI table type (RHEL-81041) - libxl: support 'rawset' ACPI table type (RHEL-81041) - conf: support MSDM ACPI table type (RHEL-81041) - qemu: support MSDM ACPI table type (RHEL-81041) - qemuxmlconftest: Include shared memory 'net-vhostuser' test cases (RHEL-84133) - qemuValidateDomainDeviceDefNetwork: Require shared memory for all vhost-user interfaces (RHEL-84133) - qemu: process: Remove un-updated 'qemuProcessStartWarnShmem' (RHEL-84133) Resolves: RHEL-81041, RHEL-83064, RHEL-84133
47 lines
1.8 KiB
Diff
47 lines
1.8 KiB
Diff
From 593bba2d87b7e2bcfedd544d7d48eba936b7a212 Mon Sep 17 00:00:00 2001
|
|
Message-ID: <593bba2d87b7e2bcfedd544d7d48eba936b7a212.1742990721.git.jdenemar@redhat.com>
|
|
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
|
|
Date: Tue, 7 Jan 2025 15:21:18 +0000
|
|
Subject: [PATCH] util: fix off-by-1 in inhibitor constants
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
The inhibitor constant values were off-by-1, so when converted into
|
|
string format, we picked the wrong names
|
|
|
|
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
(cherry picked from commit fc3a60d9d7b29283a0b2d57bb06d15fb597a5003)
|
|
Resolves: https://issues.redhat.com/browse/RHEL-83064
|
|
---
|
|
src/util/virinhibitor.h | 14 +++++++-------
|
|
1 file changed, 7 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/src/util/virinhibitor.h b/src/util/virinhibitor.h
|
|
index 0a1c445d41..49cf32fbeb 100644
|
|
--- a/src/util/virinhibitor.h
|
|
+++ b/src/util/virinhibitor.h
|
|
@@ -26,13 +26,13 @@ typedef struct _virInhibitor virInhibitor;
|
|
|
|
typedef enum {
|
|
VIR_INHIBITOR_WHAT_NONE = 0,
|
|
- VIR_INHIBITOR_WHAT_SLEEP = (1 << 1),
|
|
- VIR_INHIBITOR_WHAT_SHUTDOWN = (1 << 2),
|
|
- VIR_INHIBITOR_WHAT_IDLE = (1 << 3),
|
|
- VIR_INHIBITOR_WHAT_POWER_KEY = (1 << 4),
|
|
- VIR_INHIBITOR_WHAT_SUSPEND_KEY = (1 << 5),
|
|
- VIR_INHIBITOR_WHAT_HIBERNATE_KEY = (1 << 6),
|
|
- VIR_INHIBITOR_WHAT_LID_SWITCH = (1 << 7),
|
|
+ VIR_INHIBITOR_WHAT_SLEEP = (1 << 0),
|
|
+ VIR_INHIBITOR_WHAT_SHUTDOWN = (1 << 1),
|
|
+ VIR_INHIBITOR_WHAT_IDLE = (1 << 2),
|
|
+ VIR_INHIBITOR_WHAT_POWER_KEY = (1 << 3),
|
|
+ VIR_INHIBITOR_WHAT_SUSPEND_KEY = (1 << 4),
|
|
+ VIR_INHIBITOR_WHAT_HIBERNATE_KEY = (1 << 5),
|
|
+ VIR_INHIBITOR_WHAT_LID_SWITCH = (1 << 6),
|
|
} virInhibitorWhat;
|
|
|
|
typedef enum {
|
|
--
|
|
2.49.0
|