date:20110427

[Qemu-devel] [PATCH] virtio-9p: move 9p files around

2011-04-27 Thread Aneesh Kumar K.V

Now that we start adding more files related to 9pfs
it make sense to move them to a separate directory

Signed-off-by: Aneesh Kumar K.V aneesh.ku...@linux.vnet.ibm.com
---
 Makefile.objs|   10 +++---
 Makefile.target  |6 --
 configure|2 ++
 {hw = fsdev}/file-op-9p.h   |0
 fsdev/qemu-fsdev.h   |2 +-
 hw/{ = 9pfs}/virtio-9p-debug.c  |0
 hw/{ = 9pfs}/virtio-9p-debug.h  |0
 hw/{ = 9pfs}/virtio-9p-local.c  |0
 hw/{ = 9pfs}/virtio-9p-posix-acl.c  |2 +-
 hw/{ = 9pfs}/virtio-9p-xattr-user.c |2 +-
 hw/{ = 9pfs}/virtio-9p-xattr.c  |2 +-
 hw/{ = 9pfs}/virtio-9p-xattr.h  |0
 hw/{ = 9pfs}/virtio-9p.c|0
 hw/{ = 9pfs}/virtio-9p.h|2 +-
 14 files changed, 18 insertions(+), 10 deletions(-)
 rename {hw = fsdev}/file-op-9p.h (100%)
 rename hw/{ = 9pfs}/virtio-9p-debug.c (100%)
 rename hw/{ = 9pfs}/virtio-9p-debug.h (100%)
 rename hw/{ = 9pfs}/virtio-9p-local.c (100%)
 rename hw/{ = 9pfs}/virtio-9p-posix-acl.c (99%)
 rename hw/{ = 9pfs}/virtio-9p-xattr-user.c (98%)
 rename hw/{ = 9pfs}/virtio-9p-xattr.c (99%)
 rename hw/{ = 9pfs}/virtio-9p-xattr.h (100%)
 rename hw/{ = 9pfs}/virtio-9p.c (100%)
 rename hw/{ = 9pfs}/virtio-9p.h (99%)

diff --git a/Makefile.objs b/Makefile.objs
index 93406ff..2eb6db5 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -276,9 +276,13 @@ sound-obj-$(CONFIG_HDA) += intel-hda.o hda-audio.o
 adlib.o fmopl.o: QEMU_CFLAGS += -DBUILD_Y8950=0
 hw-obj-$(CONFIG_SOUND) += $(sound-obj-y)
 
-hw-obj-$(CONFIG_REALLY_VIRTFS) += virtio-9p-debug.o
-hw-obj-$(CONFIG_VIRTFS) += virtio-9p-local.o virtio-9p-xattr.o
-hw-obj-$(CONFIG_VIRTFS) += virtio-9p-xattr-user.o virtio-9p-posix-acl.o
+9pfs-nested-$(CONFIG_VIRTFS) = virtio-9p-debug.o
+9pfs-nested-$(CONFIG_VIRTFS) +=  virtio-9p-local.o virtio-9p-xattr.o
+9pfs-nested-$(CONFIG_VIRTFS) +=   virtio-9p-xattr-user.o virtio-9p-posix-acl.o
+
+hw-obj-$(CONFIG_REALLY_VIRTFS) += $(addprefix 9pfs/, $(9pfs-nested-y))
+$(addprefix 9pfs/, $(9pfs-nested-y)): CFLAGS +=  -I$(SRC_PATH)/hw/
+
 
 ##
 # libdis
diff --git a/Makefile.target b/Makefile.target
index b0ba95f..46f5075 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -194,7 +194,7 @@ obj-$(CONFIG_VIRTIO) += virtio-blk.o virtio-balloon.o 
virtio-net.o virtio-serial
 obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o
 obj-y += vhost_net.o
 obj-$(CONFIG_VHOST_NET) += vhost.o
-obj-$(CONFIG_REALLY_VIRTFS) += virtio-9p.o
+obj-$(CONFIG_REALLY_VIRTFS) += 9pfs/virtio-9p.o
 obj-y += rwhandler.o
 obj-$(CONFIG_KVM) += kvm.o kvm-all.o
 obj-$(CONFIG_NO_KVM) += kvm-stub.o
@@ -356,9 +356,11 @@ hmp-commands.h: $(SRC_PATH)/hmp-commands.hx
 qmp-commands.h: $(SRC_PATH)/qmp-commands.hx
$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h  $  $@,  GEN  
 $(TARGET_DIR)$@)
 
+9pfs/virtio-9p.o: CFLAGS +=  -I$(SRC_PATH)/hw/
+
 clean:
rm -f *.o *.a *~ $(PROGS) nwfpe/*.o fpu/*.o
-   rm -f *.d */*.d tcg/*.o ide/*.o
+   rm -f *.d */*.d tcg/*.o ide/*.o 9pfs/*.o
rm -f hmp-commands.h qmp-commands.h gdbstub-xml.c
 ifdef CONFIG_SYSTEMTAP_TRACE
rm -f *.stp
diff --git a/configure b/configure
index 210670c..ceff93a 100755
--- a/configure
+++ b/configure
@@ -2872,6 +2872,7 @@ mkdir -p $target_dir
 mkdir -p $target_dir/fpu
 mkdir -p $target_dir/tcg
 mkdir -p $target_dir/ide
+mkdir -p $target_dir/9pfs
 if test $target = arm-linux-user -o $target = armeb-linux-user -o 
$target = arm-bsd-user -o $target = armeb-bsd-user ; then
   mkdir -p $target_dir/nwfpe
 fi
@@ -3262,6 +3263,7 @@ for hwlib in 32 64; do
   mkdir -p $d
   mkdir -p $d/ide
   symlink $source_path/Makefile.hw $d/Makefile
+  mkdir -p $d/9pfs
   echo QEMU_CFLAGS+=-DTARGET_PHYS_ADDR_BITS=$hwlib  $d/config.mak
 done
 
diff --git a/hw/file-op-9p.h b/fsdev/file-op-9p.h
similarity index 100%
rename from hw/file-op-9p.h
rename to fsdev/file-op-9p.h
diff --git a/fsdev/qemu-fsdev.h b/fsdev/qemu-fsdev.h
index a704043..f9f08d3 100644
--- a/fsdev/qemu-fsdev.h
+++ b/fsdev/qemu-fsdev.h
@@ -13,7 +13,7 @@
 #ifndef QEMU_FSDEV_H
 #define QEMU_FSDEV_H
 #include qemu-option.h
-#include hw/file-op-9p.h
+#include file-op-9p.h
 
 
 /*
diff --git a/hw/virtio-9p-debug.c b/hw/9pfs/virtio-9p-debug.c
similarity index 100%
rename from hw/virtio-9p-debug.c
rename to hw/9pfs/virtio-9p-debug.c
diff --git a/hw/virtio-9p-debug.h b/hw/9pfs/virtio-9p-debug.h
similarity index 100%
rename from hw/virtio-9p-debug.h
rename to hw/9pfs/virtio-9p-debug.h
diff --git a/hw/virtio-9p-local.c b/hw/9pfs/virtio-9p-local.c
similarity index 100%
rename from hw/virtio-9p-local.c
rename to hw/9pfs/virtio-9p-local.c
diff --git a/hw/virtio-9p-posix-acl.c b/hw/9pfs/virtio-9p-posix-acl.c
similarity index 99%
rename from hw/virtio-9p-posix-acl.c
rename to hw/9pfs/virtio-9p-posix-acl.c
index 3978d0c..e4e0777 100644
--- a/hw/virtio-9p-posix-acl.c
+++

[Qemu-devel] [PATCH] virtio-9p: Print the pdu details on return

2011-04-27 Thread Aneesh Kumar K.V

Signed-off-by: Aneesh Kumar K.V aneesh.ku...@linux.vnet.ibm.com
---
 hw/9pfs/virtio-9p.c |5 -
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c
index 7c59988..3858e17 100644
--- a/hw/9pfs/virtio-9p.c
+++ b/hw/9pfs/virtio-9p.c
@@ -596,7 +596,10 @@ static V9fsPDU *alloc_pdu(V9fsState *s)
 static void free_pdu(V9fsState *s, V9fsPDU *pdu)
 {
 if (pdu) {
-   QLIST_INSERT_HEAD(s-free_list, pdu, next);
+if (debug_9p_pdu) {
+pprint_pdu(pdu);
+}
+QLIST_INSERT_HEAD(s-free_list, pdu, next);
 }
 }
 
-- 
1.7.4.1

[Qemu-devel] [PATCH] virtio-9p: removexattr on default acl should return 0

2011-04-27 Thread Aneesh Kumar K.V

If we don't have default acl, removexattr on default acl
should return 0

Signed-off-by: Aneesh Kumar K.V aneesh.ku...@linux.vnet.ibm.com
---
 hw/9pfs/virtio-9p-posix-acl.c |   15 +--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/hw/9pfs/virtio-9p-posix-acl.c b/hw/9pfs/virtio-9p-posix-acl.c
index e4e0777..575abe8 100644
--- a/hw/9pfs/virtio-9p-posix-acl.c
+++ b/hw/9pfs/virtio-9p-posix-acl.c
@@ -60,7 +60,7 @@ static int mp_pacl_removexattr(FsContext *ctx,
 ret  = lremovexattr(rpath(ctx, path), MAP_ACL_ACCESS);
 if (ret == -1  errno == ENODATA) {
 /*
- * We don't get ENODATA error when trying to remote a
+ * We don't get ENODATA error when trying to remove a
  * posix acl that is not present. So don't throw the error
  * even in case of mapped security model
  */
@@ -103,7 +103,18 @@ static int mp_dacl_setxattr(FsContext *ctx, const char 
*path, const char *name,
 static int mp_dacl_removexattr(FsContext *ctx,
const char *path, const char *name)
 {
-return lremovexattr(rpath(ctx, path), MAP_ACL_DEFAULT);
+int ret;
+ret  = lremovexattr(rpath(ctx, path), MAP_ACL_DEFAULT);
+if (ret == -1  errno == ENODATA) {
+/*
+ * We don't get ENODATA error when trying to remove a
+ * posix acl that is not present. So don't throw the error
+ * even in case of mapped security model
+ */
+errno = 0;
+ret = 0;
+}
+return ret;
 }
 
 
-- 
1.7.4.1

Re: [Qemu-devel] [PATCH] virtio-9p: move 9p files around

2011-04-27 Thread Jan Kiszka

On 2011-04-27 08:53, Aneesh Kumar K.V wrote:
 Now that we start adding more files related to 9pfs
 it make sense to move them to a separate directory
 
 Signed-off-by: Aneesh Kumar K.V aneesh.ku...@linux.vnet.ibm.com
 ---
  Makefile.objs|   10 +++---
  Makefile.target  |6 --
  configure|2 ++
  {hw = fsdev}/file-op-9p.h   |0
  fsdev/qemu-fsdev.h   |2 +-
  hw/{ = 9pfs}/virtio-9p-debug.c  |0
  hw/{ = 9pfs}/virtio-9p-debug.h  |0
  hw/{ = 9pfs}/virtio-9p-local.c  |0
  hw/{ = 9pfs}/virtio-9p-posix-acl.c  |2 +-
  hw/{ = 9pfs}/virtio-9p-xattr-user.c |2 +-
  hw/{ = 9pfs}/virtio-9p-xattr.c  |2 +-
  hw/{ = 9pfs}/virtio-9p-xattr.h  |0
  hw/{ = 9pfs}/virtio-9p.c|0
  hw/{ = 9pfs}/virtio-9p.h|2 +-
  14 files changed, 18 insertions(+), 10 deletions(-)
  rename {hw = fsdev}/file-op-9p.h (100%)
  rename hw/{ = 9pfs}/virtio-9p-debug.c (100%)
  rename hw/{ = 9pfs}/virtio-9p-debug.h (100%)
  rename hw/{ = 9pfs}/virtio-9p-local.c (100%)
  rename hw/{ = 9pfs}/virtio-9p-posix-acl.c (99%)
  rename hw/{ = 9pfs}/virtio-9p-xattr-user.c (98%)
  rename hw/{ = 9pfs}/virtio-9p-xattr.c (99%)
  rename hw/{ = 9pfs}/virtio-9p-xattr.h (100%)
  rename hw/{ = 9pfs}/virtio-9p.c (100%)

That's a good chance to split up this file, move virtio_9p_get_config
into a separate one and build the large virtio-9p.c as part of hwlib
while keeping the new file target-specific. I've some hack for this
lying around, but now that you are already at it...

Thanks,
Jan



signature.asc
Description: OpenPGP digital signature

Re: [Qemu-devel] [PATCH] target-i386: Initialize CPUState::halted in cpu_reset

2011-04-27 Thread Jan Kiszka

On 2011-04-26 21:59, Blue Swirl wrote:
 On Tue, Apr 26, 2011 at 9:55 PM, Jan Kiszka jan.kis...@web.de wrote:
 On 2011-04-26 20:00, Blue Swirl wrote:
 On Tue, Apr 26, 2011 at 11:50 AM, Jan Kiszka jan.kis...@siemens.com wrote:
 Instead of having an extra reset function at machine level and special
 code for processing INIT, move the initialization of halted into the
 cpu reset handler.

 Nack. A CPU is designated as a BSP at board level. CPUs do not need to
 know about this at all.

 That's why we have cpu_is_bsp() in pc.c.

 Obviously, every CPU (which includes the APIC) must know if it is
 supposed to be BP or AP. It would be unable to enter the right state
 after reset otherwise (e.g. Intel SDM 9.1). cpu_is_bsp() is basically
 reporting the result of the MP init protocol in condensed from.
 
 Intel 64 and IA-32 Architectures Software Developer’s Manual vol 3A,
 7.5.1 says that the protocol result is stored in APIC MSR. I think we
 should be using that instead. For example, the board could call
 cpu_designate_bsp() to set the BSP flag in MSR. Then cpu_is_bsp()
 would only check the MSR, which naturally belongs to the CPU/APIC
 domain.

Something like this? The original patch has to be rebased on top.

I'm still struggling how to deal with apicbase long-term. I doesn't
belong to the APIC, but it's saved/restored there. Guess we should move
it to the CPU's vmstate. OTOH, changing vmstates only for the sake of
minor refactorings is also not very attractive.

Jan

---
 hw/apic.c|   18 +-
 hw/apic.h|2 +-
 hw/pc.c  |   14 +++---
 target-i386/helper.c |3 ++-
 target-i386/kvm.c|5 +++--
 5 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/hw/apic.c b/hw/apic.c
index 9febf40..31ac6cd 100644
--- a/hw/apic.c
+++ b/hw/apic.c
@@ -318,7 +318,7 @@ uint64_t cpu_get_apic_base(DeviceState *d)
 
 trace_cpu_get_apic_base(s ? (uint64_t)s-apicbase: 0);
 
-return s ? s-apicbase : 0;
+return s ? s-apicbase : MSR_IA32_APICBASE_BSP;
 }
 
 void cpu_set_apic_tpr(DeviceState *d, uint8_t val)
@@ -958,18 +958,26 @@ static const VMStateDescription vmstate_apic = {
 }
 };
 
+void apic_designate_bsp(DeviceState *d)
+{
+APICState *s = DO_UPCAST(APICState, busdev.qdev, d);
+
+if (!d) {
+return;
+}
+s-apicbase |= MSR_IA32_APICBASE_BSP;
+}
+
 static void apic_reset(DeviceState *d)
 {
 APICState *s = DO_UPCAST(APICState, busdev.qdev, d);
-int bsp;
 
-bsp = cpu_is_bsp(s-cpu_env);
 s-apicbase = 0xfee0 |
-(bsp ? MSR_IA32_APICBASE_BSP : 0) | MSR_IA32_APICBASE_ENABLE;
+(s-apicbase  MSR_IA32_APICBASE_BSP) | MSR_IA32_APICBASE_ENABLE;
 
 apic_init_reset(d);
 
-if (bsp) {
+if (s-apicbase  MSR_IA32_APICBASE_BSP) {
 /*
  * LINT0 delivery mode on CPU #0 is set to ExtInt at initialization
  * time typically by BIOS, so PIC interrupt can be delivered to the
diff --git a/hw/apic.h b/hw/apic.h
index 8a0c9d0..935144b 100644
--- a/hw/apic.h
+++ b/hw/apic.h
@@ -19,9 +19,9 @@ void cpu_set_apic_tpr(DeviceState *s, uint8_t val);
 uint8_t cpu_get_apic_tpr(DeviceState *s);
 void apic_init_reset(DeviceState *s);
 void apic_sipi(DeviceState *s);
+void apic_designate_bsp(DeviceState *d);
 
 /* pc.c */
-int cpu_is_bsp(CPUState *env);
 DeviceState *cpu_get_current_apic(void);
 
 #endif
diff --git a/hw/pc.c b/hw/pc.c
index 6939c04..36ca238 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -852,12 +852,6 @@ void pc_init_ne2k_isa(NICInfo *nd)
 nb_ne2k++;
 }
 
-int cpu_is_bsp(CPUState *env)
-{
-/* We hard-wire the BSP to the first CPU. */
-return env-cpu_index == 0;
-}
-
 DeviceState *cpu_get_current_apic(void)
 {
 if (cpu_single_env) {
@@ -918,7 +912,8 @@ static void pc_cpu_reset(void *opaque)
 CPUState *env = opaque;
 
 cpu_reset(env);
-env-halted = !cpu_is_bsp(env);
+env-halted =
+!(cpu_get_apic_base(env-apic_state)  MSR_IA32_APICBASE_BSP);
 }
 
 static CPUState *pc_new_cpu(const char *cpu_model)
@@ -933,6 +928,11 @@ static CPUState *pc_new_cpu(const char *cpu_model)
 if ((env-cpuid_features  CPUID_APIC) || smp_cpus  1) {
 env-cpuid_apic_id = env-cpu_index;
 env-apic_state = apic_init(env, env-cpuid_apic_id);
+
+/* We hard-wire the BSP to the first CPU. */
+if (env-cpu_index == 0) {
+apic_designate_bsp(env-apic_state);
+}
 }
 qemu_register_reset(pc_cpu_reset, env);
 pc_cpu_reset(env);
diff --git a/target-i386/helper.c b/target-i386/helper.c
index 89df997..52b3a44 100644
--- a/target-i386/helper.c
+++ b/target-i386/helper.c
@@ -1282,7 +1282,8 @@ void do_cpu_init(CPUState *env)
 env-interrupt_request = sipi;
 env-pat = pat;
 apic_init_reset(env-apic_state);
-env-halted = !cpu_is_bsp(env);
+env-halted =
+!(cpu_get_apic_base(env-apic_state)  MSR_IA32_APICBASE_BSP);
 }
 
 void do_cpu_sipi(CPUState *env)
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index

Re: [Qemu-devel] [PATCH] target-arm: Don't update base register on abort in Thumb T1 LDM

2011-04-27 Thread Yuyeon Oh

It looks very good. I hope that it will patch soon.
Thank you.

--- Original Message ---
Sender : Peter Maydellpeter.mayd...@linaro.org
Date : 2011-04-27 02:17 (GMT+09:00)
Title : [PATCH] target-arm: Don't update base register on abort in Thumb T1 LDM
 
Make sure the base register isn't updated if it is in the load list
for a Thumb LDM (T1 encoding) which aborts partway through the load.

Signed-off-by: Peter Maydell 
---
target-arm/translate.c |   17 ++---
1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/target-arm/translate.c b/target-arm/translate.c
index d8da514..a1af436 100644
--- a/target-arm/translate.c
+++ b/target-arm/translate.c
@@ -9454,7 +9454,10 @@ static void disas_thumb_insn(CPUState *env, DisasContext 
*s)
 break;

 case 12:
+{
 /* load/store multiple */
+TCGv loaded_var;
+TCGV_UNUSED(loaded_var);
 rn = (insn  8)  0x7;
 addr = load_reg(s, rn);
 for (i = 0; i  8; i++) {
@@ -9462,7 +9465,11 @@ static void disas_thumb_insn(CPUState *env, DisasContext 
*s)
 if (insn  (1  11)) {
 /* load */
 tmp = gen_ld32(addr, IS_USER(s));
-store_reg(s, i, tmp);
+if (i == rn) {
+loaded_var = tmp;
+} else {
+store_reg(s, i, tmp);
+}
 } else {
 /* store */
 tmp = load_reg(s, i);
@@ -9472,14 +9479,18 @@ static void disas_thumb_insn(CPUState *env, 
DisasContext *s)
 tcg_gen_addi_i32(addr, addr, 4);
 }
 }
-/* Base register writeback.  */
 if ((insn  (1  rn)) == 0) {
+/* base reg not in list: base register writeback */
 store_reg(s, rn, addr);
 } else {
+/* base reg in list: if load, complete it now */
+if (insn  (1  11)) {
+store_reg(s, rn, loaded_var);
+}
 tcg_temp_free_i32(addr);
 }
 break;
-
+}
 case 13:
 /* conditional branch or swi */
 cond = (insn  8)  0xf;
-- 
1.7.1

Re: [Qemu-devel] [Qemu-trivial] [PATCH] Fix typo in code and comments

2011-04-27 Thread Stefan Hajnoczi

On Tue, Apr 26, 2011 at 6:26 PM, Stefan Weil w...@mail.berlios.de wrote:
 Am 26.04.2011 19:04, schrieb Jan Marten Simons:

 Am Dienstag 26 April 2011 11:25:58 schrieb Stefan Hajnoczi:

 On Tue, Apr 26, 2011 at 9:29 AM, Stefan Weil w...@mail.berlios.de
 wrote:

 Replace writeable - writable

 Why make this change? writeable and writable are both commonly used
 spellings.

 It seems like writeable is the commonly used term in computer sciences
 and
 writable is the normal english adjective formed from to write +
 -able in
 general English.[1]

 As we are refering to computer science related writeable it should be
 left
 as is imho. But as I'm no native speaker, you might feel different on
 this.
 On a side note: Samba offers both spellings as valid for thier
 configuration
 files. [2]

 [1] http://www.thefreedictionary.com/writeable
 [2] http://forums.contribs.org/index.php?topic=22258.0

 With regards,

 Dipl. Phys.
 Jan M. Simons

 Institute of Crystallography
 RWTH Aachen University

 Commonly used is not necessarily correct.

 The Oxford dictionary only accepts writable (even when I select
 american english). Same result with Merriam-Webster.
 Google suggests writable instead of writeable.

 I see writeable only in computer programs and related contexts,
 therefore I assume that it is simply a very common spelling error
 contributed by non-native speakers (like myself). Interesting
 detail: The spelling checker of my mailing client (Icedove) marks
 writeable as correct and writable as wrong (which is obviously wrong).
 Maybe I should send a bug report to Debian.

 The ratio of writeable:writable in unpatched qemu is 37:47.
 Even if both writings were correct, I might argue that a
 uniform spelling is better and choose the form which is more commonly
 used.

The patch mostly touches comments and won't affect external
interfaces, it makes the code consistent.  So let's take it and move
on:
http://repo.or.cz/w/qemu/stefanha.git/shortlog/refs/heads/trivial-patches

Stefan

Re: [Qemu-devel] Qemu-img convert with -B

2011-04-27 Thread Stefan Hajnoczi

On Wed, Apr 27, 2011 at 4:05 AM, Brad Campbell
lists2...@fnarfbargle.com wrote:
 I see there is a bug raised about the behaviour of qemu-img when used to 
 convert using an output backing file. It allocates every sector whether or 
 not it already exists in the output backing file.

Please post the link to the bug report.

 Can someone verify these assumptions for me please?
 - I can bdrv_open() a file that has a chain of backing files, and the
 following is true :
        - bdrv_read() returns the most recently allocated sector contents (or
 0)

Correct.

        - bdrv_is_allocated() will return false only if that sector is not
 allocated in _any_ of the files in the chain

Incorrect.  It returns true if the sector is allocated in the top-most
file, false otherwise.  In other words bdrv_is_allocated() is flat, it
does not traverse a chain of backing files.

Stefan

[Qemu-devel] [PATCH] linux-user: Fix compilation for old linux versions

2011-04-27 Thread Stefan Weil

Debian Lenny and other installations with older linux versions
failed to compile linux-user because some CLONE_xxx macros are
undefined.

Signed-off-by: Stefan Weil w...@mail.berlios.de
---
 linux-user/strace.c |   12 
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/linux-user/strace.c b/linux-user/strace.c
index 5d9bb08..fe9326a 100644
--- a/linux-user/strace.c
+++ b/linux-user/strace.c
@@ -477,12 +477,24 @@ UNUSED static struct flags clone_flags[] = {
 FLAG_GENERIC(CLONE_DETACHED),
 FLAG_GENERIC(CLONE_UNTRACED),
 FLAG_GENERIC(CLONE_CHILD_SETTID),
+#if defined(CLONE_NEWUTS)
 FLAG_GENERIC(CLONE_NEWUTS),
+#endif
+#if defined(CLONE_NEWIPC)
 FLAG_GENERIC(CLONE_NEWIPC),
+#endif
+#if defined(CLONE_NEWUSER)
 FLAG_GENERIC(CLONE_NEWUSER),
+#endif
+#if defined(CLONE_NEWPID)
 FLAG_GENERIC(CLONE_NEWPID),
+#endif
+#if defined(CLONE_NEWNET)
 FLAG_GENERIC(CLONE_NEWNET),
+#endif
+#if defined(CLONE_IO)
 FLAG_GENERIC(CLONE_IO),
+#endif
 FLAG_END,
 };
 
-- 
1.7.0.4

Re: [Qemu-devel] Qemu-img convert with -B

2011-04-27 Thread Brad Campbell

On 27/04/11 16:10, Stefan Hajnoczi wrote:

On Wed, Apr 27, 2011 at 4:05 AM, Brad Campbell
lists2...@fnarfbargle.com wrote:

I see there is a bug raised about the behaviour of qemu-img when used to
convert using an output backing file. It allocates every sector whether or not
it already exists in the output backing file.

Please post the link to the bug report.

Yeah, sorry about that. Not very clever of me.

https://bugs.launchpad.net/qemu/+bug/660366

Can someone verify these assumptions for me please?
- I can bdrv_open() a file that has a chain of backing files, and the
following is true :
- bdrv_read() returns the most recently allocated sector contents (or
0)

Correct.

- bdrv_is_allocated() will return false only if that sector is not
allocated in _any_ of the files in the chain

Incorrect. It returns true if the sector is allocated in the top-most
file, false otherwise. In other words bdrv_is_allocated() is flat, it
does not traverse a chain of backing files.

Right.

I guess the correct way to do this is to open and traverse all the input and output backing files,
but I don't see why that should be necessary as the output file is created O_RDWR.

Now as the output file is created with the backing_file option, can I simply bdrv_read() both input
and output files, and only write to the output file if the sector differs or != 0? Seems like that
would be the logical way to do everything right while leveraging the complexity of the block
drivers. It would also allow for maximum compression of the output file if the filesystem has all
unused space wiped (which is my desired usage case).

1 2 >

1 - 100 of 104 matches

Mail list logo