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 <yamah...@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
