From patchwork Wed May 18 08:19:02 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Asias He X-Patchwork-Id: 793012 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p4I8O3wf004358 for ; Wed, 18 May 2011 08:24:04 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755087Ab1ERIVN (ORCPT ); Wed, 18 May 2011 04:21:13 -0400 Received: from mail-pv0-f174.google.com ([74.125.83.174]:54701 "EHLO mail-pv0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752031Ab1ERIVM (ORCPT ); Wed, 18 May 2011 04:21:12 -0400 Received: by pvg12 with SMTP id 12so601558pvg.19 for ; Wed, 18 May 2011 01:21:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer; bh=2cXjJZhCiRXg2wTrSkZGZTdLced7Qq3vQWxDRMsVWfI=; b=pqqfiEQeYW6KO3NDtaiVHLGReqNX6gkWN/guoJrZ7bvxvu2USQf8oLuDtnGS9/rYqK 4ORnx97L7T9RWKP4BCdqiCG6m/Ej5fRBQDCjkF3h/kdJE6MBO1xvge/m+MkckuW/mjmE hIq2CXYHN8TIJib7js0S/DkrtpDu3xPCj8CTs= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=r2bzdWbcbr6m8fmPFq799PzCvUt3wDXoJtjAD4ee06001oumLpUT0OmI1WiCSSOS3c l7itEYXiQpZSJPMq5IQvT0RqCAJtB0GzwkHwRRy7PSP5SivZgP03q2YcMkpWKQVlrzfR vXxoLdgOw0W1S/zAUfeshf3YAo1UG5QQ461FI= Received: by 10.68.69.102 with SMTP id d6mr2556911pbu.138.1305706871830; Wed, 18 May 2011 01:21:11 -0700 (PDT) Received: from localhost.localdomain ([219.224.169.130]) by mx.google.com with ESMTPS id q10sm912018pbk.39.2011.05.18.01.20.49 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 18 May 2011 01:21:11 -0700 (PDT) From: Asias He To: Pekka Enberg Cc: Cyrill Gorcunov , Ingo Molnar , Sasha Levin , Prasad Joshi , kvm@vger.kernel.org, Asias He Subject: [PATCH 01/14] kvm tools: Move disk image related code under disk directory Date: Wed, 18 May 2011 16:19:02 +0800 Message-Id: <1305706755-2816-1-git-send-email-asias.hejun@gmail.com> X-Mailer: git-send-email 1.7.5.1 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Wed, 18 May 2011 08:24:05 +0000 (UTC) This patch removes disk-image.c and qcow.c under disk directory. Signed-off-by: Asias He --- tools/kvm/Makefile | 4 ++-- tools/kvm/{ => disk}/disk-image.c | 0 tools/kvm/{ => disk}/qcow.c | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename tools/kvm/{ => disk}/disk-image.c (100%) rename tools/kvm/{ => disk}/qcow.c (100%) diff --git a/tools/kvm/disk-image.c b/tools/kvm/disk/disk-image.c similarity index 100% rename from tools/kvm/disk-image.c rename to tools/kvm/disk/disk-image.c diff --git a/tools/kvm/qcow.c b/tools/kvm/disk/qcow.c similarity index 100% rename from tools/kvm/qcow.c rename to tools/kvm/disk/qcow.c diff --git a/tools/kvm/Makefile b/tools/kvm/Makefile index 45897d5..8938f5f 100644 --- a/tools/kvm/Makefile +++ b/tools/kvm/Makefile @@ -15,7 +15,7 @@ TAGS = ctags OBJS += 8250-serial.o OBJS += cpuid.o OBJS += read-write.o -OBJS += disk-image.o +OBJS += disk/disk-image.o OBJS += interrupt.o OBJS += ioport.o OBJS += kvm.o @@ -37,7 +37,7 @@ OBJS += util/strbuf.o OBJS += kvm-help.o OBJS += kvm-cmd.o OBJS += kvm-run.o -OBJS += qcow.o +OBJS += disk/qcow.o OBJS += mptable.o OBJS += threadpool.o OBJS += irq.o