From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([140.186.70.92]:44690)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1R78GJ-0002Mu-1j
	for qemu-devel@nongnu.org; Fri, 23 Sep 2011 12:06:03 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1R78GD-0003E2-HD
	for qemu-devel@nongnu.org; Fri, 23 Sep 2011 12:06:02 -0400
Received: from mail-yx0-f173.google.com ([209.85.213.173]:59378)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1R78GD-0003Dr-Eq
	for qemu-devel@nongnu.org; Fri, 23 Sep 2011 12:05:57 -0400
Received: by yxl11 with SMTP id 11so3539572yxl.4
	for <qemu-devel@nongnu.org>; Fri, 23 Sep 2011 09:05:56 -0700 (PDT)
Message-ID: <4E7CAE61.2040802@codemonkey.ws>
Date: Fri, 23 Sep 2011 11:05:53 -0500
From: Anthony Liguori <anthony@codemonkey.ws>
MIME-Version: 1.0
References: <1316361891-8960-1-git-send-email-hpoussin@reactos.org>
In-Reply-To: <1316361891-8960-1-git-send-email-hpoussin@reactos.org>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
Subject: Re: [Qemu-devel] [PATCH] isapc: give system address space when pci
 is disabled
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: =?UTF-8?B?SGVydsOpIFBvdXNzaW5lYXU=?= <hpoussin@reactos.org>
Cc: qemu-devel@nongnu.org

On 09/18/2011 11:04 AM, Hervé Poussineau wrote:
>
> Signed-off-by: Hervé Poussineau<hpoussin@reactos.org>

Applied.  Thanks.

Regards,

Anthony Liguori

> ---
>   hw/pc_piix.c |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/hw/pc_piix.c b/hw/pc_piix.c
> index da6fa55..c0b8a3a 100644
> --- a/hw/pc_piix.c
> +++ b/hw/pc_piix.c
> @@ -121,7 +121,7 @@ static void pc_init1(MemoryRegion *system_memory,
>           pc_memory_init(system_memory,
>                          kernel_filename, kernel_cmdline, initrd_filename,
>                          below_4g_mem_size, above_4g_mem_size,
> -                       pci_memory,&ram_memory);
> +                       pci_enabled ? pci_memory : system_memory,&ram_memory);
>       }
>
>       if (!xen_enabled()) {