From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52229) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WPADd-0006hY-BS for qemu-devel@nongnu.org; Sun, 16 Mar 2014 08:31:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WPADX-0001Od-CZ for qemu-devel@nongnu.org; Sun, 16 Mar 2014 08:31:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54994) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WPADX-0001OZ-4b for qemu-devel@nongnu.org; Sun, 16 Mar 2014 08:31:03 -0400 Date: Sun, 16 Mar 2014 14:31:04 +0200 From: "Michael S. Tsirkin" Message-ID: <20140316123104.GA17829@redhat.com> References: <1394835772-32194-1-git-send-email-lersek@redhat.com> <1394835772-32194-3-git-send-email-lersek@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1394835772-32194-3-git-send-email-lersek@redhat.com> Subject: Re: [Qemu-devel] [PATCH for-2.1 2/2] i386/acpi-build: support hotplug of VCPU with APIC ID 0xFF List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Laszlo Ersek Cc: imammedo@redhat.com, qemu-devel@nongnu.org, ehabkost@redhat.com, afaerber@suse.de On Fri, Mar 14, 2014 at 11:22:52PM +0100, Laszlo Ersek wrote: > Building on the previous patch, raise the maximal count of processor > objects / NTFY branches / CPON elements from 255 to 256. This allows the > VCPU with APIC ID 0xFF to be hotplugged. > > Signed-off-by: Laszlo Ersek > --- > hw/i386/acpi-build.c | 16 +++++++++++----- > 1 file changed, 11 insertions(+), 5 deletions(-) > > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > index 2bbefb5..51162fc 100644 > --- a/hw/i386/acpi-build.c > +++ b/hw/i386/acpi-build.c > @@ -999,11 +999,15 @@ build_ssdt(GArray *table_data, GArray *linker, > AcpiCpuInfo *cpu, AcpiPmInfo *pm, AcpiMiscInfo *misc, > PcPciInfo *pci, PcGuestInfo *guest_info) > { > - int acpi_cpus = MIN(0xff, guest_info->apic_id_limit); Maybe just make this line int acpi_cpus = guest_info->apic_id_limit; and then the patch will be smaller. > int ssdt_start = table_data->len; > uint8_t *ssdt_ptr; > int i; > > + /* The current AML generator can cover the APIC ID range [0..255], > + * inclusive, for VCPU hotplug. */ > + QEMU_BUILD_BUG_ON(ACPI_CPU_HOTPLUG_ID_LIMIT > 256); > + g_assert(guest_info->apic_id_limit <= ACPI_CPU_HOTPLUG_ID_LIMIT); > + > /* Copy header and patch values in the S3_ / S4_ / S5_ packages */ > ssdt_ptr = acpi_data_push(table_data, sizeof(ssdp_misc_aml)); > memcpy(ssdt_ptr, ssdp_misc_aml, sizeof(ssdp_misc_aml)); > @@ -1029,7 +1033,7 @@ build_ssdt(GArray *table_data, GArray *linker, > build_append_nameseg(sb_scope, "_SB_"); > > /* build Processor object for each processor */ > - for (i = 0; i < acpi_cpus; i++) { > + for (i = 0; i < guest_info->apic_id_limit; i++) { > uint8_t *proc = acpi_data_push(sb_scope, ACPI_PROC_SIZEOF); > memcpy(proc, ACPI_PROC_AML, ACPI_PROC_SIZEOF); > proc[ACPI_PROC_OFFSET_CPUHEX] = acpi_get_hex(i >> 4); > @@ -1042,7 +1046,8 @@ build_ssdt(GArray *table_data, GArray *linker, > * Method(NTFY, 2) {If (LEqual(Arg0, 0x00)) {Notify(CP00, Arg1)} ...} > */ > /* Arg0 = Processor ID = APIC ID */ > - build_append_notify_method(sb_scope, "NTFY", "CP%0.02X", acpi_cpus); > + build_append_notify_method(sb_scope, "NTFY", "CP%0.02X", > + guest_info->apic_id_limit); > > /* build "Name(CPON, Package() { One, One, ..., Zero, Zero, ... })" */ > build_append_byte(sb_scope, 0x08); /* NameOp */ > @@ -1052,8 +1057,9 @@ build_ssdt(GArray *table_data, GArray *linker, > GArray *package = build_alloc_array(); > uint8_t op = 0x13; /* VarPackageOp */ > > - build_append_int(package, acpi_cpus); /* VarNumElements */ > - for (i = 0; i < acpi_cpus; i++) { > + build_append_int(package, > + guest_info->apic_id_limit); /* VarNumElements */ > + for (i = 0; i < guest_info->apic_id_limit; i++) { > uint8_t b = test_bit(i, cpu->found_cpus) ? 0x01 : 0x00; > build_append_byte(package, b); > } > -- > 1.8.3.1