From patchwork Sun Mar 2 13:07:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 325574 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 B5C182C00C2 for ; Mon, 3 Mar 2014 00:11:52 +1100 (EST) Received: from localhost ([::1]:35415 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WK6BJ-0002U8-Or for incoming@patchwork.ozlabs.org; Sun, 02 Mar 2014 08:11:49 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47532) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WK67T-0002yU-Up for qemu-devel@nongnu.org; Sun, 02 Mar 2014 08:07:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WK67N-0000xp-UV for qemu-devel@nongnu.org; Sun, 02 Mar 2014 08:07:51 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36553) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WK67N-0000xh-KS for qemu-devel@nongnu.org; Sun, 02 Mar 2014 08:07:45 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s22D7eaZ032740 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 2 Mar 2014 08:07:41 -0500 Received: from localhost.tlv.redhat.com (dhcp-4-195.tlv.redhat.com [10.35.4.195]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s22D6puk012367; Sun, 2 Mar 2014 08:07:36 -0500 From: Marcel Apfelbaum To: qemu-devel@nongnu.org Date: Sun, 2 Mar 2014 15:07:12 +0200 Message-Id: <1393765632-2753-10-git-send-email-marcel.a@redhat.com> In-Reply-To: <1393765632-2753-1-git-send-email-marcel.a@redhat.com> References: <1393765632-2753-1-git-send-email-marcel.a@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: peter.maydell@linaro.org, blauwirbel@gmail.com, mdroth@linux.vnet.ibm.com, mst@redhat.com, armbru@redhat.com, mtosatti@redhat.com, agraf@suse.de, ehabkost@redhat.com, lcapitulino@redhat.com, peter.crosthwaite@petalogix.com, quintela@redhat.com, imammedo@redhat.com, aliguori@amazon.com, pbonzini@redhat.com, scottwood@freescale.com, edgar.iglesias@gmail.com, afaerber@suse.de, rth@twiddle.net Subject: [Qemu-devel] [PATCH RFC V2 9/9] hw/core: mapped QemuOpts into QEMUMachineInitArgs fields to remove duplication 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 The QOM machine has both field per QemuOpt and an instance of QEMUMachineInitArgs. Removed dupplications. Signed-off-by: Marcel Apfelbaum --- hw/core/machine.c | 18 +++++++++--------- include/hw/boards.h | 9 +++------ vl.c | 6 +++--- 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/hw/core/machine.c b/hw/core/machine.c index 436829c..73f61bd 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -67,37 +67,37 @@ static void machine_set_kvm_shadow_mem(Object *obj, Visitor *v, static char *machine_get_kernel(Object *obj, Error **errp) { QemuMachineState *machine_state = QEMU_MACHINE(obj); - return g_strdup(machine_state->kernel); + return g_strdup(machine_state->init_args.kernel_filename); } static void machine_set_kernel(Object *obj, const char *value, Error **errp) { QemuMachineState *machine_state = QEMU_MACHINE(obj); - machine_state->kernel = g_strdup(value); + machine_state->init_args.kernel_filename = g_strdup(value); } static char *machine_get_initrd(Object *obj, Error **errp) { QemuMachineState *machine_state = QEMU_MACHINE(obj); - return g_strdup(machine_state->initrd); + return g_strdup(machine_state->init_args.initrd_filename); } static void machine_set_initrd(Object *obj, const char *value, Error **errp) { QemuMachineState *machine_state = QEMU_MACHINE(obj); - machine_state->initrd = g_strdup(value); + machine_state->init_args.initrd_filename = g_strdup(value); } static char *machine_get_append(Object *obj, Error **errp) { QemuMachineState *machine_state = QEMU_MACHINE(obj); - return g_strdup(machine_state->append); + return g_strdup(machine_state->init_args.kernel_cmdline); } static void machine_set_append(Object *obj, const char *value, Error **errp) { QemuMachineState *machine_state = QEMU_MACHINE(obj); - machine_state->append = g_strdup(value); + machine_state->init_args.kernel_cmdline = g_strdup(value); } static char *machine_get_dtb(Object *obj, Error **errp) @@ -261,9 +261,9 @@ static void qemu_machine_finalize(Object *obj) QemuMachineState *machine_state = QEMU_MACHINE(obj); g_free(machine_state->accel); - g_free(machine_state->kernel); - g_free(machine_state->initrd); - g_free(machine_state->append); + g_free(machine_state->init_args.kernel_filename); + g_free(machine_state->init_args.initrd_filename); + g_free(machine_state->init_args.kernel_cmdline); g_free(machine_state->dtb); g_free(machine_state->dumpdtb); g_free(machine_state->dt_compatible); diff --git a/include/hw/boards.h b/include/hw/boards.h index 053c113..4b1979e 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -13,9 +13,9 @@ typedef struct QEMUMachineInitArgs { const QEMUMachine *machine; ram_addr_t ram_size; const char *boot_order; - const char *kernel_filename; - const char *kernel_cmdline; - const char *initrd_filename; + char *kernel_filename; + char *kernel_cmdline; + char *initrd_filename; const char *cpu_model; } QEMUMachineInitArgs; @@ -91,9 +91,6 @@ struct QemuMachineState { char *accel; bool kernel_irqchip; int kvm_shadow_mem; - char *kernel; - char *initrd; - char *append; char *dtb; char *dumpdtb; int phandle_start; diff --git a/vl.c b/vl.c index 007342c..3d7357e 100644 --- a/vl.c +++ b/vl.c @@ -2834,8 +2834,8 @@ int main(int argc, char **argv, char **envp) int i; int snapshot, linux_boot; const char *icount_option = NULL; - const char *initrd_filename; - const char *kernel_filename, *kernel_cmdline; + char *initrd_filename; + char *kernel_filename, *kernel_cmdline; const char *boot_order; DisplayState *ds; int cyls, heads, secs, translation; @@ -4129,7 +4129,7 @@ int main(int argc, char **argv, char **envp) } if (!kernel_cmdline) { - kernel_cmdline = ""; + kernel_cmdline = (char *)""; } linux_boot = (kernel_filename != NULL);