* [Qemu-devel] [PATCH] piix4: disable bridge acpi hotplug for 1.7 and older
@ 2014-01-20 16:35 Michael S. Tsirkin
2014-01-20 16:55 ` Igor Mammedov
0 siblings, 1 reply; 2+ messages in thread
From: Michael S. Tsirkin @ 2014-01-20 16:35 UTC (permalink / raw)
To: qemu-devel
Cc: Paolo Bonzini, Igor Mammedov, Andreas Färber,
Anthony Liguori, Eduardo Habkost
Patch was written before 1.7 was out, forgot to update.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
I moved for_anthony tag to include this patch
as well, no reason to make people suffer until
next pull request.
hw/i386/pc_piix.c | 4 ++++
include/hw/i386/pc.h | 13 ++++++++-----
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 2766414..a327d71 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -393,6 +393,10 @@ static QEMUMachine pc_i440fx_machine_v1_7 = {
PC_I440FX_1_7_MACHINE_OPTIONS,
.name = "pc-i440fx-1.7",
.init = pc_init_pci_1_7,
+ .compat_props = (GlobalProperty[]) {
+ PC_COMPAT_1_7,
+ { /* end of list */ }
+ },
};
#define PC_I440FX_1_6_MACHINE_OPTIONS PC_I440FX_MACHINE_OPTIONS
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 71653e8..fd9f369 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -240,7 +240,15 @@ uint16_t pvpanic_port(void);
int e820_add_entry(uint64_t, uint64_t, uint32_t);
+#define PC_COMPAT_1_7 \
+ {\
+ .driver = "PIIX4_PM",\
+ .property = "acpi-pci-hotplug-with-bridge-support",\
+ .value = "off",\
+ }
+
#define PC_Q35_COMPAT_1_7 \
+ PC_COMPAT_1_7, \
{\
.driver = "hpet",\
.property = HPET_INTCAP,\
@@ -261,11 +269,6 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t);
#define PC_COMPAT_1_6 \
{\
- .driver = "PIIX4_PM",\
- .property = "acpi-pci-hotplug-with-bridge-support",\
- .value = "off",\
- }, \
- {\
.driver = "e1000",\
.property = "mitigation",\
.value = "off",\
--
MST
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Qemu-devel] [PATCH] piix4: disable bridge acpi hotplug for 1.7 and older
2014-01-20 16:35 [Qemu-devel] [PATCH] piix4: disable bridge acpi hotplug for 1.7 and older Michael S. Tsirkin
@ 2014-01-20 16:55 ` Igor Mammedov
0 siblings, 0 replies; 2+ messages in thread
From: Igor Mammedov @ 2014-01-20 16:55 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: Paolo Bonzini, Eduardo Habkost, qemu-devel, Anthony Liguori,
Andreas Färber
On Mon, 20 Jan 2014 18:35:17 +0200
"Michael S. Tsirkin" <mst@redhat.com> wrote:
> Patch was written before 1.7 was out, forgot to update.
>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
>
> I moved for_anthony tag to include this patch
> as well, no reason to make people suffer until
> next pull request.
Reviewed-By: Igor Mammedov <imammedo@redhat.com>
>
> hw/i386/pc_piix.c | 4 ++++
> include/hw/i386/pc.h | 13 ++++++++-----
> 2 files changed, 12 insertions(+), 5 deletions(-)
>
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index 2766414..a327d71 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -393,6 +393,10 @@ static QEMUMachine pc_i440fx_machine_v1_7 = {
> PC_I440FX_1_7_MACHINE_OPTIONS,
> .name = "pc-i440fx-1.7",
> .init = pc_init_pci_1_7,
> + .compat_props = (GlobalProperty[]) {
> + PC_COMPAT_1_7,
> + { /* end of list */ }
> + },
> };
>
> #define PC_I440FX_1_6_MACHINE_OPTIONS PC_I440FX_MACHINE_OPTIONS
> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> index 71653e8..fd9f369 100644
> --- a/include/hw/i386/pc.h
> +++ b/include/hw/i386/pc.h
> @@ -240,7 +240,15 @@ uint16_t pvpanic_port(void);
>
> int e820_add_entry(uint64_t, uint64_t, uint32_t);
>
> +#define PC_COMPAT_1_7 \
> + {\
> + .driver = "PIIX4_PM",\
> + .property = "acpi-pci-hotplug-with-bridge-support",\
> + .value = "off",\
> + }
> +
> #define PC_Q35_COMPAT_1_7 \
> + PC_COMPAT_1_7, \
> {\
> .driver = "hpet",\
> .property = HPET_INTCAP,\
> @@ -261,11 +269,6 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t);
>
> #define PC_COMPAT_1_6 \
> {\
> - .driver = "PIIX4_PM",\
> - .property = "acpi-pci-hotplug-with-bridge-support",\
> - .value = "off",\
> - }, \
> - {\
> .driver = "e1000",\
> .property = "mitigation",\
> .value = "off",\
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-01-20 16:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-20 16:35 [Qemu-devel] [PATCH] piix4: disable bridge acpi hotplug for 1.7 and older Michael S. Tsirkin
2014-01-20 16:55 ` Igor Mammedov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).