Message ID | 1515756676-3860-4-git-send-email-pbonzini@redhat.com |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="SR5N6uZ1"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zJ0wB1rg1z9sQm for <incoming@patchwork.ozlabs.org>; Fri, 12 Jan 2018 22:32:26 +1100 (AEDT) Received: from localhost ([::1]:35177 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1eZxZQ-0007C0-9H for incoming@patchwork.ozlabs.org; Fri, 12 Jan 2018 06:32:24 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41376) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1eZxYU-00079Q-OD for qemu-devel@nongnu.org; Fri, 12 Jan 2018 06:31:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1eZxYS-0004Gp-Q7 for qemu-devel@nongnu.org; Fri, 12 Jan 2018 06:31:26 -0500 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:42352) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1eZxYS-0004F2-Je for qemu-devel@nongnu.org; Fri, 12 Jan 2018 06:31:24 -0500 Received: by mail-wm0-x241.google.com with SMTP id b141so11523629wme.1 for <qemu-devel@nongnu.org>; Fri, 12 Jan 2018 03:31:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=WuIGzw7hBamMo8s4pHysTbueWGCHrcegxv2oW6BJiuA=; b=SR5N6uZ1DI8mLo6Jljw+9cxs+/CzVR9JxFfL4ZggwU+5Rdh/nkUYHCrZrZ9mBhy+sI PEZisNHSNm82FdZ4lVf6wYCY/abxXG6gxV6WCluvoxuuV7K+bPXH1winK3M2w+3SpNED XPfQ/f0JmiQb36WtoBW+JSBr3yx0fE4X3IicgFkfOmk9McyP3i6BM5BL1CABSY9TKyjp /AHK/PERTUnnSDbdhUpZvBVYCKFmQJ3CyFnawwIht9FX/Xfm34OE+UkcmuXUL+rP4P6A 6Oy0wpsvUIuge2dEW4H3kPiuWUxmkVIGPTwzD391Xvayz5BumYRFkjEVJ7ZyuOn/dC+f rL3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=WuIGzw7hBamMo8s4pHysTbueWGCHrcegxv2oW6BJiuA=; b=tf25kSUXADKyzvBT1gi5B1my9v3LTyhrwI+pvdDT1sUYuLiUyL1xxBck/wxiKmJ9cH q1bM4GtZAKHOAtTwWMMc2Mbj+48qhA6a9zbykpKyANeBEYb7NstWNNkBE/HmBA14riFh jxlNHTnstEJUEb6htotcHVE9thRhQVfWrUtKKKpt+p7F4AKyPxX6CKspyD7dB0EJv5Fg 5Be0uE6Bhx/FesqdZkHU/zBY3Q9jakhUFF4LsY6oo4cc1G6pAel0FpGKiKgOszW5OLTN XMtz2EE+kdBpDNRHSMl8vvq8ALphYK/Gija7vdHQXgfTp8MhpOZljuFJmYj78FsFKgmD nZag== X-Gm-Message-State: AKwxytdt+HU/cDWCjLcQLBNzwzNfRQqpBIOi1Rio6Y45/YgWjHkSQ9B3 lYkqJgEG+tQVd8b185Pp/DOO0FfZ X-Google-Smtp-Source: ACJfBotsnUtHPWLK4Cv/uvdSZAX5mMut66NH2hR3z3NpDiur3jpUfbPBvkJx+Krw/gds3CiYNTN9wQ== X-Received: by 10.28.84.14 with SMTP id i14mr268534wmb.30.1515756683186; Fri, 12 Jan 2018 03:31:23 -0800 (PST) Received: from 640k.lan (dynamic-adsl-78-12-229-84.clienti.tiscali.it. [78.12.229.84]) by smtp.gmail.com with ESMTPSA id l8sm2732271wmg.46.2018.01.12.03.31.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Jan 2018 03:31:22 -0800 (PST) From: Paolo Bonzini <pbonzini@redhat.com> To: qemu-devel@nongnu.org Date: Fri, 12 Jan 2018 12:30:27 +0100 Message-Id: <1515756676-3860-4-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1515756676-3860-1-git-send-email-pbonzini@redhat.com> References: <1515756676-3860-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::241 Subject: [Qemu-devel] [PULL 03/52] pc: fail memory hot-plug/unplug with -no-acpi and Q35 machine type X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list 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> Cc: Haozhong Zhang <haozhong.zhang@intel.com> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
[PULL,01/52] scsi-generic: Add share-rw option
|
expand
|
diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 3fcf318..55686bf 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1695,9 +1695,14 @@ static void pc_dimm_plug(HotplugHandler *hotplug_dev, align = memory_region_get_alignment(mr); } - if (!pcms->acpi_dev) { + /* + * When -no-acpi is used with Q35 machine type, no ACPI is built, + * but pcms->acpi_dev is still created. Check !acpi_enabled in + * addition to cover this case. + */ + if (!pcms->acpi_dev || !acpi_enabled) { error_setg(&local_err, - "memory hotplug is not enabled: missing acpi device"); + "memory hotplug is not enabled: missing acpi device or acpi disabled"); goto out; } @@ -1729,9 +1734,14 @@ static void pc_dimm_unplug_request(HotplugHandler *hotplug_dev, Error *local_err = NULL; PCMachineState *pcms = PC_MACHINE(hotplug_dev); - if (!pcms->acpi_dev) { + /* + * When -no-acpi is used with Q35 machine type, no ACPI is built, + * but pcms->acpi_dev is still created. Check !acpi_enabled in + * addition to cover this case. + */ + if (!pcms->acpi_dev || !acpi_enabled) { error_setg(&local_err, - "memory hotplug is not enabled: missing acpi device"); + "memory hotplug is not enabled: missing acpi device or acpi disabled"); goto out; }