* [Qemu-devel] [PATCH] pc/piix: fix mismerge of b1aeb92666d2fde413c34578b3b42bbfe5f2a506
@ 2010-12-22 6:13 Isaku Yamahata
2010-12-22 6:26 ` [Qemu-devel] " Michael S. Tsirkin
0 siblings, 1 reply; 2+ messages in thread
From: Isaku Yamahata @ 2010-12-22 6:13 UTC (permalink / raw)
To: qemu-devel; +Cc: yamahata, mst
The change set of b1aeb92666d2fde413c34578b3b42bbfe5f2a506 in pci branch
was mismerged. The compatibility should be kept for 0.13, not for 0.14.
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
---
hw/pc_piix.c | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index a2fb554..f82508d 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -217,14 +217,6 @@ static QEMUMachine pc_machine = {
.desc = "Standard PC",
.init = pc_init_pci,
.max_cpus = 255,
- .compat_props = (GlobalProperty[]) {
- {
- .driver = "PCI",
- .property = "command_serr_enable",
- .value = "off",
- },
- { /* end of list */ }
- },
.is_default = 1,
};
@@ -246,6 +238,10 @@ static QEMUMachine pc_machine_v0_13 = {
.driver = "vmware-svga",
.property = "rombar",
.value = stringify(0),
+ },{
+ .driver = "PCI",
+ .property = "command_serr_enable",
+ .value = "off",
},
{ /* end of list */ }
},
--
1.7.1.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* [Qemu-devel] Re: [PATCH] pc/piix: fix mismerge of b1aeb92666d2fde413c34578b3b42bbfe5f2a506
2010-12-22 6:13 [Qemu-devel] [PATCH] pc/piix: fix mismerge of b1aeb92666d2fde413c34578b3b42bbfe5f2a506 Isaku Yamahata
@ 2010-12-22 6:26 ` Michael S. Tsirkin
0 siblings, 0 replies; 2+ messages in thread
From: Michael S. Tsirkin @ 2010-12-22 6:26 UTC (permalink / raw)
To: Isaku Yamahata; +Cc: qemu-devel
On Wed, Dec 22, 2010 at 03:13:43PM +0900, Isaku Yamahata wrote:
> The change set of b1aeb92666d2fde413c34578b3b42bbfe5f2a506 in pci branch
> was mismerged. The compatibility should be kept for 0.13, not for 0.14.
>
> Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Applied.
> ---
> hw/pc_piix.c | 12 ++++--------
> 1 files changed, 4 insertions(+), 8 deletions(-)
>
> diff --git a/hw/pc_piix.c b/hw/pc_piix.c
> index a2fb554..f82508d 100644
> --- a/hw/pc_piix.c
> +++ b/hw/pc_piix.c
> @@ -217,14 +217,6 @@ static QEMUMachine pc_machine = {
> .desc = "Standard PC",
> .init = pc_init_pci,
> .max_cpus = 255,
> - .compat_props = (GlobalProperty[]) {
> - {
> - .driver = "PCI",
> - .property = "command_serr_enable",
> - .value = "off",
> - },
> - { /* end of list */ }
> - },
> .is_default = 1,
> };
>
> @@ -246,6 +238,10 @@ static QEMUMachine pc_machine_v0_13 = {
> .driver = "vmware-svga",
> .property = "rombar",
> .value = stringify(0),
> + },{
> + .driver = "PCI",
> + .property = "command_serr_enable",
> + .value = "off",
> },
> { /* end of list */ }
> },
> --
> 1.7.1.1
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-12-22 6:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-22 6:13 [Qemu-devel] [PATCH] pc/piix: fix mismerge of b1aeb92666d2fde413c34578b3b42bbfe5f2a506 Isaku Yamahata
2010-12-22 6:26 ` [Qemu-devel] " Michael S. Tsirkin
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).