diff mbox

[2/4] qemu: caps: Rename CAPS_DISABLE_S[34] to CAPS_PIIX_DISABLE_S[34]

Message ID de31bab9371eaf7d105b9c2f8a841b0e1f9c639e.1452375080.git.crobinso@redhat.com
State Accepted
Commit 5900356efb1d0fa8e8ddf2096410cdffc02d7b47
Headers show

Commit Message

Cole Robinson Jan. 9, 2016, 9:32 p.m. UTC 
These settings are specific to PIIX, so clarify it
---
 src/qemu/qemu_capabilities.c | 4 ++--
 src/qemu/qemu_capabilities.h | 4 ++--
 src/qemu/qemu_command.c      | 4 ++--
 tests/qemuxml2argvtest.c     | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

-- 
2.5.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
diff mbox

Patch

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 80dd936..475febc 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1597,8 +1597,8 @@  static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsIDEDrive[] = {
 };
 
 static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsPiix4PM[] = {
-    { "disable_s3", QEMU_CAPS_DISABLE_S3 },
-    { "disable_s4", QEMU_CAPS_DISABLE_S4 },
+    { "disable_s3", QEMU_CAPS_PIIX_DISABLE_S3 },
+    { "disable_s4", QEMU_CAPS_PIIX_DISABLE_S4 },
 };
 
 static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsUSBRedir[] = {
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index c148f2d..99879d8 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -190,10 +190,10 @@  typedef enum {
     QEMU_CAPS_SCSI_LSI, /* -device lsi */
     QEMU_CAPS_VIRTIO_SCSI, /* -device virtio-scsi-* */
     QEMU_CAPS_BLOCKIO, /* -device ...logical_block_size & co */
-    QEMU_CAPS_DISABLE_S3, /* S3 BIOS Advertisement on/off */
+    QEMU_CAPS_PIIX_DISABLE_S3, /* -M pc S3 BIOS Advertisement on/off */
 
     /* 105 */
-    QEMU_CAPS_DISABLE_S4, /* S4 BIOS Advertisement on/off */
+    QEMU_CAPS_PIIX_DISABLE_S4, /* -M pc S4 BIOS Advertisement on/off */
     QEMU_CAPS_USB_REDIR_FILTER, /* usb-redir.filter */
     QEMU_CAPS_IDE_DRIVE_WWN, /* Is ide-drive.wwn available? */
     QEMU_CAPS_SCSI_DISK_WWN, /* Is scsi-disk.wwn available? */
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 1f05935..0ee3247 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -9806,7 +9806,7 @@  qemuBuildCommandLine(virConnectPtr conn,
     }
 
     if (def->pm.s3) {
-        if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DISABLE_S3)) {
+        if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_PIIX_DISABLE_S3)) {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                            "%s", _("setting ACPI S3 not supported"));
             goto error;
@@ -9817,7 +9817,7 @@  qemuBuildCommandLine(virConnectPtr conn,
     }
 
     if (def->pm.s4) {
-        if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DISABLE_S4)) {
+        if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_PIIX_DISABLE_S4)) {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                            "%s", _("setting ACPI S4 not supported"));
             goto error;
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index b023522..b75d453 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -702,7 +702,7 @@  mymain(void)
 
     DO_TEST("hugepages", QEMU_CAPS_MEM_PATH);
     DO_TEST("hugepages-numa", QEMU_CAPS_RTC, QEMU_CAPS_NO_KVM_PIT,
-            QEMU_CAPS_DISABLE_S3, QEMU_CAPS_DISABLE_S4,
+            QEMU_CAPS_PIIX_DISABLE_S3, QEMU_CAPS_PIIX_DISABLE_S4,
             QEMU_CAPS_DEVICE, QEMU_CAPS_VIRTIO_SCSI,
             QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_PCI_MULTIFUNCTION,
             QEMU_CAPS_SPICE, QEMU_CAPS_CHARDEV_SPICEVMC,
@@ -970,9 +970,9 @@  mymain(void)
     DO_TEST("input-usbmouse", NONE);
     DO_TEST("input-usbtablet", NONE);
     DO_TEST("misc-acpi", NONE);
-    DO_TEST("misc-disable-s3", QEMU_CAPS_DISABLE_S3);
-    DO_TEST("misc-disable-suspends", QEMU_CAPS_DISABLE_S3, QEMU_CAPS_DISABLE_S4);
-    DO_TEST("misc-enable-s4", QEMU_CAPS_DISABLE_S4);
+    DO_TEST("misc-disable-s3", QEMU_CAPS_PIIX_DISABLE_S3);
+    DO_TEST("misc-disable-suspends", QEMU_CAPS_PIIX_DISABLE_S3, QEMU_CAPS_PIIX_DISABLE_S4);
+    DO_TEST("misc-enable-s4", QEMU_CAPS_PIIX_DISABLE_S4);
     DO_TEST_FAILURE("misc-enable-s4", NONE);
     DO_TEST("misc-no-reboot", NONE);
     DO_TEST("misc-uuid", NONE);