External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-31 05:57:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: caps: Rename CAPS_DISABLE_S[34] to CAPS_PIIX_DISABLE_S[34]

Browse Source 
These settings are specific to PIIX, so clarify it
This commit is contained in:
Cole Robinson 2016-01-04 17:57:06 -05:00
parent ab963449dc
commit 5900356efb
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/qemu/qemu_capabilities.c
View File

@ -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[] = {

4
src/qemu/qemu_capabilities.h
View File

@ -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? */

4
src/qemu/qemu_command.c
View File

@ -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;

8
tests/qemuxml2argvtest.c
View File

@ -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);