diff options
| author | Jason King <jason.brian.king@gmail.com> | 2012-03-06 21:14:44 +0000 |
|---|---|---|
| committer | Robert Mustacchi <rm@joyent.com> | 2012-03-06 22:23:04 +0000 |
| commit | 22237de925d22826c55de034a9bc8075581f3166 (patch) | |
| tree | f02e5a6c400d406659eaeaa142cb16926fc7503e | |
| parent | 95921e4179c27d09b572a6a7843d29d1a96d6f22 (diff) | |
| download | illumos-kvm-cmd-22237de925d22826c55de034a9bc8075581f3166.tar.gz | |
HVM-722 rtls emulation doesn't clear phy reset bit causing warnings in Illumos
HVM-723 Would be better to explicitly invoke bash for bash specific scripts
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | hw/rtl8139.c | 2 |
2 files changed, 5 insertions, 5 deletions
@@ -80,7 +80,7 @@ build-all: $(DOCS) $(TOOLS) recurse-all config-host.h: config-host.h-timestamp config-host.h-timestamp: config-host.mak qemu-options.def: $(SRC_PATH)/qemu-options.hx - $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@," GEN $@") + $(call quiet-command,bash $(SRC_PATH)/scripts/hxtool -h < $< > $@," GEN $@") SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS)) @@ -122,12 +122,12 @@ else trace.h: trace.h-timestamp endif trace.h-timestamp: $(SRC_PATH)/trace-events config-host.mak - $(call quiet-command,sh $(SRC_PATH)/scripts/tracetool --$(TRACE_BACKEND) -h < $< > $@," GEN trace.h") + $(call quiet-command,bash $(SRC_PATH)/scripts/tracetool --$(TRACE_BACKEND) -h < $< > $@," GEN trace.h") @cmp -s $@ trace.h || cp $@ trace.h trace.c: trace.c-timestamp trace.c-timestamp: $(SRC_PATH)/trace-events config-host.mak - $(call quiet-command,sh $(SRC_PATH)/scripts/tracetool --$(TRACE_BACKEND) -c < $< > $@," GEN trace.c") + $(call quiet-command,bash $(SRC_PATH)/scripts/tracetool --$(TRACE_BACKEND) -c < $< > $@," GEN trace.c") @cmp -s $@ trace.c || cp $@ trace.c trace.o: trace.c $(GENERATED_HEADERS) @@ -140,7 +140,7 @@ trace-dtrace.h: trace-dtrace.dtrace # rule file. So we use '.dtrace' instead trace-dtrace.dtrace: trace-dtrace.dtrace-timestamp trace-dtrace.dtrace-timestamp: $(SRC_PATH)/trace-events config-host.mak - $(call quiet-command,sh $(SRC_PATH)/scripts/tracetool --$(TRACE_BACKEND) -d < $< > $@," GEN trace-dtrace.dtrace") + $(call quiet-command,bash $(SRC_PATH)/scripts/tracetool --$(TRACE_BACKEND) -d < $< > $@," GEN trace-dtrace.dtrace") @cmp -s $@ trace-dtrace.dtrace || cp $@ trace-dtrace.dtrace trace-dtrace.o: trace-dtrace.dtrace $(GENERATED_HEADERS) diff --git a/hw/rtl8139.c b/hw/rtl8139.c index a22530c..2212d14 100644 --- a/hw/rtl8139.c +++ b/hw/rtl8139.c @@ -1468,7 +1468,7 @@ static void rtl8139_BasicModeCtrl_write(RTL8139State *s, uint32_t val) DEBUG_PRINT(("RTL8139: BasicModeCtrl register write(w) val=0x%04x\n", val)); /* mask unwriteable bits */ - uint32_t mask = 0x4cff; + uint32_t mask = 0xccff; if (1 || !rtl8139_config_writeable(s)) { |