External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 11:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: capabilities: Retire QEMU_CAPS_NO_HPET

Browse Source 
All uses were replaced by an explicit architecture check.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2023-03-06 16:00:43 +01:00
parent bf476875d8
commit e0b956cd66
12 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/qemu/qemu_capabilities.c
View File

@ -110,7 +110,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
/* 30 */
"vhost-net", /* X_QEMU_CAPS_VHOST_NET */
"rtc-td-hack", /* X_QEMU_CAPS_RTC_TD_HACK */
"no-hpet", /* QEMU_CAPS_NO_HPET */
"no-hpet", /* X_QEMU_CAPS_NO_HPET */
"no-kvm-pit", /* X_QEMU_CAPS_NO_KVM_PIT */
"tdf", /* X_QEMU_CAPS_TDF */
@ -5473,12 +5473,6 @@ void
virQEMUCapsInitQMPBasicArch(virQEMUCaps *qemuCaps)
{
switch (qemuCaps->arch) {
case VIR_ARCH_I686:
case VIR_ARCH_X86_64:
/* HPET is x86 specific */
virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_HPET);
break;
case VIR_ARCH_AARCH64:
/* gic is arm specific */
virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACH_VIRT_GIC_VERSION);
@ -5491,6 +5485,8 @@ virQEMUCapsInitQMPBasicArch(virQEMUCaps *qemuCaps)
virQEMUCapsSet(qemuCaps, QEMU_CAPS_LOADPARM);
break;
case VIR_ARCH_I686:
case VIR_ARCH_X86_64:
case VIR_ARCH_ALPHA:
case VIR_ARCH_PPC:
case VIR_ARCH_PPCEMB:
@ -5568,11 +5564,6 @@ virQEMUCapsInitProcessCapsInterlock(virQEMUCaps *qemuCaps)
* on a not entirely related witness. */
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_JSON))
virQEMUCapsSet(qemuCaps, QEMU_CAPS_COMPAT_DEPRECATED);
/* Modern-style config of the HPET timer overrides support for the '-no-hpet'
* option */
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_MACHINE_HPET))
virQEMUCapsClear(qemuCaps, QEMU_CAPS_NO_HPET);
}

2
src/qemu/qemu_capabilities.h
View File

@ -88,7 +88,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
/* 30 */
X_QEMU_CAPS_VHOST_NET, /* vhost-net support available */
X_QEMU_CAPS_RTC_TD_HACK, /* -rtc-td-hack available */
QEMU_CAPS_NO_HPET, /* -no-hpet flag is supported */
X_QEMU_CAPS_NO_HPET, /* -no-hpet flag is supported */
X_QEMU_CAPS_NO_KVM_PIT, /* -no-kvm-pit-reinjection supported */
X_QEMU_CAPS_TDF, /* -tdf flag (user-mode pit catchup) */

1
tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
View File

@ -5,7 +5,6 @@
<selfvers>0</selfvers>
<flag name='kvm'/>
<flag name='sdl'/>
<flag name='no-hpet'/>
<flag name='spice'/>
<flag name='hda-duplex'/>
<flag name='ccid-emulated'/>

1
tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
View File

@ -5,7 +5,6 @@
<selfvers>0</selfvers>
<flag name='kvm'/>
<flag name='sdl'/>
<flag name='no-hpet'/>
<flag name='spice'/>
<flag name='hda-duplex'/>
<flag name='ccid-emulated'/>

1
tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
View File

@ -5,7 +5,6 @@
<selfvers>0</selfvers>
<flag name='kvm'/>
<flag name='sdl'/>
<flag name='no-hpet'/>
<flag name='spice'/>
<flag name='hda-duplex'/>
<flag name='ccid-emulated'/>

1
tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
View File

@ -5,7 +5,6 @@
<selfvers>0</selfvers>
<flag name='kvm'/>
<flag name='sdl'/>
<flag name='no-hpet'/>
<flag name='spice'/>
<flag name='hda-duplex'/>
<flag name='ccid-emulated'/>

1
tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
View File

@ -5,7 +5,6 @@
<selfvers>0</selfvers>
<flag name='kvm'/>
<flag name='sdl'/>
<flag name='no-hpet'/>
<flag name='spice'/>
<flag name='hda-duplex'/>
<flag name='ccid-emulated'/>

1
tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
View File

@ -5,7 +5,6 @@
<selfvers>0</selfvers>
<flag name='kvm'/>
<flag name='sdl'/>
<flag name='no-hpet'/>
<flag name='spice'/>
<flag name='hda-duplex'/>
<flag name='ccid-emulated'/>

1
tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
View File

@ -5,7 +5,6 @@
<selfvers>0</selfvers>
<flag name='kvm'/>
<flag name='sdl'/>
<flag name='no-hpet'/>
<flag name='spice'/>
<flag name='hda-duplex'/>
<flag name='ccid-emulated'/>

1
tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
View File

@ -5,7 +5,6 @@
<selfvers>0</selfvers>
<flag name='kvm'/>
<flag name='sdl'/>
<flag name='no-hpet'/>
<flag name='spice'/>
<flag name='hda-duplex'/>
<flag name='ccid-emulated'/>

1
tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
View File

@ -5,7 +5,6 @@
<selfvers>0</selfvers>
<flag name='kvm'/>
<flag name='sdl'/>
<flag name='no-hpet'/>
<flag name='spice'/>
<flag name='hda-duplex'/>
<flag name='ccid-emulated'/>

1
tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml
View File

@ -5,7 +5,6 @@
<selfvers>0</selfvers>
<flag name='kvm'/>
<flag name='sdl'/>
<flag name='no-hpet'/>
<flag name='spice'/>
<flag name='hda-duplex'/>
<flag name='ccid-emulated'/>