129 lines
4.8 KiB
Diff
129 lines
4.8 KiB
Diff
|
From 96edd15df257f1d1496397a6fac24b4316570d7e Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jon Maloy <jmaloy@redhat.com>
|
||
|
|
Date: Thu, 14 Apr 2022 16:45:30 -0400
|
||
|
|
Subject: [PATCH 1/3] Revert redhat: Add some devices for exporting upstream
|
||
|
|
machine types
|
||
|
|
|
||
|
|
RH-Author: Jon Maloy <jmaloy@redhat.com>
|
||
|
|
RH-MergeRequest: 156: Revert redhat: Add some devices for exporting upstream machine types
|
||
|
|
RH-Commit: [1/1] f25d0da3a181136917ead82f5a5c59efe3fa445a (jmaloy/qemu-kvm)
|
||
|
|
RH-Bugzilla: 2065043
|
||
|
|
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||
|
|
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
||
|
|
RH-Acked-by: Peter Xu <peterx@redhat.com>
|
||
|
|
|
||
|
|
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2065043
|
||
|
|
Upstream: no
|
||
|
|
|
||
|
|
Manual revert of commit 70d3924521c9bfd912bcf1a1fc76f49eb377de46, since
|
||
|
|
the directory structure looks different from rhel-av-8.4.0.z where
|
||
|
|
this commit is taken from. Besides, x86_64-softmmu.mak looks totally
|
||
|
|
different and should not be affected by this reversal.
|
||
|
|
|
||
|
|
Signed-off-by: Jon Maloy <jmaloy@redhat.com>
|
||
|
|
---
|
||
|
|
configs/devices/x86_64-softmmu/x86_64-rh-devices.mak | 1 -
|
||
|
|
.../devices/x86_64-softmmu/x86_64-upstream-devices.mak | 4 ----
|
||
|
|
hw/char/parallel.c | 9 ---------
|
||
|
|
hw/i386/pc_piix.c | 2 +-
|
||
|
|
hw/i386/pc_q35.c | 2 +-
|
||
|
|
hw/timer/hpet.c | 8 --------
|
||
|
|
6 files changed, 2 insertions(+), 24 deletions(-)
|
||
|
|
delete mode 100644 configs/devices/x86_64-softmmu/x86_64-upstream-devices.mak
|
||
|
|
|
||
|
|
diff --git a/configs/devices/x86_64-softmmu/x86_64-rh-devices.mak b/configs/devices/x86_64-softmmu/x86_64-rh-devices.mak
|
||
|
|
index fdbbdf9742..31ce08edab 100644
|
||
|
|
--- a/configs/devices/x86_64-softmmu/x86_64-rh-devices.mak
|
||
|
|
+++ b/configs/devices/x86_64-softmmu/x86_64-rh-devices.mak
|
||
|
|
@@ -1,5 +1,4 @@
|
||
|
|
include ../rh-virtio.mak
|
||
|
|
-include x86_64-upstream-devices.mak
|
||
|
|
|
||
|
|
CONFIG_AC97=y
|
||
|
|
CONFIG_ACPI=y
|
||
|
|
diff --git a/configs/devices/x86_64-softmmu/x86_64-upstream-devices.mak b/configs/devices/x86_64-softmmu/x86_64-upstream-devices.mak
|
||
|
|
deleted file mode 100644
|
||
|
|
index 2cd20f54d2..0000000000
|
||
|
|
--- a/configs/devices/x86_64-softmmu/x86_64-upstream-devices.mak
|
||
|
|
+++ /dev/null
|
||
|
|
@@ -1,4 +0,0 @@
|
||
|
|
-# We need "isa-parallel"
|
||
|
|
-CONFIG_PARALLEL=y
|
||
|
|
-# We need "hpet"
|
||
|
|
-CONFIG_HPET=y
|
||
|
|
diff --git a/hw/char/parallel.c b/hw/char/parallel.c
|
||
|
|
index e5f108211b..b45e67bfbb 100644
|
||
|
|
--- a/hw/char/parallel.c
|
||
|
|
+++ b/hw/char/parallel.c
|
||
|
|
@@ -29,7 +29,6 @@
|
||
|
|
#include "chardev/char-parallel.h"
|
||
|
|
#include "chardev/char-fe.h"
|
||
|
|
#include "hw/acpi/aml-build.h"
|
||
|
|
-#include "hw/boards.h"
|
||
|
|
#include "hw/irq.h"
|
||
|
|
#include "hw/isa/isa.h"
|
||
|
|
#include "hw/qdev-properties.h"
|
||
|
|
@@ -535,14 +534,6 @@ static void parallel_isa_realizefn(DeviceState *dev, Error **errp)
|
||
|
|
int base;
|
||
|
|
uint8_t dummy;
|
||
|
|
|
||
|
|
- /* Restricted for Red Hat Enterprise Linux */
|
||
|
|
- MachineClass *mc = MACHINE_GET_CLASS(qdev_get_machine());
|
||
|
|
- if (strstr(mc->name, "rhel")) {
|
||
|
|
- error_setg(errp, "Device %s is not supported with machine type %s",
|
||
|
|
- object_get_typename(OBJECT(dev)), mc->name);
|
||
|
|
- return;
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
if (!qemu_chr_fe_backend_connected(&s->chr)) {
|
||
|
|
error_setg(errp, "Can't create parallel device, empty char device");
|
||
|
|
return;
|
||
|
|
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
|
||
|
|
index ab6d03e07a..5f101c8748 100644
|
||
|
|
--- a/hw/i386/pc_piix.c
|
||
|
|
+++ b/hw/i386/pc_piix.c
|
||
|
|
@@ -966,7 +966,7 @@ static void pc_machine_rhel7_options(MachineClass *m)
|
||
|
|
{
|
||
|
|
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
|
||
|
|
m->family = "pc_piix_Y";
|
||
|
|
- m->default_machine_opts = "firmware=bios-256k.bin,hpet=off";
|
||
|
|
+ m->default_machine_opts = "firmware=bios-256k.bin";
|
||
|
|
pcmc->default_nic_model = "e1000";
|
||
|
|
pcmc->pci_root_uid = 0;
|
||
|
|
m->default_display = "std";
|
||
|
|
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
|
||
|
|
index 882fe7a68d..73b0d0d317 100644
|
||
|
|
--- a/hw/i386/pc_q35.c
|
||
|
|
+++ b/hw/i386/pc_q35.c
|
||
|
|
@@ -633,7 +633,7 @@ static void pc_q35_machine_rhel_options(MachineClass *m)
|
||
|
|
pcmc->pci_root_uid = 0;
|
||
|
|
m->family = "pc_q35_Z";
|
||
|
|
m->units_per_default_bus = 1;
|
||
|
|
- m->default_machine_opts = "firmware=bios-256k.bin,hpet=off";
|
||
|
|
+ m->default_machine_opts = "firmware=bios-256k.bin";
|
||
|
|
m->default_display = "std";
|
||
|
|
m->no_floppy = 1;
|
||
|
|
m->no_parallel = 1;
|
||
|
|
diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c
|
||
|
|
index 202e032524..9520471be2 100644
|
||
|
|
--- a/hw/timer/hpet.c
|
||
|
|
+++ b/hw/timer/hpet.c
|
||
|
|
@@ -733,14 +733,6 @@ static void hpet_realize(DeviceState *dev, Error **errp)
|
||
|
|
int i;
|
||
|
|
HPETTimer *timer;
|
||
|
|
|
||
|
|
- /* Restricted for Red Hat Enterprise Linux */
|
||
|
|
- MachineClass *mc = MACHINE_GET_CLASS(qdev_get_machine());
|
||
|
|
- if (strstr(mc->name, "rhel")) {
|
||
|
|
- error_setg(errp, "Device %s is not supported with machine type %s",
|
||
|
|
- object_get_typename(OBJECT(dev)), mc->name);
|
||
|
|
- return;
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
if (!s->intcap) {
|
||
|
|
warn_report("Hpet's intcap not initialized");
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.35.1
|
||
|
|
|