From patchwork Mon Sep 17 08:47:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peter A. G. Crosthwaite" X-Patchwork-Id: 184318 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 878312C0091 for ; Mon, 17 Sep 2012 18:48:32 +1000 (EST) Received: from localhost ([::1]:49857 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TDX0I-0005Zb-M1 for incoming@patchwork.ozlabs.org; Mon, 17 Sep 2012 04:48:30 -0400 Received: from eggs.gnu.org ([208.118.235.92]:38972) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TDX01-0005Bu-6s for qemu-devel@nongnu.org; Mon, 17 Sep 2012 04:48:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TDWzv-0003tu-8C for qemu-devel@nongnu.org; Mon, 17 Sep 2012 04:48:13 -0400 Received: from mail-ie0-f173.google.com ([209.85.223.173]:58366) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TDWzv-0003tn-2q for qemu-devel@nongnu.org; Mon, 17 Sep 2012 04:48:07 -0400 Received: by iebc10 with SMTP id c10so8767331ieb.4 for ; Mon, 17 Sep 2012 01:48:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :in-reply-to:references:x-gm-message-state; bh=81qHHjvZ+Vy57EH7EPNNIbJoJheT5l1yywcBJkrhjpo=; b=VAW1ZzhyafwQiCTinAHGpMHrtNCJol69M0kUnYMH93gVclZHQ0aG92AYwXKPGuWHWw EI7OxCmZS8jFNevC8GE05Rmmy9PTSENlYnMwTJqXeB0d3FfcY8Vb1lP9/8xfaw1d61Je iZjrcNU+XGO0/NhWMpsRrZPKkJbQsX1jnnlhsPD5MYyzkITr2cfWdt65cpj3eAd8iyr0 6cV6hfFcgvvVH5Rvz+e4hBm4WuJuHwUx8+4mVhPVN76skJwrExoefO1BWI94LFZaHkoE R2hKeCY2slzmxI9wdqh7m0eevBdKLtsprfoVpM7ipA/aKcokIo5V2ZknEurx70m3w+4w i4oA== Received: by 10.50.180.167 with SMTP id dp7mr6002137igc.23.1347871686269; Mon, 17 Sep 2012 01:48:06 -0700 (PDT) Received: from localhost ([124.148.20.9]) by mx.google.com with ESMTPS id xm2sm16518145igb.3.2012.09.17.01.48.03 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 17 Sep 2012 01:48:05 -0700 (PDT) From: "Peter A. G. Crosthwaite" To: qemu-devel@nongnu.org, edgar.iglesias@gmail.com Date: Mon, 17 Sep 2012 18:47:31 +1000 Message-Id: <7b187517e8a8ccbb7f2e2a823a018d53aca1a393.1347871393.git.peter.crosthwaite@petalogix.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: References: In-Reply-To: References: X-Gm-Message-State: ALoCoQlncXh+YXkjI7AdbmeJLjTPBz8qAVP1om2W65I2RvBlotWyHegzXA44YWZFGLKHBxZEaUcy X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.223.173 Cc: peter.crosthwaite@petalogix.com, crwulff@gmail.com Subject: [Qemu-devel] [PATCH v1 1/6] xilinx_timer: Removed comma in device name X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Fixes an error in a61e4b07a30c062260d2d01771773f14820d1eb7 Signed-off-by: Peter A. G. Crosthwaite --- hw/xilinx.h | 2 +- hw/xilinx_timer.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/xilinx.h b/hw/xilinx.h index 556c5aa..df06a00 100644 --- a/hw/xilinx.h +++ b/hw/xilinx.h @@ -21,7 +21,7 @@ xilinx_timer_create(target_phys_addr_t base, qemu_irq irq, int oto, int freq) { DeviceState *dev; - dev = qdev_create(NULL, "xlnx,xps-timer"); + dev = qdev_create(NULL, "xlnx.xps-timer"); qdev_prop_set_uint32(dev, "one-timer-only", oto); qdev_prop_set_uint32(dev, "frequency", freq); qdev_init_nofail(dev); diff --git a/hw/xilinx_timer.c b/hw/xilinx_timer.c index b562bd0..053ba02 100644 --- a/hw/xilinx_timer.c +++ b/hw/xilinx_timer.c @@ -217,7 +217,7 @@ static int xilinx_timer_init(SysBusDevice *dev) ptimer_set_freq(xt->ptimer, t->freq_hz); } - memory_region_init_io(&t->mmio, &timer_ops, t, "xlnx,xps-timer", + memory_region_init_io(&t->mmio, &timer_ops, t, "xlnx.xps-timer", R_MAX * 4 * num_timers(t)); sysbus_init_mmio(dev, &t->mmio); return 0; @@ -239,7 +239,7 @@ static void xilinx_timer_class_init(ObjectClass *klass, void *data) } static TypeInfo xilinx_timer_info = { - .name = "xlnx,xps-timer", + .name = "xlnx.xps-timer", .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(struct timerblock), .class_init = xilinx_timer_class_init,