From patchwork Fri Mar 13 21:14:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: BALATON Zoltan X-Patchwork-Id: 1254688 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=eik.bme.hu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48fJdy42Lcz9sP7 for ; Sat, 14 Mar 2020 08:25:58 +1100 (AEDT) Received: from localhost ([::1]:37686 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCroa-0003f5-FJ for incoming@patchwork.ozlabs.org; Fri, 13 Mar 2020 17:25:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46549) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCrlx-0007jG-HU for qemu-devel@nongnu.org; Fri, 13 Mar 2020 17:23:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jCrlv-0000Kd-V7 for qemu-devel@nongnu.org; Fri, 13 Mar 2020 17:23:13 -0400 Received: from zero.eik.bme.hu ([152.66.115.2]:57667) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jCrls-00009c-Py; Fri, 13 Mar 2020 17:23:08 -0400 Received: from zero.eik.bme.hu (blah.eik.bme.hu [152.66.115.182]) by localhost (Postfix) with SMTP id 1E989747E04; Fri, 13 Mar 2020 22:23:06 +0100 (CET) Received: by zero.eik.bme.hu (Postfix, from userid 432) id 89B66747E0F; Fri, 13 Mar 2020 22:23:05 +0100 (CET) Message-Id: In-Reply-To: References: From: BALATON Zoltan Subject: [PATCH 7/8] hw/ide: Move MAX_IDE_DEVS define to hw/ide/internal.h Date: Fri, 13 Mar 2020 22:14:34 +0100 To: qemu-devel@nongnu.org, qemu-block@nongnu.org X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x [fuzzy] X-Received-From: 152.66.115.2 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , "Michael S. Tsirkin" , John Snow , Mark Cave-Ayland , hpoussin@reactos.org, Aleksandar Markovic , Paolo Bonzini , philmd@redhat.com, Artyom Tarasenko , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" We can move it next to the MAX_IDE_BUS define now that less files use it. Signed-off-by: BALATON Zoltan --- include/hw/ide.h | 2 -- include/hw/ide/internal.h | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/include/hw/ide.h b/include/hw/ide.h index d52c211f32..c5ce5da4f4 100644 --- a/include/hw/ide.h +++ b/include/hw/ide.h @@ -4,8 +4,6 @@ #include "hw/isa/isa.h" #include "exec/memory.h" -#define MAX_IDE_DEVS 2 - /* ide-isa.c */ ISADevice *isa_ide_init(ISABus *bus, int iobase, int iobase2, int isairq, DriveInfo *hd0, DriveInfo *hd1); diff --git a/include/hw/ide/internal.h b/include/hw/ide/internal.h index 1a49d35959..fd3cae4acf 100644 --- a/include/hw/ide/internal.h +++ b/include/hw/ide/internal.h @@ -28,6 +28,7 @@ typedef struct IDEDMAOps IDEDMAOps; #define IDE_BUS(obj) OBJECT_CHECK(IDEBus, (obj), TYPE_IDE_BUS) #define MAX_IDE_BUS 2 +#define MAX_IDE_DEVS 2 /* Bits of HD_STATUS */ #define ERR_STAT 0x01