From nobody Sat May 18 21:45:34 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linux.intel.com ARC-Seal: i=1; a=rsa-sha256; t=1554967173; cv=none; d=zoho.com; s=zohoarc; b=KSYBvs4xjhOggwxzFudKBispe3+YTL0QHkvaTX63pxTLkRGZPmpD0gTb5uhu6fGaxXNb5pwJY8LCaOxAt5oMC/TODUyVsiT+XG4Xgw1tpnNto2t9kuYszQsXZieGQuCSav64WW6a6MjS8W1T40WG19olzNDtvlHrnOUebfJhEdE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554967173; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=nIN0KDlopNmGfQz4J9nhD6nDomai4/3U+TvGyCe0HNU=; b=Cp5npKhaOXq1Co0kkD6h+Lfulk8VPUstrMoHsWYUD2hK4ay5aW4uo2bVmesBVBQRK43eAgfmWHpz2Jv75fkpW5WkaM4JJW8+soQZKRhbXB8YMRdxnNkMbLORlvJ7/CR6M9olFybcuW1q4itpagXXBjWUo16MGraPjDSavsh5P8A= ARC-Authentication-Results: i=1; mx.zoho.com; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1554967173310113.45204103213848; Thu, 11 Apr 2019 00:19:33 -0700 (PDT) Received: from localhost ([127.0.0.1]:43029 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hETzb-0002Um-Cj for importer@patchew.org; Thu, 11 Apr 2019 03:19:27 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37710) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hETyG-0001oj-RP for qemu-devel@nongnu.org; Thu, 11 Apr 2019 03:18:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hETyF-0005U6-Ut for qemu-devel@nongnu.org; Thu, 11 Apr 2019 03:18:04 -0400 Received: from mga01.intel.com ([192.55.52.88]:47561) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hETyF-0005T4-Ki for qemu-devel@nongnu.org; Thu, 11 Apr 2019 03:18:03 -0400 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Apr 2019 00:18:01 -0700 Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by orsmga001.jf.intel.com with ESMTP; 11 Apr 2019 00:17:59 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,336,1549958400"; d="scan'208";a="222497725" From: Wei Yang To: qemu-devel@nongnu.org Date: Thu, 11 Apr 2019 15:17:39 +0800 Message-Id: <20190411071739.22889-1-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.88 Subject: [Qemu-devel] [PATCH] hw/i386/pc: check apci hotplug capability before nvdimm's X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, thuth@redhat.com, Wei Yang , ehabkost@redhat.com, rth@twiddle.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" pc_memory_pre_plug() is called during hotplug for both pc-dimm and nvdimm. This is more proper to check apci hotplug capability before check nvdimm specific capability. Signed-off-by: Wei Yang Tested-by: Thomas Huth --- hw/i386/pc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index f2c15bf1f2..d48b6f9582 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -2091,17 +2091,17 @@ static void pc_memory_pre_plug(HotplugHandler *hotp= lug_dev, DeviceState *dev, return; } =20 - if (is_nvdimm && !ms->nvdimms_state->is_enabled) { - error_setg(errp, "nvdimm is not enabled: missing 'nvdimm' in '-M'"= ); - return; - } - hotplug_handler_pre_plug(pcms->acpi_dev, dev, &local_err); if (local_err) { error_propagate(errp, local_err); return; } =20 + if (is_nvdimm && !ms->nvdimms_state->is_enabled) { + error_setg(errp, "nvdimm is not enabled: missing 'nvdimm' in '-M'"= ); + return; + } + pc_dimm_pre_plug(PC_DIMM(dev), MACHINE(hotplug_dev), pcmc->enforce_aligned_dimm ? NULL : &legacy_align, er= rp); } --=20 2.19.1